Changeset 20567 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jun 14, 2009 8:31:54 PM (16 years ago)

Author:

vboxsync

Message:

DevATA,ATAController: Do not use MMGCRamReadNoTrapHandler nor MMGCRamWriteNoTrapHandler like that, they may both raise guru meditations. Changed the code to use the same PGMPhys*Read/Write APIs as in ring-3.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (3 diffs)

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

@@ -5400 +5400 @@
 }
 
-#ifndef IN_RING0
+#ifndef IN_RING0 /** @todo do this in ring-0 as well. */
 /**
  * Port I/O Handler for primary port range IN string operations.
@@ -5435 +5435 @@
         cbTransfer = cTransAvailable * cb;
 
-#ifdef IN_RC
-        for (uint32_t i = 0; i < cbTransfer; i += cb)
-            MMGCRamWriteNoTrapHandler((char *)GCDst + i, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, cb);
-#else /* !IN_RC */
         rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
         Assert(rc == VINF_SUCCESS);
-#endif /* IN_RC */
 
         if (cbTransfer)
@@ -5492 +5487 @@
         cbTransfer = cTransAvailable * cb;
 
-#ifdef IN_RC
-        for (uint32_t i = 0; i < cbTransfer; i += cb)
-            MMGCRamReadNoTrapHandler(s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, (char *)GCSrc + i, cb);
-#else /* !IN_RC */
         rc = PGMPhysSimpleReadGCPtr(PDMDevHlpGetVMCPU(pDevIns), s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
         Assert(rc == VINF_SUCCESS);
-#endif /* IN_RC */
 
         if (cbTransfer)