1 files changed, 28 insertions, 18 deletions
diff --git a/mdk-stage1/dietlibc/lib/tcsetattr.c b/mdk-stage1/dietlibc/lib/tcsetattr.c
index cf70354d2..03fe8adee 100644
--- a/mdk-stage1/dietlibc/lib/tcsetattr.c
+++ b/mdk-stage1/dietlibc/lib/tcsetattr.c
@@ -1,27 +1,37 @@
-#define tcsetattr libc_tcsetattr
 #include <termios.h>
 #include <sys/ioctl.h>
-#undef tcsetattr
+#include <errno.h>
+#include "dietfeatures.h"
 
-#include <asm/errno.h>
+#if !defined(__powerpc__) && !defined(__sparc__) && !defined(__alpha__) && !defined(__hppa__)
+#if TCSANOW==0 && TCSADRAIN==1 && TCSAFLUSH==2 && TCSETSW-TCSETS==1 && TCSETSF-TCSETS==2
+#define shortcut
+#endif
+#endif
 
-extern int errno;
+int  tcsetattr ( int fildes, int optional_actions, struct termios* termios_p )
+{
+#ifdef shortcut
 
-/* Hack around a kernel bug; value must correspond to the one used in speed.c */
-#define IBAUD0	020000000000
+    if ( (unsigned int)optional_actions < 3u )
+        return ioctl ( fildes, TCSETS+optional_actions, termios_p );
 
-int tcsetattr(int fildes, int optional_actions, struct termios *termios_p)
-{
-  termios_p->c_iflag &= ~IBAUD0;
-  switch (optional_actions) {
-  case TCSANOW:
-    return ioctl(fildes, TCSETS, termios_p);
-  case TCSADRAIN:
-    return ioctl(fildes, TCSETSW, termios_p);
-  case TCSAFLUSH:
-    return ioctl(fildes, TCSETSF, termios_p);
-  default:
     errno = EINVAL;
     return -1;
-  }
+
+#else
+
+    switch ( optional_actions ) {
+    case TCSANOW:
+        return ioctl ( fildes, TCSETS , termios_p );
+    case TCSADRAIN:
+        return ioctl ( fildes, TCSETSW, termios_p );
+    case TCSAFLUSH:
+        return ioctl ( fildes, TCSETSF, termios_p );
+    default:
+        errno = EINVAL;
+        return -1;
+    }
+    
+#endif    
 }