Changeset 185 for trunk/src

Timestamp:

May 19, 2003, 1:59:07 PM (22 years ago)

Author:

bird

Message:

#434: switch on lower word of the request number to support new and old defines.

Location:

trunk/src/emx/src/lib

Files:

• io/ioctl.c (modified) (4 diffs, 1 prop)
• sys/__ioctl2.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/io/ioctl.c

@@ -11 +11 @@
 #include <emx/syscalls.h>
 
-/* Including the socket header files would be overkill. */
+/** Get the low word of the ioctl request number.
+ * Used to support ioctl request numbers from old and new _IOC macros.
+ */
+#define __IOCLW(a) ((unsigned short)(a))
 
-#define FIONBIO         0x667e
 
 int _STD(ioctl) (int handle, int request, ...)
@@ -32 +34 @@
   rc = __ioctl2 (handle, request, arg);
   if (rc >= 0 && errno == 0)
-    switch (request)
+    switch (__IOCLW(request))
       {
-      case TCSETAF:
-      case TCSETAW:
-      case TCSETA:
+      case __IOCLW(TCSETAF):
+      case __IOCLW(TCSETAW):
+      case __IOCLW(TCSETA):
         va_start (va, request);
         tp = va_arg (va, const struct termio *);
@@ -46 +48 @@
         break;
 
-      case _TCSANOW:
-      case _TCSADRAIN:
-      case _TCSAFLUSH:
+      case __IOCLW(_TCSANOW):
+      case __IOCLW(_TCSADRAIN):
+      case __IOCLW(_TCSAFLUSH):
         *pflags |= F_TERMIO;
         break;
 
-      case FIONREAD:
+      case __IOCLW(FIONREAD):
         if ((pla = _fd_lookahead (handle)) != NULL && *pla >= 0)
           {
@@ -62 +64 @@
         break;
 
-      case FIONBIO:
+      case __IOCLW(FIONBIO):
         va_start (va, request);
         int_ptr = va_arg (va, int *);

trunk/src/emx/src/lib/sys/__ioctl2.c

@@ -9 +9 @@
 #include "syscalls.h"
 
+/** Get the low word of the ioctl request number.
+ * Used to support ioctl request numbers from old and new _IOC macros.
+ */
+#define __IOCLW(a) ((unsigned short)(a))
+
 int __ioctl2 (int handle, int request, int arg)
 {
@@ -15 +20 @@
   int *int_ptr;
 
-  switch (request)
+  switch (__IOCLW(request))
     {
-    case FGETHTYPE:
+    case __IOCLW(FGETHTYPE):
       int_ptr = (int *)arg;
       rc = DosQueryHType (handle, &type, &flags);