Changeset 5891 in vbox

Timestamp:

Nov 30, 2007 2:07:25 PM (17 years ago)

Author:

vboxsync

Message:

Guest Additions: fixed todo from r26395 regarding IOCTL definitions on Linux

File:

• trunk/include/VBox/VBoxGuest.h (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -1138 +1138 @@
 
 #elif defined(RT_OS_LINUX)
-/* Note that we can't use the Linux header IOCtl macros directly, as they expect a "type"
-   argument, whereas we provide "sizeof(type)". */
-/** @todo r=bird: That's not true. You can use _IOC just like SUPDRVIOC.h does (include linux/ioctl.h). That should work back to 2.0.x. */
+# include <linux/ioctl.h>
+/* Note that we can't use the Linux header _IOWR macro directly, as it expects
+   a "type" argument, whereas we provide "sizeof(type)". */
 /* VBOXGUEST_IOCTL_CODE(Function, sizeof(type)) == _IOWR('V', (Function) | VBOXGUEST_IOCTL_FLAG, (type)) */
-# define VBOXGUEST_IOCTL_CODE(Function, Size)   ( (3 << 30) | ('V' << 8) | (Function) | VBOXGUEST_IOCTL_FLAG | (Size << 16) )
-/* VBOXGUEST_IOCTL_CODE_FAST(Function) == _IO(  'V', (Function) | VBOXGUEST_IOCTL_FLAG) */
-# define VBOXGUEST_IOCTL_CODE_FAST(Function)    ( 'V' << 8 | (Function) | VBOXGUEST_IOCTL_FLAG)
+# define VBOXGUEST_IOCTL_CODE(Function, Size)   _IOC(_IOC_READ|_IOC_WRITE, 'V', Function, Size)
+# define VBOXGUEST_IOCTL_CODE_FAST(Function)    _IO(  'V', (Function) | VBOXGUEST_IOCTL_FLAG)
 
 #elif 0 /* BSD style - needs some adjusting _IORW takes a type and not a size. */