Changeset 86639 in vbox

Timestamp:

Oct 20, 2020 10:16:15 AM (4 years ago)

Author:

vboxsync

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

141015

Message:

Config.kmk,Devices/DevLpc-new.cpp: Get rid of VBOX_WITH_NEW_LPC_DEVICE and make it the default, the odl DevLPC.cpp doesn't exist anymore for a long time now

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Devices/PC/DevLpc.cpp (moved) (moved from trunk/src/VBox/Devices/PC/DevLpc-new.cpp )
• src/VBox/Devices/build/VBoxDD.cpp (modified) (1 diff)
• src/VBox/Devices/build/VBoxDD.h (modified) (1 diff)
• src/VBox/Devices/build/VBoxDD2.cpp (modified) (1 diff)
• src/VBox/Devices/build/VBoxDD2.h (modified) (1 diff)

trunk/Config.kmk

@@ -619 +619 @@
 # Storage related debug drivers
 VBOX_WITH_DRV_DISK_INTEGRITY = 1
-# Enables new LPC device implementation.
-VBOX_WITH_NEW_LPC_DEVICE = 1
 # Enables the AMD IOMMU
 #VBOX_WITH_IOMMU_AMD = 1

trunk/src/VBox/Devices/Makefile.kmk

@@ -151 +151 @@
         VBOX_WITH_DMI_CHASSIS \
         VBOX_WITH_DMI_OEMSTRINGS \
-        $(if $(VBOX_WITH_NEW_LPC_DEVICE),VBOX_WITH_NEW_LPC_DEVICE,) \
         $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,)
  VBoxDD_DEFS.win         = _WIN32_WINNT=0x0510
@@ -184 +183 @@
         PC/DevPcArch.cpp \
         PC/DevQemuFwCfg.cpp \
-        $(if $(VBOX_WITH_NEW_LPC_DEVICE),PC/DevLpc-new.cpp,) \
+        PC/DevLpc.cpp \
         GIMDev/GIMDev.cpp \
         GIMDev/DrvUDP.cpp \
@@ -1087 +1086 @@
  VBoxDD2_DEFS            = \
         IN_VBOXDD2 \
-        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
-       $(if $(VBOX_WITH_NEW_LPC_DEVICE),VBOX_WITH_NEW_LPC_DEVICE,)
+        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,)
  VBoxDD2_INCS           := \
         build \
         $(PATH_SUB_CURRENT)
  VBoxDD2_SOURCES         = \
-        build/VBoxDD2.cpp \
-        $(if $(VBOX_WITH_NEW_LPC_DEVICE),,PC/DevLPC.cpp)
+        build/VBoxDD2.cpp
  VBoxDD2_LIBS            = \
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \

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

@@ -211 +211 @@
     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

@@ -100 +100 @@
 #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

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