Changeset 81911 in vbox

Timestamp:

Nov 17, 2019 8:00:51 PM (5 years ago)

Author:

vboxsync

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

134708

Message:

DevPIC: Converted I/O ports to new style. Replaced the memset approach to resetting with code clearing individual members. Use default statistics prefix (no release stats). bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (1 diff)
• src/VBox/Devices/testcase/tstDeviceStructSize.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmdev.h

@@ -5843 +5843 @@
 
 /**
+ * Combines PDMDevHlpIoPortCreate() & PDMDevHlpIoPortMap(), but with pvUser.
+ */
+DECLINLINE(int) PDMDevHlpIoPortCreateUAndMap(PPDMDEVINS pDevIns, RTIOPORT Port, RTIOPORT cPorts, PFNIOMIOPORTNEWOUT pfnOut,
+                                             PFNIOMIOPORTNEWIN pfnIn, void *pvUser,
+                                             const char *pszDesc, PCIOMIOPORTDESC paExtDescs, PIOMIOPORTHANDLE phIoPorts)
+{
+    int rc = pDevIns->pHlpR3->pfnIoPortCreateEx(pDevIns, cPorts, 0, NULL, UINT32_MAX,
+                                                pfnOut, pfnIn, NULL, NULL, pvUser, pszDesc, paExtDescs, phIoPorts);
+    if (RT_SUCCESS(rc))
+        rc = pDevIns->pHlpR3->pfnIoPortMap(pDevIns, *phIoPorts, Port);
+    return rc;
+}
+
+/**
  * Combines PDMDevHlpIoPortCreateEx() & PDMDevHlpIoPortMap().
  */

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

@@ -337 +337 @@
     CHECK_MEMBER_ALIGNMENT(BUSLOGIC, CritSectIntr, 8);
 #ifdef VBOX_WITH_STATISTICS
-    CHECK_MEMBER_ALIGNMENT(DEVPIC, StatSetIrqGC, 8);
+    CHECK_MEMBER_ALIGNMENT(DEVPIC, StatSetIrqRZ, 8);
 #endif
 #ifdef VBOX_WITH_E1000