Changeset 84514 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

May 25, 2020 3:58:22 PM (5 years ago)

Author:

vboxsync

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

138243

Message:

Devices/USB: Convert to use new PDMDevHlp guest memory read/write helpers differentiating between metadata/userdata transfers for tracing, bugref:9210

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -1312 +1312 @@
 {
     if (cbBuf)
-        PDMDevHlpPhysRead(pDevIns, Addr, pvBuf, cbBuf);
+        PDMDevHlpPhysReadUser(pDevIns, Addr, pvBuf, cbBuf);
+}
+
+/**
+ * Reads physical memory - metadata.
+ */
+DECLINLINE(void) ohciR3PhysReadMeta(PPDMDEVINS pDevIns, uint32_t Addr, void *pvBuf, size_t cbBuf)
+{
+    if (cbBuf)
+        PDMDevHlpPhysReadMeta(pDevIns, Addr, pvBuf, cbBuf);
 }
 
@@ -1321 +1330 @@
 {
     if (cbBuf)
-        PDMDevHlpPCIPhysWrite(pDevIns, Addr, pvBuf, cbBuf);
+        PDMDevHlpPCIPhysWriteUser(pDevIns, Addr, pvBuf, cbBuf);
+}
+
+/**
+ * Writes physical memory - metadata.
+ */
+DECLINLINE(void) ohciR3PhysWriteMeta(PPDMDEVINS pDevIns, uint32_t Addr, const void *pvBuf, size_t cbBuf)
+{
+    if (cbBuf)
+        PDMDevHlpPCIPhysWriteMeta(pDevIns, Addr, pvBuf, cbBuf);
 }
 
@@ -1329 +1347 @@
 DECLINLINE(void) ohciR3GetDWords(PPDMDEVINS pDevIns, uint32_t Addr, uint32_t *pau32s, int c32s)
 {
-    ohciR3PhysRead(pDevIns, Addr, pau32s, c32s * sizeof(uint32_t));
+    ohciR3PhysReadMeta(pDevIns, Addr, pau32s, c32s * sizeof(uint32_t));
 # ifndef RT_LITTLE_ENDIAN
     for(int i = 0; i < c32s; i++)
@@ -1342 +1360 @@
 {
 # ifdef RT_LITTLE_ENDIAN
-    ohciR3PhysWrite(pDevIns, Addr, pau32s, cu32s << 2);
+    ohciR3PhysWriteMeta(pDevIns, Addr, pau32s, cu32s << 2);
 # else
     for (int i = 0; i < c32s; i++, pau32s++, Addr += sizeof(*pau32s))
     {
         uint32_t u32Tmp = RT_H2LE_U32(*pau32s);
-        ohciR3PhysWrite(pDevIns, Addr, (uint8_t *)&u32Tmp, sizeof(u32Tmp));
+        ohciR3PhysWriteMeta(pDevIns, Addr, (uint8_t *)&u32Tmp, sizeof(u32Tmp));
     }
 # endif
@@ -4040 +4058 @@
 
     Log3(("ohci: Updating HCCA on frame %#x\n", pThis->HcFmNumber));
-    ohciR3PhysWrite(pDevIns, pThis->hcca + OHCI_HCCA_OFS, (uint8_t *)&hcca, sizeof(hcca));
+    ohciR3PhysWriteMeta(pDevIns, pThis->hcca + OHCI_HCCA_OFS, (uint8_t *)&hcca, sizeof(hcca));
     if (fWriteDoneHeadInterrupt)
         ohciR3SetInterrupt(pDevIns, pThis, OHCI_INTR_WRITE_DONE_HEAD);