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

Timestamp:

Sep 1, 2019 11:03:34 PM (5 years ago)

Author:

vboxsync

Message:

VMM,Devices: Some PDM device model refactoring. bugref:9218

Location:

trunk/src/VBox/Devices/build

Files:

• VBoxDD.cpp (modified) (1 diff)
• VBoxDD2.h (modified) (1 diff)
• VBoxDDR0.cpp (modified) (2 diffs)

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

@@ -146 +146 @@
         return rc;
 #endif
-#ifdef VBOX_ACPI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
     if (RT_FAILURE(rc))
         return rc;
-#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceDMA);
     if (RT_FAILURE(rc))

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

@@ -71 +71 @@
 
 #endif /* !VBOX_INCLUDED_SRC_build_VBoxDD2_h */
-

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

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/types.h>
+#define LOG_GROUP LOG_GROUP_DEV
+#include <VBox/log.h>
+#include <VBox/sup.h>
+#include <VBox/vmm/pdmdev.h>
+
+#include "VBoxDD.h"
 
 
@@ -31 +36 @@
 #endif
 
+/**
+ * Pointer to the ring-0 device registrations for VBoxDDR0.
+ */
+static PCPDMDEVREGR0 g_apVBoxDDR0DevRegs[] =
+{
+    &g_DevicePCI,
+    &g_DevicePciIch9,
+    &g_DeviceIOAPIC,
+    &g_DevicePS2KeyboardMouse,
+    &g_DevicePIIX3IDE,
+    &g_DeviceI8254,
+    &g_DeviceI8259,
+    &g_DeviceHPET,
+    &g_DeviceSmc,
+    /// @todo &g_DeviceFlash,
+    &g_DeviceMC146818,
+    &g_DeviceVga,
+    &g_DeviceVMMDev,
+    &g_DevicePCNet,
+#ifdef VBOX_WITH_E1000
+    &g_DeviceE1000,
+#endif
+#ifdef VBOX_WITH_VIRTIO
+    &g_DeviceVirtioNet,
+#endif
+    &g_DeviceICHAC97,
+    &g_DeviceHDA,
+#ifdef VBOX_WITH_VUSB
+    &g_DeviceOHCI,
+#endif
+#ifdef VBOX_WITH_EHCI_IMPL
+    &g_DeviceEHCI,
+#endif
+#ifdef VBOX_WITH_XHCI_IMPL
+    &g_DeviceXHCI,
+#endif
+    &g_DeviceACPI,
+    &g_DeviceDMA,
+    &g_DeviceSerialPort,
+    &g_DeviceOxPcie958,
+    &g_DeviceParallelPort,
+#ifdef VBOX_WITH_AHCI
+    &g_DeviceAHCI,
+#endif
+#ifdef VBOX_WITH_BUSLOGIC
+    &g_DeviceBusLogic,
+#endif
+    &g_DevicePCIBridge,
+    &g_DevicePciIch9Bridge,
+#ifdef VBOX_WITH_LSILOGIC
+    &g_DeviceLsiLogicSCSI,
+    &g_DeviceLsiLogicSAS,
+#endif
+#ifdef VBOX_WITH_NVME_IMPL
+    &g_DeviceNVMe,
+#endif
+#ifdef VBOX_WITH_VIRTIO_SCSI
+    &g_DeviceVirtioSCSI,
+#endif
+#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
+    &g_DevicePciRaw,
+#endif
+    &g_DeviceGIMDev,
+#ifdef VBOX_WITH_NEW_LPC_DEVICE
+    &g_DeviceLPC,
+#endif
+};
+
+/**
+ * Module device registration record for VBoxDDR0.
+ */
+static PDMDEVMODREGR0 g_VBoxDDR0ModDevReg =
+{
+    /* .u32Version = */ PDM_DEVMODREGR0_VERSION,
+    /* .cDevRegs = */   RT_ELEMENTS(g_apVBoxDDR0DevRegs),
+    /* .papDevRegs = */ &g_apVBoxDDR0DevRegs[0],
+    /* .hMod = */       NULL,
+    /* .ListEntry = */  { NULL, NULL },
+};
+
+
+DECLEXPORT(int)  ModuleInit(void *hMod)
+{
+    LogFlow(("VBoxDDR0/ModuleInit: %p\n", hMod));
+    return PDMR0DeviceRegisterModule(hMod, &g_VBoxDDR0ModDevReg);
+}
+
+
+DECLEXPORT(void) ModuleTerm(void *hMod)
+{
+    LogFlow(("VBoxDDR0/ModuleTerm: %p\n", hMod));
+    PDMR0DeviceDeregisterModule(hMod, &g_VBoxDDR0ModDevReg);
+}
+
+