Changeset 11145 in vbox for trunk/src/VBox/Devices/testcase

Timestamp:

Aug 5, 2008 9:06:08 PM (16 years ago)

Author:

vboxsync

Message:

#1865: ATA and AHCI.

Location:

trunk/src/VBox/Devices/testcase

Files:

• tstDeviceStructSize.cpp (modified) (2 diffs)
• tstDeviceStructSizeGC.cpp (modified) (3 diffs)

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

@@ -59 +59 @@
 #include "Serial/DevSerial.cpp"
 #ifdef VBOX_WITH_AHCI
-#undef LOG_GROUP
-#include "Storage/DevAHCI.cpp"
+# undef LOG_GROUP
+# include "Storage/DevAHCI.cpp"
 #endif
 #ifdef VBOX_WITH_E1000
-#undef LOG_GROUP
-#include "Network/DevE1000.cpp"
+# undef LOG_GROUP
+# include "Network/DevE1000.cpp"
 #endif
 
@@ -224 +224 @@
     CHECK_MEMBER_ALIGNMENT(PITState, StatPITIrq, 8);
     CHECK_MEMBER_ALIGNMENT(ATADevState, cTotalSectors, 8);
+    CHECK_MEMBER_ALIGNMENT(ATADevState, StatATADMA, 8);
     CHECK_MEMBER_ALIGNMENT(ATADevState, StatReads, 8);
     CHECK_MEMBER_ALIGNMENT(ATACONTROLLER, StatAsyncOps, 8);

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

@@ -623 +623 @@
     GEN_CHECK_OFF(ATADevState, Led);
     GEN_CHECK_OFF(ATADevState, cbIOBuffer);
-    GEN_CHECK_OFF(ATADevState, pbIOBufferHC);
+    GEN_CHECK_OFF(ATADevState, pbIOBufferR3);
+    GEN_CHECK_OFF(ATADevState, pbIOBufferR0);
     GEN_CHECK_OFF(ATADevState, pbIOBufferGC);
     GEN_CHECK_OFF(ATADevState, StatATADMA);
+    GEN_CHECK_OFF(ATADevState, StatATAPIO);
+    GEN_CHECK_OFF(ATADevState, StatATAPIDMA);
+    GEN_CHECK_OFF(ATADevState, StatATAPIPIO);
     GEN_CHECK_OFF(ATADevState, StatReads);
     GEN_CHECK_OFF(ATADevState, StatBytesRead);
@@ -641 +645 @@
     GEN_CHECK_OFF(ATADevState, IMountNotify);
     GEN_CHECK_OFF(ATADevState, iLUN);
-    GEN_CHECK_OFF(ATADevState, pDevInsHC);
+    GEN_CHECK_OFF(ATADevState, pDevInsR3);
+    GEN_CHECK_OFF(ATADevState, pDevInsR0);
     GEN_CHECK_OFF(ATADevState, pDevInsGC);
-    GEN_CHECK_OFF(ATADevState, pControllerHC);
+    GEN_CHECK_OFF(ATADevState, pControllerR3);
+    GEN_CHECK_OFF(ATADevState, pControllerR0);
     GEN_CHECK_OFF(ATADevState, pControllerGC);
     GEN_CHECK_SIZE(ATATransferRequest);
@@ -679 +685 @@
     GEN_CHECK_OFF(ATACONTROLLER, aIfs);
     GEN_CHECK_OFF(ATACONTROLLER, aIfs[1]);
-    GEN_CHECK_OFF(ATACONTROLLER, pDevInsHC);
+    GEN_CHECK_OFF(ATACONTROLLER, pDevInsR3);
+    GEN_CHECK_OFF(ATACONTROLLER, pDevInsR0);
     GEN_CHECK_OFF(ATACONTROLLER, pDevInsGC);
     GEN_CHECK_OFF(ATACONTROLLER, fShutdown);