We handle the native and 32-bits compat ioctls exactly the same, so there
is no need for separate codes, remove the VBOXGUEST_IOCTL_HGCM_CONNECT_32
and VBOXGUEST_IOCTL_HGCM_DISCONNECT_32 defines and make the regular
defines use VBOXGUEST_IOCTL_CODE_ so that their value is the same for
32 and 64 bit builds.
Signed-off-by: Hans de Goede <hdego...@redhat.com>
---
include/VBox/VBoxGuest.h | 6 ++----
src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp | 6 ------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/include/VBox/VBoxGuest.h b/include/VBox/VBoxGuest.h
index 221b1a76..b2650bf8 100644
--- a/include/VBox/VBoxGuest.h
+++ b/include/VBox/VBoxGuest.h
@@ -350,10 +350,10 @@ AssertCompileSize(VBoxGuestWriteCoreDump, 4);
#ifdef VBOX_WITH_HGCM
/** IOCTL to VBoxGuest to connect to a HGCM service. */
-# define VBOXGUEST_IOCTL_HGCM_CONNECT VBOXGUEST_IOCTL_CODE(16,
sizeof(VBoxGuestHGCMConnectInfo))
+# define VBOXGUEST_IOCTL_HGCM_CONNECT VBOXGUEST_IOCTL_CODE_(16,
sizeof(VBoxGuestHGCMConnectInfo))
/** IOCTL to VBoxGuest to disconnect from a HGCM service. */
-# define VBOXGUEST_IOCTL_HGCM_DISCONNECT VBOXGUEST_IOCTL_CODE(17,
sizeof(VBoxGuestHGCMDisconnectInfo))
+# define VBOXGUEST_IOCTL_HGCM_DISCONNECT VBOXGUEST_IOCTL_CODE_(17,
sizeof(VBoxGuestHGCMDisconnectInfo))
/** IOCTL to VBoxGuest to make a call to a HGCM service.
* @see VBoxGuestHGCMCallInfo */
@@ -372,8 +372,6 @@ AssertCompileSize(VBoxGuestWriteCoreDump, 4);
* driver, will use when taking to a 64-bit driver.
* @remarks These are only used by the driver implementation!
* @{*/
-# define VBOXGUEST_IOCTL_HGCM_CONNECT_32
VBOXGUEST_IOCTL_CODE_32(16, sizeof(VBoxGuestHGCMConnectInfo))
-# define VBOXGUEST_IOCTL_HGCM_DISCONNECT_32
VBOXGUEST_IOCTL_CODE_32(17, sizeof(VBoxGuestHGCMDisconnectInfo))
# define VBOXGUEST_IOCTL_HGCM_CALL_32(Size)
VBOXGUEST_IOCTL_CODE_32(18, (Size))
# define VBOXGUEST_IOCTL_HGCM_CALL_TIMED_32(Size)
VBOXGUEST_IOCTL_CODE_32(20, (Size))
/** @} */
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
index a13874a2..316cce57 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
@@ -3529,17 +3529,11 @@ int VGDrvCommonIoCtl(unsigned iFunction,
PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSES
#ifdef VBOX_WITH_HGCM
case VBOXGUEST_IOCTL_HGCM_CONNECT:
-# ifdef RT_ARCH_AMD64
- case VBOXGUEST_IOCTL_HGCM_CONNECT_32:
-# endif
CHECKRET_MIN_SIZE("HGCM_CONNECT",
sizeof(VBoxGuestHGCMConnectInfo));
rc = vgdrvIoCtl_HGCMConnect(pDevExt, pSession,
(VBoxGuestHGCMConnectInfo *)pvData, pcbDataReturned);
break;
case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
-# ifdef RT_ARCH_AMD64
- case VBOXGUEST_IOCTL_HGCM_DISCONNECT_32:
-# endif
CHECKRET_MIN_SIZE("HGCM_DISCONNECT",
sizeof(VBoxGuestHGCMDisconnectInfo));
rc = vgdrvIoCtl_HGCMDisconnect(pDevExt, pSession,
(VBoxGuestHGCMDisconnectInfo *)pvData, pcbDataReturned);
break;
--
2.13.4
_______________________________________________
vbox-dev mailing list
vbox-dev@virtualbox.org
https://www.virtualbox.org/mailman/listinfo/vbox-dev
