Changeset 81929 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 18, 2019 12:44:16 AM (5 years ago)

Author:

vboxsync

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

134726

Message:

DevPcArch: Converted to new PDM device style. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevPcArch.cpp (modified) (14 diffs)

trunk/src/VBox/Devices/PC/DevPcArch.cpp

@@ -48 +48 @@
 
 /**
- * @callback_method_impl{FNIOMIOPORTIN, Math coprocessor.}
- */
-static DECLCALLBACK(int) pcarchIOPortFPURead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+ * @callback_method_impl{FNIOMIOPORTNEWIN, Math coprocessor.}
+ * @note offPort is absolute
+ */
+static DECLCALLBACK(VBOXSTRICTRC)
+pcarchIOPortFPURead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
 {
     int rc;
     NOREF(pvUser); NOREF(pDevIns); NOREF(pu32);
-    rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", Port, cb);
+    rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", offPort, cb);
     if (rc == VINF_SUCCESS)
         rc = VERR_IOM_IOPORT_UNUSED;
@@ -61 +63 @@
 
 /**
- * @callback_method_impl{FNIOMIOPORTOUT, Math coprocessor.}
+ * @callback_method_impl{FNIOMIOPORTNEWOUT, Math coprocessor.}
+ * @note    offPort is absolute
  * @todo Add IGNNE support.
  */
-static DECLCALLBACK(int) pcarchIOPortFPUWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+pcarchIOPortFPUWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
 {
     int rc = VINF_SUCCESS;
@@ -70 +74 @@
     if (cb == 1)
     {
-        switch (Port)
+        switch (offPort)
         {
             /*
@@ -80 +84 @@
 #if 0
                 if (!u32)
-                    rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
+                    rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", offPort, cb, u32);
 #endif
                 /* pDevIns->pHlp->pfnPICSetIrq(pDevIns, 13, 0); */
@@ -97 +101 @@
             case 0xfc:
             default:
-                rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
+                rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", offPort, cb, u32);
                 break;
         }
@@ -104 +108 @@
     }
     else
-        rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
+        rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", offPort, cb, u32);
     return rc;
 }
@@ -143 +147 @@
 SeeAlso: #P0416,#P0417,MSR 00001000h
  * @endverbatim
- */
-static DECLCALLBACK(int)
-pcarchIOPortPS2SysControlPortARead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+ * @note    offPort is absolute
+ */
+static DECLCALLBACK(VBOXSTRICTRC)
+pcarchIOPortPS2SysControlPortARead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
 {
     RT_NOREF1(pvUser);
@@ -153 +158 @@
         return VINF_SUCCESS;
     }
-    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", Port, cb);
+    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", offPort, cb);
 }
 
@@ -160 +165 @@
  * @callback_method_impl{FNIOMIOPORTOUT, PS/2 system control port A.}
  * @see     Remark and todo of pcarchIOPortPS2SysControlPortARead().
- */
-static DECLCALLBACK(int)
-pcarchIOPortPS2SysControlPortAWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+ * @note    offPort is absolute
+ */
+static DECLCALLBACK(VBOXSTRICTRC)
+pcarchIOPortPS2SysControlPortAWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
 {
     NOREF(pvUser);
@@ -182 +188 @@
         return VINF_SUCCESS;
     }
-    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
-}
-
-
-/**
- * @callback_method_impl{FNIOMMMIOWRITE, Ignores writes to the reserved memory.}
- */
-static DECLCALLBACK(int) pcarchReservedMemoryWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr,
-                                                   void const *pv, unsigned cb)
-{
-    Log2(("pcarchReservedMemoryRead: %#RGp LB %#x %.*Rhxs\n", GCPhysAddr, cb, RT_MIN(cb, 16), pv));
-    NOREF(pDevIns); NOREF(pvUser); NOREF(GCPhysAddr); NOREF(pv); NOREF(cb);
+    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", offPort, cb, u32);
+}
+
+
+/**
+ * @callback_method_impl{FNIOMMMIONEWWRITE, Ignores writes to the reserved memory.}
+ * @note    off is an absolute address.
+ */
+static DECLCALLBACK(VBOXSTRICTRC)
+pcarchReservedMemoryWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
+{
+    Log2(("pcarchReservedMemoryRead: %#RGp LB %#x %.*Rhxs\n", off, cb, RT_MIN(cb, 16), pv));
+    RT_NOREF(pDevIns, pvUser, off, pv, cb);
     return VINF_SUCCESS;
 }
