Changeset 71829 in vbox for trunk

Timestamp:

Apr 11, 2018 5:17:06 PM (7 years ago)

Author:

vboxsync

Message:

DevLPC-new: Kicked off new LPC implementation. bugref:7000

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (3 diffs)
• PC/DevLpc-new.cpp (added)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)
• build/VBoxDD2.cpp (modified) (1 diff)
• build/VBoxDD2.h (modified) (1 diff)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -128 +128 @@
         $(if $(VBOX_BIOS_DMI_FALLBACK),VBOX_BIOS_DMI_FALLBACK,) \
         VBOX_WITH_DMI_CHASSIS \
-        VBOX_WITH_DMI_OEMSTRINGS
+        VBOX_WITH_DMI_OEMSTRINGS \
+        $(if $(VBOX_WITH_NEW_LPC_DEVICE),VBOX_WITH_NEW_LPC_DEVICE,)
  VBoxDD_DEFS.win         = _WIN32_WINNT=0x0510
  ifeq ($(KBUILD_TARGET_ARCH),x86)
@@ -156 +157 @@
         PC/DevFwCommon.cpp \
         PC/DevPcArch.cpp \
+        $(if $(VBOX_WITH_NEW_LPC_DEVICE),PC/DevLpc-new.cpp,) \
         GIMDev/GIMDev.cpp \
         GIMDev/DrvUDP.cpp \
@@ -1047 +1049 @@
  VBoxDD2_DEFS            = \
         IN_VBOXDD2 \
-        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,)
+        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
+       $(if $(VBOX_WITH_NEW_LPC_DEVICE),VBOX_WITH_NEW_LPC_DEVICE,)
  VBoxDD2_INCS           := \
         build \
         $(PATH_SUB_CURRENT)
  VBoxDD2_SOURCES         = \
-        build/VBoxDD2.cpp  \
-        PC/DevLPC.cpp
+        build/VBoxDD2.cpp \
+        $(if $(VBOX_WITH_NEW_LPC_DEVICE),,PC/DevLPC.cpp)
  VBoxDD2_LIBS            = \
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -197 +197 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_NEW_LPC_DEVICE
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
 #ifdef VBOX_WITH_VIRTUALKD
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVirtualKD);

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -89 +89 @@
 #endif
 extern const PDMDEVREG g_DeviceGIMDev;
+#ifdef VBOX_WITH_NEW_LPC_DEVICE
+extern const PDMDEVREG g_DeviceLPC;
+#endif
 #ifdef VBOX_WITH_VIRTUALKD
 extern const PDMDEVREG g_DeviceVirtualKD;

trunk/src/VBox/Devices/build/VBoxDD2.cpp

@@ -62 +62 @@
     AssertReleaseMsg(u32Version == VBOX_VERSION, ("u32Version=%#x VBOX_VERSION=%#x\n", u32Version, VBOX_VERSION));
 
+#ifndef VBOX_WITH_NEW_LPC_DEVICE
     int rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
     if (RT_FAILURE(rc))
         return rc;
+#else
+    RT_NOREF(pCallbacks);
+#endif
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/build/VBoxDD2.h

@@ -61 +61 @@
 #endif /* !IN_VBOXDD2 */
 
+#ifndef VBOX_WITH_NEW_LPC_DEVICE
 extern const PDMDEVREG g_DeviceLPC;
+#endif
 
 RT_C_DECLS_END

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -89 +89 @@
 #undef LOG_GROUP
 #include "../PC/DevDMA.cpp"
-#undef LOG_GROUP
-#include "../PC/DevLPC.cpp"
 #undef LOG_GROUP
 #include "../EFI/DevSmc.cpp"