Changeset 50674 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 4, 2014 11:15:29 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92613

Message:

Devices: fixes for VBOX_WITH_HGCM undefined (thanks Genode Labs)

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (5 diffs)
• VMMDev/VMMDev.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -119 +119 @@
         VBOX_ACPI \
         VBOX_HGCM_HOST_CODE \
-        VBOX_WITH_HGCM \
+        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
         $(if $(VBOX_BIOS_DMI_FALLBACK),VBOX_BIOS_DMI_FALLBACK,) \
         VBOX_WITH_DMI_CHASSIS \
@@ -152 +152 @@
         PC/DevPcArch.cpp \
         VMMDev/VMMDev.cpp \
-        VMMDev/VMMDevHGCM.cpp \
+        $(if $(VBOX_WITH_HGCM),VMMDev/VMMDevHGCM.cpp,) \
         VMMDev/VMMDevTesting.cpp \
         Network/DevPCNet.cpp \
@@ -793 +793 @@
    VBoxDDGC_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
   endif
-  VBoxDDGC_DEFS           = VBOX_WITH_HGCM
+  VBoxDDGC_DEFS           = $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
   VBoxDDGC_INCS           = build
   VBoxDDGC_SOURCES        = \
@@ -944 +944 @@
  VBoxDDR0_TEMPLATE       = VBoxR0
  VBoxDDR0_DEFS.darwin.x86= VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 VBOX_WITH_2X_4GB_ADDR_SPACE
- VBoxDDR0_DEFS           = IN_RT_R0 VBOX_WITH_HGCM # - WTF is IN_RT_R0 doing here?
+ VBoxDDR0_DEFS           = IN_RT_R0 $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) # - WTF is IN_RT_R0 doing here?
  VBoxDDR0_DEFS.win    += VBOX_WITH_WIN_PARPORT_SUP
  VBoxDDR0_INCS           = build
@@ -1121 +1121 @@
  #
  ServicesR0_TEMPLATE  = VBoxR0
- ServicesR0_DEFS      = IN_INTNET_R0 IN_RT_R0 $(if $(VBOX_WITH_PCI_PASSTHROUGH),IN_PCIRAW_R0,) \
+ ServicesR0_DEFS      = IN_INTNET_R0 IN_RT_R0 \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),IN_PCIRAW_R0,) \
         $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,)
  ServicesR0_SOURCES   = \

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1514 +1514 @@
 }
 
-#endif /* VBOX_WITH_HGCM */
-
 /**
  * Handles VMMDevReq_HGCMCancel.
@@ -1561 +1559 @@
     return vmmdevHGCMCancel2(pThis, pReq->physReqToCancel);
 }
+
+#endif /* VBOX_WITH_HGCM */
 
 
@@ -2405 +2405 @@
             *pfDelayedUnlock = true;
             break;
-#endif /* VBOX_WITH_HGCM */
 
         case VMMDevReq_HGCMCancel:
@@ -2415 +2414 @@
             pReqHdr->rc = vmmdevReqHandler_HGCMCancel2(pThis, pReqHdr);
             break;
+#endif /* VBOX_WITH_HGCM */
 
         case VMMDevReq_VideoAccelEnable:
@@ -3596 +3596 @@
     pThis->u32LastStatIntervalSize = 0;
 
+#ifdef VBOX_WITH_HGCM
     /* Clear the "HGCM event enabled" flag so the event can be automatically reenabled.  */
     pThis->u32HGCMEnabled = 0;
+#endif
 
     /*