@@ -199 +206 @@
 
 /**
- * @callback_method_impl{FNIOMMMIOREAD, The reserved memory reads as 0xff.}
- */
-static DECLCALLBACK(int) pcarchReservedMemoryRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
-{
-    Log2(("pcarchReservedMemoryRead: %#RGp LB %#x\n", GCPhysAddr, cb));
-    NOREF(pDevIns); NOREF(pvUser); NOREF(GCPhysAddr);
+ * @callback_method_impl{FNIOMMMIONEWREAD, The reserved memory reads as 0xff.}
+ * @note    off is an absolute address.
+ */
+static DECLCALLBACK(VBOXSTRICTRC)
+pcarchReservedMemoryRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
+{
+    Log2(("pcarchReservedMemoryRead: %#RGp LB %#x\n", off, cb));
+    RT_NOREF(pDevIns, pvUser, off);
     memset(pv, 0xff, cb);
     return VINF_SUCCESS;
@@ -231 +240 @@
             while (GCPhysCur < GCPhysEnd && PGMPhysIsGCPhysNormal(pVM, GCPhysCur));
 
-            int rc = PDMDevHlpMMIORegister(pDevIns, GCPhysStart, GCPhysCur - GCPhysStart, NULL /*pvUser*/,
-                                           IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU,
-                                           pcarchReservedMemoryWrite, pcarchReservedMemoryRead,
-                                           MMR3HeapAPrintf(pVM, MM_TAG_PGM_PHYS /* bad bird*/, "PC Arch Reserved #%u", iRegion));
+            IOMMMIOHANDLE hMmioRegion;
+            int rc = PDMDevHlpMmioCreateAndMap(pDevIns, GCPhysStart, GCPhysCur - GCPhysStart,
+                                               pcarchReservedMemoryWrite, pcarchReservedMemoryRead,
+                                               IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU | IOMMMIO_FLAGS_ABS,
+                                               MMR3HeapAPrintf(pVM, MM_TAG_PGM_PHYS /* bad bird*/, "PC Arch Reserved #%u", iRegion),
+                                               &hMmioRegion);
             AssertLogRelRCReturn(rc, rc);
             iRegion++;
@@ -268 +279 @@
      * Register I/O Ports
      */
-    rc = PDMDevHlpIOPortRegister(pDevIns, 0xF0, 0x10, NULL,
-                                 pcarchIOPortFPUWrite, pcarchIOPortFPURead,
-                                 NULL, NULL, "Math Co-Processor (DOS/OS2 mode)");
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = PDMDevHlpIOPortRegister(pDevIns, 0x92, 1, NULL,
-                                 pcarchIOPortPS2SysControlPortAWrite, pcarchIOPortPS2SysControlPortARead,
-                                 NULL, NULL, "PS/2 system control port A (A20 and more)");
-    if (RT_FAILURE(rc))
-        return rc;
+    IOMIOPORTHANDLE hIoPorts;
+    rc = PDMDevHlpIoPortCreateFlagsAndMap(pDevIns, 0xf0 /*uPort*/, 0x10 /*cPorts*/, IOM_IOPORT_F_ABS,
+                                          pcarchIOPortFPUWrite, pcarchIOPortFPURead,
+                                          "Math Co-Processor (DOS/OS2 mode)", NULL /*paExtDescs*/, &hIoPorts);
+    AssertRCReturn(rc, rc);
+    rc = PDMDevHlpIoPortCreateFlagsAndMap(pDevIns, 0x92 /*uPort*/, 1 /*cPorts*/, IOM_IOPORT_F_ABS,
+                                          pcarchIOPortPS2SysControlPortAWrite, pcarchIOPortPS2SysControlPortARead,
+                                          "PS/2 system control port A (A20 and more)", NULL /*paExtDescs*/, &hIoPorts);
+    AssertRCReturn(rc, rc);
 
     return VINF_SUCCESS;
@@ -291 +301 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "pcarch",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE,
     /* .fClass = */                 PDM_DEVREG_CLASS_ARCH,
     /* .cMaxInstances = */          1,