Changeset 86639 in vbox for trunk/src/VBox/Devices/build

Timestamp:

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

Author:

vboxsync

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/src/VBox/Devices/build

Files:

• VBoxDD.cpp (modified) (1 diff)
• VBoxDD.h (modified) (1 diff)
• VBoxDD2.cpp (modified) (1 diff)
• VBoxDD2.h (modified) (1 diff)

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