Changeset 81889 in vbox

Timestamp:

Nov 15, 2019 10:44:32 PM (5 years ago)

Author:

vboxsync

Message:

DevSerial: Working on converting to the new PDM device style - I/O ports. bugref:9218

File:

• trunk/src/VBox/Devices/Serial/DevSerial.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -50 +50 @@
     /** Pointer to the device instance - RC Ptr. */
     PPDMDEVINSRC                    pDevInsRC;
-    /** Alignment. */
-    RTRCPTR                         Alignment0;
-    /** Flag whether the R0 portion of this device is enabled. */
-    bool                            fR0Enabled;
-    /** Flag whether the RC portion of this device is enabled. */
-    bool                            fRCEnabled;
-    /** Alignment. */
-    bool                            afAlignment1[2];
     /** The IRQ value. */
     uint8_t                         uIrq;
+    uint8_t                         bAlignment;
     /** The base I/O port the device is registered at. */
     RTIOPORT                        PortBase;
+    /** The I/O ports registration. */
+    IOMIOPORTHANDLE                 hIoPorts;
 
     /** The UART core. */
@@ -84 +79 @@
 
 /**
- * @callback_method_impl{FNIOMIOPORTOUT}
- */
-PDMBOTHCBDECL(int) serialIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
+ * @callback_method_impl{FNIOMIOPORTNEWOUT}
+ */
+static DECLCALLBACK(VBOXSTRICTRC)
+serialIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
 {
     PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     RT_NOREF_PV(pvUser);
 
-    return uartRegWrite(&pThis->UartCore, uPort - pThis->PortBase, u32, cb);
-}
-
-
-/**
- * @callback_method_impl{FNIOMIOPORTIN}
- */
-PDMBOTHCBDECL(int) serialIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
+    return uartRegWrite(&pThis->UartCore, offPort, u32, cb);
+}
+
+
+/**
+ * @callback_method_impl{FNIOMIOPORTNEWIN}
+ */
+static DECLCALLBACK(VBOXSTRICTRC)
+serialIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
 {
     PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     RT_NOREF_PV(pvUser);
 
-    return uartRegRead(&pThis->UartCore, uPort - pThis->PortBase, pu32, cb);
+    return uartRegRead(&pThis->UartCore, offPort, pu32, cb);
 }
 
@@ -326 +323 @@
     PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "IRQ|IOBase|YieldOnLSRRead|UartType", "");
 
-    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "GCEnabled", &pThis->fRCEnabled, true);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to get the \"GCEnabled\" value"));
-
-    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, true);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to get the \"R0Enabled\" value"));
-
     bool fYieldOnLSRRead = false;
     rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "YieldOnLSRRead", &fYieldOnLSRRead, false);
@@ -393 +382 @@
      * Register the I/O ports.
      */
-    rc = PDMDevHlpIOPortRegister(pDevIns, uIoBase, 8, 0,
-                                 serialIoPortWrite, serialIoPortRead,
-                                 NULL, NULL, "SERIAL");
-    if (RT_FAILURE(rc))
-        return rc;
+    rc = PDMDevHlpIoPortCreateAndMap(pDevIns, uIoBase, 8 /*cPorts*/, serialIoPortWrite, serialIoPortRead,
+                                     "SERIAL", NULL /*paExtDescs*/, &pThis->hIoPorts);
+    AssertRCReturn(rc, rc);
 
     PVM pVM = PDMDevHlpGetVM(pDevIns);
@@ -406 +393 @@
     if (pDevIns->fRCEnabled)
     {
-        rc = PDMDevHlpIOPortRegisterRC(pDevIns, uIoBase, 8, 0, "serialIoPortWrite", "serialIoPortRead", NULL, NULL, "SERIAL");
-        if (   RT_SUCCESS(rc)
-            && VM_IS_RAW_MODE_ENABLED(pVM)) /** @todo this dynamic symbol resolving will be reworked later! */
+        if (VM_IS_RAW_MODE_ENABLED(pVM)) /** @todo this dynamic symbol resolving will be reworked later! */
             rc = PDMR3LdrGetSymbolRC(pVM, pDevIns->pReg->pszRCMod, "serialIrqReq", &pfnSerialIrqReqRC);
         if (RT_FAILURE(rc))
@@ -417 +402 @@
     if (pDevIns->fR0Enabled)
     {
-        rc = PDMDevHlpIOPortRegisterR0(pDevIns, uIoBase, 8, 0, "serialIoPortWrite", "serialIoPortRead", NULL, NULL, "SERIAL");
-        if (RT_SUCCESS(rc)) /** @todo this dynamic symbol resolving will be reworked later! */
-            rc = PDMR3LdrGetSymbolR0(pVM, pDevIns->pReg->pszR0Mod, "serialIrqReq", &pfnSerialIrqReqR0);
+        /** @todo this dynamic symbol resolving will be reworked later! */
+        rc = PDMR3LdrGetSymbolR0(pVM, pDevIns->pReg->pszR0Mod, "serialIrqReq", &pfnSerialIrqReqR0);
         if (RT_FAILURE(rc))
             return rc;
@@ -442 +426 @@
 }
 
-#endif /* IN_RING3 */
+#else  /* !IN_RING3 */
+
+/**
+ * @callback_method_impl{PDMDEVREGR0,pfnConstruct}
+ */
+static DECLCALLBACK(int) serialRZConstruct(PPDMDEVINS pDevIns)
+{
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
+
+    int rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
+    AssertRCReturn(rc, rc);
+
+    rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPorts, serialIoPortWrite, serialIoPortRead, NULL /*pvUser*/);
+    AssertRCReturn(rc, rc);
+
+    return VINF_SUCCESS;
+}
+
+#endif /* !IN_RING3 */
 
 /**
@@ -452 +455 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "serial",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
     /* .fClass = */                 PDM_DEVREG_CLASS_SERIAL,
     /* .cMaxInstances = */          UINT32_MAX,
@@ -489 +492 @@
 #elif defined(IN_RING0)
     /* .pfnEarlyConstruct = */      NULL,
-    /* .pfnConstruct = */           NULL,
+    /* .pfnConstruct = */           serialRZConstruct,
     /* .pfnDestruct = */            NULL,
     /* .pfnFinalDestruct = */       NULL,
@@ -502 +505 @@
     /* .pfnReserved7 = */           NULL,
 #elif defined(IN_RC)
-    /* .pfnConstruct = */           NULL,
+    /* .pfnConstruct = */           serialRZConstruct,
     /* .pfnReserved0 = */           NULL,
     /* .pfnReserved1 = */           NULL,