Changeset 81995 in vbox

Timestamp:

Nov 19, 2019 1:46:52 PM (5 years ago)

Author:

vboxsync

Message:

DevFDC: Added option for enabling access to status register A (SRA) - PS/2++ not org PC. bugref:9218

File:

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

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

@@ -692 +692 @@
     PPDMILEDCONNECTORS pLedsConnector;
 
+    /** I/O ports: 0x3f0 */
+    IOMIOPORTHANDLE hIoPorts0;
     /** I/O ports: 0x3f1..0x3f5 */
     IOMIOPORTHANDLE hIoPorts1;
@@ -2185 +2187 @@
 
 /**
- * @callback_method_impl{FNIOMIOPORTNEWOUT, Handling 0x3f1..0x3f5 acceses.}
+ * @callback_method_impl{FNIOMIOPORTNEWOUT, Handling 0x3f0 accesses.}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort0Write(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
+{
+    RT_NOREF(pvUser);
+
+    if (cb == 1)
+        fdctrl_write(PDMDEVINS_2_DATA(pDevIns, fdctrl_t *), offPort, u32);
+    else
+        ASSERT_GUEST_MSG_FAILED(("offPort=%#x cb=%d u32=%#x\n", offPort, cb, u32));
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @callback_method_impl{FNIOMIOPORTNEWIN, Handling 0x3f0 accesses.}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort0Read(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
+{
+    RT_NOREF(pvUser);
+
+    if (cb == 1)
+    {
+        *pu32 = fdctrl_read(PDMDEVINS_2_DATA(pDevIns, fdctrl_t *), offPort);
+        return VINF_SUCCESS;
+    }
+    return VERR_IOM_IOPORT_UNUSED;
+}
+
+
+/**
+ * @callback_method_impl{FNIOMIOPORTNEWOUT, Handling 0x3f1..0x3f5 accesses.}
  */
 static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort1Write(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
@@ -2200 +2233 @@
 
 /**
- * @callback_method_impl{FNIOMIOPORTNEWIN, Handling 0x3f1..0x3f5 acceses.}
+ * @callback_method_impl{FNIOMIOPORTNEWIN, Handling 0x3f1..0x3f5 accesses.}
  */
 static DECLCALLBACK(VBOXSTRICTRC) fdcIoPort1Read(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
@@ -2725 +2758 @@
      * Validate configuration.
      */
-    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "IRQ|DMA|MemMapped|IOBase", "");
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "IRQ|DMA|MemMapped|IOBase|StatusA", "");
 
     /*
@@ -2742 +2775 @@
     rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "MemMapped", &fMemMapped, false);
     AssertMsgRCReturn(rc, ("Configuration error: Failed to read bool value MemMapped rc=%Rrc\n", rc), rc);
+
+    bool fStatusA;
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "StatusA", &fStatusA, false);
+    AssertMsgRCReturn(rc, ("Configuration error: Failed to read bool value fStatusA rc=%Rrc\n", rc), rc);
 
     /*
@@ -2751 +2788 @@
     pThis->config    = FD_CONFIG_EIS | FD_CONFIG_EFIFO; /* Implicit seek, polling & FIFO enabled */
     pThis->num_floppies = MAX_FD;
+    pThis->hIoPorts0 = NIL_IOMMMIOHANDLE;
+    pThis->hIoPorts1 = NIL_IOMMMIOHANDLE;
+    pThis->hIoPorts2 = NIL_IOMMMIOHANDLE;
 
     /* Fill 'command_to_handler' lookup table */
@@ -2812 +2852 @@
             { NULL, NULL, NULL, NULL }
         };
+
+        /* 0x3f0 */
+        if (fStatusA)
+        {
+            rc = PDMDevHlpIoPortCreateAndMap(pDevIns, pThis->io_base, 1 /*cPorts*/, fdcIoPort0Write, fdcIoPort0Read,
+                                             "FDC-SRA", s_aDescs, &pThis->hIoPorts0);
+            AssertRCReturn(rc, rc);
+        }
 
         /* 0x3f1..0x3f5 */