Changeset 6167 in vbox for trunk/include/VBox

Timestamp:

Dec 21, 2007 10:37:13 AM (17 years ago)

Author:

vboxsync

Message:

Guest Additions: added a VBOXGUEST_IOCTL_NUMBER macro for Linux guests for dealing with variable size IOCtl codes; added VBOXGUEST_IOCTL_LOG

File:

• trunk/include/VBox/VBoxGuest.h (modified) (3 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -967 +967 @@
    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)   _IOC(_IOC_READ|_IOC_WRITE, 'V', Function, Size)
+# define VBOXGUEST_IOCTL_CODE(Function, Size)   _IOC(_IOC_READ|_IOC_WRITE, 'V', (Function) | VBOXGUEST_IOCTL_FLAG, (Size))
 # define VBOXGUEST_IOCTL_CODE_FAST(Function)    _IO(  'V', (Function) | VBOXGUEST_IOCTL_FLAG)
+
+# define VBOXGUEST_IOCTL_NUMBER(Code)           (_IOC_NR((Code)) & ~VBOXGUEST_IOCTL_FLAG)
 
 #elif defined(RT_OS_SOLARIS)
@@ -1112 +1114 @@
 # define VBOXGUEST_IOCTL_CLIPBOARD_CONNECT  VBOXGUEST_IOCTL_CODE(19, sizeof(uint32_t))
 # define IOCTL_VBOXGUEST_CLIPBOARD_CONNECT  VBOXGUEST_IOCTL_CLIPBOARD_CONNECT
+/* This was defined after the new IOCTL scheme was created, so we do not need
+   the compatibility macro. */
+# define VBOXGUEST_IOCTL_LOG(Size)          VBOXGUEST_IOCTL_CODE(20, (Size))
 #else
 # define IOCTL_VBOXGUEST_HGCM_CONNECT      IOCTL_CODE(FILE_DEVICE_UNKNOWN, 3072, METHOD_BUFFERED, FILE_WRITE_ACCESS, sizeof(VBoxGuestHGCMConnectInfo))
@@ -1117 +1122 @@
 # define IOCTL_VBOXGUEST_HGCM_CALL         IOCTL_CODE(FILE_DEVICE_UNKNOWN, 3074, METHOD_BUFFERED, FILE_WRITE_ACCESS, sizeof(VBoxGuestHGCMCallInfo))
 # define IOCTL_VBOXGUEST_CLIPBOARD_CONNECT IOCTL_CODE(FILE_DEVICE_UNKNOWN, 3075, METHOD_BUFFERED, FILE_WRITE_ACCESS, sizeof(uint32_t))
+# define VBOXGUEST_IOCTL_LOG(Size)         IOCTL_CODE(FILE_DEVICE_UNKNOWN, 3076, METHOD_BUFFERED, FILE_WRITE_ACCESS, (Size))
 #endif