Changeset 6313 in vbox

Timestamp:

Jan 9, 2008 10:26:56 PM (17 years ago)

Author:

vboxsync

Message:

Integrate async drivers. Fix testcase

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (1 diff)
• Builtins.h (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -246 +246 @@
 #endif
 
+#if defined(VBOX_WITH_PDM_ASYNC_COMPLETION)
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvRawImageAsync);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvTransportAsync);
+    if (VBOX_FAILURE(rc))
+        return rc;
+#endif
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Devices/Builtins.h

@@ -87 +87 @@
 #endif
 
+#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
+extern const PDMDRVREG g_DrvRawImageAsync;
+extern const PDMDRVREG g_DrvTransportAsync;
+#endif
+
 __END_DECLS
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -119 +119 @@
  VBoxDD_DEFS           += VBOX_WITH_E1000
  VBoxDD_DEFS           += VBOX_WITH_INIP
+endif
+ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
+ VBoxDD_DEFS           += VBOX_WITH_PDM_ASYNC_COMPLETION
 endif
 VBoxDD_LIBS             = \
@@ -652 +655 @@
  Drivers_DEFS += VBOX_WITH_PDM_ASYNC_COMPLETION
  Drivers_SOURCES.linux += \
-        Storage/DrvBlockAsync.cpp \
         Storage/DrvRawImageAsync.cpp \
         Storage/DrvTransportAsync.cpp
 
  Drivers_SOURCES.win += \
-        Storage/DrvBlockAsync.cpp \
         Storage/DrvRawImageAsync.cpp \
         Storage/DrvTransportAsync.cpp

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

@@ -842 +842 @@
     GEN_CHECK_SIZE(AHCIPORTTASKSTATE);
     GEN_CHECK_OFF(AHCIPORTTASKSTATE, pAhciPortHC);
-    GEN_CHECK_OFF(AHCIPORTTASKSTATE, pAhciPortGC);
     GEN_CHECK_OFF(AHCIPORTTASKSTATE, uTag);
     GEN_CHECK_OFF(AHCIPORTTASKSTATE, fPending);
@@ -882 +881 @@
     GEN_CHECK_OFF(AHCIPort, IBase);
     GEN_CHECK_OFF(AHCIPort, IPort);
-    GEN_CHECK_OFF(AHCIPort, cCHSCylinders);
-    GEN_CHECK_OFF(AHCIPort, cCHSHeads);
-    GEN_CHECK_OFF(AHCIPort, cCHSSectors);
+    GEN_CHECK_OFF(AHCIPort, PCHSGeometry);
     GEN_CHECK_OFF(AHCIPort, cTotalSectors);
     GEN_CHECK_OFF(AHCIPort, cMultSectors);