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

Timestamp:

Nov 12, 2019 12:47:35 PM (5 years ago)

Author:

vboxsync

Message:

DevFdc: Working on converting it to the new PDM device style. bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevFdc.cpp (modified) (8 diffs)

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

@@ -49 +49 @@
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/pdmstorageifs.h>
+#include <VBox/AssertGuest.h>
 #include <iprt/assert.h>
 #include <iprt/string.h>
@@ -690 +691 @@
     /** Status LUN: The Partner of ILeds. */
     PPDMILEDCONNECTORS pLedsConnector;
+
+    /** I/O ports: 0x3f1..0x3f5 */
+    IOMIOPORTHANDLE hIoPorts1;
+    /** I/O port:  0x3f7 */
+    IOMIOPORTHANDLE hIoPorts2;
 };
 
-static uint32_t fdctrl_read (void *opaque, uint32_t reg)
-{
-    fdctrl_t *fdctrl = (fdctrl_t *)opaque;
+static uint32_t fdctrl_read (fdctrl_t *fdctrl, uint32_t reg)
+{
     uint32_t retval;
 
@@ -720 +725 @@
         break;
     default:
-        retval = (uint32_t)(-1);
+        retval = UINT32_MAX;
         break;
     }
@@ -728 +733 @@
 }
 
-static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value)
-{
-    fdctrl_t *fdctrl = (fdctrl_t *)opaque;
-
+static void fdctrl_write (fdctrl_t *fdctrl, uint32_t reg, uint32_t value)
+{
     FLOPPY_DPRINTF("write reg%d: 0x%02x\n", reg & 7, value);
 
@@ -2182 +2185 @@
 
 /**
- * @callback_method_impl{FNIOMIOPORTOUT}
+ * @callback_method_impl{FNIOMIOPORTNEWOUT, Handling 0x3f1..0x3f5 acceses.}
  */
-static DECLCALLBACK(int) fdcIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
-{
-    RT_NOREF(pDevIns);
+static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort1Write(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
+{
+    RT_NOREF(pvUser);
+
     if (cb == 1)
-        fdctrl_write (pvUser, uPort & 7, u32);
+        fdctrl_write(PDMDEVINS_2_DATA(pDevIns, fdctrl_t *), offPort + 1, u32);
     else
-        AssertMsgFailed(("uPort=%#x cb=%d u32=%#x\n", uPort, cb, u32));
+        ASSERT_GUEST_MSG_FAILED(("offPort=%#x cb=%d u32=%#x\n", offPort, cb, u32));
     return VINF_SUCCESS;
 }
@@ -2196 +2200 @@
 
 /**
- * @callback_method_impl{FNIOMIOPORTIN}
+ * @callback_method_impl{FNIOMIOPORTNEWIN, Handling 0x3f1..0x3f5 acceses.}
  */
-static DECLCALLBACK(int) fdcIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
-{
-    RT_NOREF(pDevIns);
+static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort1Read(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
+{
+    RT_NOREF(pvUser);
+
     if (cb == 1)
     {
-        *pu32 = fdctrl_read (pvUser, uPort & 7);
+        *pu32 = fdctrl_read(PDMDEVINS_2_DATA(pDevIns, fdctrl_t *), offPort + 1);
+        return VINF_SUCCESS;
+    }
+    return VERR_IOM_IOPORT_UNUSED;
+}
+
+
+/**
+ * @callback_method_impl{FNIOMIOPORTNEWOUT, Handling 0x3f7 access.}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort2Write(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
+{
+    RT_NOREF(offPort, pvUser);
+    Assert(offPort == 0);
+
+    if (cb == 1)
+        fdctrl_write(PDMDEVINS_2_DATA(pDevIns, fdctrl_t *), 7, u32);
+    else
+        ASSERT_GUEST_MSG_FAILED(("offPort=%#x cb=%d u32=%#x\n", offPort, cb, u32));
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @callback_method_impl{FNIOMIOPORTNEWIN, Handling 0x3f7 access.}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort2Read(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
+{
+    RT_NOREF(pvUser, offPort);
+    Assert(offPort == 0);
+
+    if (cb == 1)
+    {
+        *pu32 = fdctrl_read(PDMDEVINS_2_DATA(pDevIns, fdctrl_t *), 7);
         return VINF_SUCCESS;
     }
@@ -2756 +2794 @@
     /*
      * IO / MMIO.
+     *
+     * We must skip I/O port 0x3f6 as it is the ATA alternate status register.
+     * Why we skip registering status register A, though, isn't as clear.
      */
     if (!fMemMapped)
     {
-        rc = PDMDevHlpIOPortRegister(pDevIns, pThis->io_base + 0x1, 5, pThis,
-                                     fdcIoPortWrite, fdcIoPortRead, NULL, NULL, "FDC#1");
-        if (RT_FAILURE(rc))
-            return rc;
-
-        rc = PDMDevHlpIOPortRegister(pDevIns, pThis->io_base + 0x7, 1, pThis,
-                                     fdcIoPortWrite, fdcIoPortRead, NULL, NULL, "FDC#2");
-        if (RT_FAILURE(rc))
-            return rc;
+        static const IOMIOPORTDESC s_aDescs[] =
+        {
+            { "SRA", NULL, "Status register A", NULL },
+            { "SRB", NULL, "Status register B", NULL },
+            { "DOR", "DOR", "Digital output register", "Digital output register"},
+            { "TDR", "TDR", "Tape driver register", "Tape driver register"},
+            { "MSR", "DSR", "Main status register", "Datarate select register" },
+            { "FIFO", "FIFO", "Data FIFO", "Data FIFO" },
+            { "ATA", "ATA", NULL, NULL },
+            { "DIR", "CCR", "Digital input register", "Configuration control register"},
+            { NULL, NULL, NULL, NULL }
+        };
+
+        /* 0x3f1..0x3f5 */
+        rc = PDMDevHlpIoPortCreateAndMap(pDevIns, pThis->io_base + 0x1, 5, fdcIoPort1Write, fdcIoPort1Read,
+                                         "FDC#1", &s_aDescs[1], &pThis->hIoPorts1);
+        AssertRCReturn(rc, rc);
+
+        /* 0x3f7 */
+        rc = PDMDevHlpIoPortCreateAndMap(pDevIns, pThis->io_base + 0x7, 1, fdcIoPort2Write, fdcIoPort2Read,
+                                         "FDC#2", &s_aDescs[7], &pThis->hIoPorts2);
+        AssertRCReturn(rc, rc);
     }
     else
@@ -2816 +2870 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "i82078",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE,
     /* .fClass = */                 PDM_DEVREG_CLASS_STORAGE,
     /* .cMaxInstances = */          1,