Changeset 11151 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 5, 2008 10:37:45 PM (17 years ago)

Author:

vboxsync

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

34141

Message:

#1865: ATA and AHCI.

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevATA.cpp (modified) (4 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -4909 +4909 @@
 {
     if (s->pbIOBufferR3)
-        s->pbIOBufferGC = MMHyperR3ToGC(PDMDevHlpGetVM(pDevIns), s->pbIOBufferR3);
+        s->pbIOBufferGC = MMHyperR3ToRC(PDMDevHlpGetVM(pDevIns), s->pbIOBufferR3);
 }
 
@@ -5093 +5093 @@
         Assert(pIf->pbIOBufferR3);
         Assert(pIf->pbIOBufferR0 == MMHyperR3ToR0(pVM, pIf->pbIOBufferR3));
-        Assert(pIf->pbIOBufferGC == MMHyperR3ToGC(pVM, pIf->pbIOBufferR3));
+        Assert(pIf->pbIOBufferGC == MMHyperR3ToRC(pVM, pIf->pbIOBufferR3));
     }
     else
@@ -5106 +5106 @@
             return VERR_NO_MEMORY;
         pIf->pbIOBufferR0 = MMHyperR3ToR0(pVM, pIf->pbIOBufferR3);
-        pIf->pbIOBufferGC = MMHyperR3ToGC(pVM, pIf->pbIOBufferR3);
+        pIf->pbIOBufferGC = MMHyperR3ToRC(pVM, pIf->pbIOBufferR3);
     }
 
@@ -5612 +5612 @@
             pData->aCts[i].aIfs[j].pControllerR3 = &pData->aCts[i];
             pData->aCts[i].aIfs[j].pControllerR0 = MMHyperR3ToR0(PDMDevHlpGetVM(pDevIns), &pData->aCts[i]);
-            pData->aCts[i].aIfs[j].pControllerGC = MMHyperR3ToGC(PDMDevHlpGetVM(pDevIns), &pData->aCts[i]);
+            pData->aCts[i].aIfs[j].pControllerGC = MMHyperR3ToRC(PDMDevHlpGetVM(pDevIns), &pData->aCts[i]);
             pData->aCts[i].aIfs[j].IBase.pfnQueryInterface = ataQueryInterface;
             pData->aCts[i].aIfs[j].IMountNotify.pfnMountNotify = ataMountNotify;

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

@@ -862 +862 @@
 
     GEN_CHECK_SIZE(AHCIPort);
-    GEN_CHECK_OFF(AHCIPort, pDevInsHC);
+    GEN_CHECK_OFF(AHCIPort, pDevInsR3);
+    GEN_CHECK_OFF(AHCIPort, pDevInsR0);
     GEN_CHECK_OFF(AHCIPort, pDevInsGC);
-    GEN_CHECK_OFF(AHCIPort, pAhciHC);
+    GEN_CHECK_OFF(AHCIPort, pAhciR3);
+    GEN_CHECK_OFF(AHCIPort, pAhciR0);
     GEN_CHECK_OFF(AHCIPort, pAhciGC);
     GEN_CHECK_OFF(AHCIPort, regCLB);
@@ -922 +924 @@
     GEN_CHECK_SIZE(AHCI);
     GEN_CHECK_OFF(AHCI, dev);
-    GEN_CHECK_OFF(AHCI, pDevInsHC);
+    GEN_CHECK_OFF(AHCI, pDevInsR3);
+    GEN_CHECK_OFF(AHCI, pDevInsR0);
     GEN_CHECK_OFF(AHCI, pDevInsGC);
     GEN_CHECK_OFF(AHCI, IBase);
@@ -935 +938 @@
     GEN_CHECK_OFF(AHCI, regHbaCccCtl);
     GEN_CHECK_OFF(AHCI, regHbaCccPorts);
-    GEN_CHECK_OFF(AHCI, pHbaCccTimerHC);
+    GEN_CHECK_OFF(AHCI, pHbaCccTimerR3);
+    GEN_CHECK_OFF(AHCI, pHbaCccTimerR0);
     GEN_CHECK_OFF(AHCI, pHbaCccTimerGC);
-    GEN_CHECK_OFF(AHCI, pNotifierQueueHC);
+    GEN_CHECK_OFF(AHCI, pNotifierQueueR3);
+    GEN_CHECK_OFF(AHCI, pNotifierQueueR0);
     GEN_CHECK_OFF(AHCI, pNotifierQueueGC);
     GEN_CHECK_OFF(AHCI, uCccPortNr);