Changeset 82141 in vbox

Timestamp:

Nov 24, 2019 12:45:04 AM (5 years ago)

Author:

vboxsync

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

134951

Message:

DevPCNet: Converted MMIO handlers. [fixes] bugref:9218

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (31 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -1896 +1896 @@
         {
             /* Not owned by controller. This should not be possible as
-             * we already called pcnetCanReceive(). */
+             * we already called pcnetR3CanReceive(). */
             LogRel(("PCnet#%d: no buffer: RCVRC=%d\n", PCNET_INST_NR, CSR_RCVRC(pThis)));
             /* Dump the status of all RX descriptors */
@@ -2769 +2769 @@
         /*
          * The second case is important for pcnetWaitReceiveAvail(): If CSR_CRST(pThis) was
-         * true but pcnetCanReceive() returned false for some other reason we need to check
+         * true but pcnetR3CanReceive() returned false for some other reason we need to check
          * _now_ if we have to wakeup pcnetWaitReceiveAvail().
          */
@@ -3798 +3798 @@
 /* -=-=-=-=-=- MMIO -=-=-=-=-=- */
 
-static void pcnetMMIOWriteU8(PPCNETSTATE pThis, RTGCPHYS off, uint32_t val)
+#ifdef IN_RING3
+
+static void pcnetR3MmioWriteU8(PPCNETSTATE pThis, RTGCPHYS off, uint32_t val)
 {
 #ifdef PCNET_DEBUG_IO
-    Log2(("#%d pcnetMMIOWriteU8: off=%#010x val=%#04x\n", PCNET_INST_NR, off, val));
+    Log2(("#%d pcnetR3MmioWriteU8: off=%#010x val=%#04x\n", PCNET_INST_NR, off, val));
 #endif
     if (!(off & 0x10))
@@ -3807 +3809 @@
 }
 
-static uint32_t pcnetMMIOReadU8(PPCNETSTATE pThis, RTGCPHYS addr)
+static uint32_t pcnetR3MmioReadU8(PPCNETSTATE pThis, RTGCPHYS addr)
 {
     uint32_t val = ~0U;
@@ -3813 +3815 @@
         val = pcnetAPROMReadU8(pThis, addr);
 #ifdef PCNET_DEBUG_IO
-    Log2(("#%d pcnetMMIOReadU8: addr=%#010x val=%#04x\n", PCNET_INST_NR, addr, val & 0xff));
+    Log2(("#%d pcnetR3MmioReadU8: addr=%#010x val=%#04x\n", PCNET_INST_NR, addr, val & 0xff));
 #endif
     return val;
 }
 
-static VBOXSTRICTRC pcnetMMIOWriteU16(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS off, uint32_t val)
+static VBOXSTRICTRC pcnetR3MmioWriteU16(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS off, uint32_t val)
 {
     VBOXSTRICTRC rcStrict;
 #ifdef PCNET_DEBUG_IO
-    Log2(("#%d pcnetMMIOWriteU16: off=%#010x val=%#06x\n", PCNET_INST_NR, off, val));
+    Log2(("#%d pcnetR3MmioWriteU16: off=%#010x val=%#06x\n", PCNET_INST_NR, off, val));
 #endif
     if (off & 0x10)
@@ -3839 +3841 @@
 }
 
-static uint32_t pcnetMMIOReadU16(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS addr)
+static uint32_t pcnetR3MmioReadU16(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS addr)
 {
     uint32_t val = ~0U;
@@ -3852 +3854 @@
     }
 #ifdef PCNET_DEBUG_IO
-    Log2(("#%d pcnetMMIOReadU16: addr=%#010x val = %#06x\n", PCNET_INST_NR, addr, val & 0xffff));
+    Log2(("#%d pcnetR3MmioReadU16: addr=%#010x val = %#06x\n", PCNET_INST_NR, addr, val & 0xffff));
 #endif
     return val;
 }
 
-static VBOXSTRICTRC pcnetMMIOWriteU32(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS off, uint32_t val)
+static VBOXSTRICTRC pcnetR3MmioWriteU32(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS off, uint32_t val)
 {
     VBOXSTRICTRC rcStrict;
 #ifdef PCNET_DEBUG_IO
-    Log2(("#%d pcnetMMIOWriteU32: off=%#010x val=%#010x\n", PCNET_INST_NR, off, val));
+    Log2(("#%d pcnetR3MmioWriteU32: off=%#010x val=%#010x\n", PCNET_INST_NR, off, val));
 #endif
     if (off & 0x10)
@@ -3880 +3882 @@
 }
 
-static uint32_t pcnetMMIOReadU32(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS addr)
+static uint32_t pcnetR3MmioReadU32(PPDMDEVINS pDevIns, PPCNETSTATE pThis, RTGCPHYS addr)
 {
     uint32_t val;
@@ -3897 +3899 @@
     }
 #ifdef PCNET_DEBUG_IO
-    Log2(("#%d pcnetMMIOReadU32: addr=%#010x val=%#010x\n", PCNET_INST_NR, addr, val));
+    Log2(("#%d pcnetR3MmioReadU32: addr=%#010x val=%#010x\n", PCNET_INST_NR, addr, val));
 #endif
     return val;
 }
 
-#ifdef IN_RING3
 
 /**
@@ -3922 +3923 @@
         switch (cb)
         {
-            case 1:  *(uint8_t  *)pv = pcnetMMIOReadU8 (pThis, off); break;
-            case 2:  *(uint16_t *)pv = pcnetMMIOReadU16(pDevIns, pThis, off); break;
-            case 4:  *(uint32_t *)pv = pcnetMMIOReadU32(pDevIns, pThis, off); break;
+            case 1:  *(uint8_t  *)pv = pcnetR3MmioReadU8 (pThis, off); break;
+            case 2:  *(uint16_t *)pv = pcnetR3MmioReadU16(pDevIns, pThis, off); break;
+            case 4:  *(uint32_t *)pv = pcnetR3MmioReadU32(pDevIns, pThis, off); break;
             default:
                 rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "pcnetR3MmioRead: unsupported op size: address=%RGp cb=%u\n", off, cb);
@@ -3957 +3958 @@
         switch (cb)
         {
-            case 1:  pcnetMMIOWriteU8(pThis, off, *(uint8_t  *)pv); break;
-            case 2:  rc = pcnetMMIOWriteU16(pDevIns, pThis, off, *(uint16_t *)pv); break;
-            case 4:  rc = pcnetMMIOWriteU32(pDevIns, pThis, off, *(uint32_t *)pv); break;
+            case 1:  pcnetR3MmioWriteU8(pThis, off, *(uint8_t  *)pv); break;
+            case 2:  rc = pcnetR3MmioWriteU16(pDevIns, pThis, off, *(uint16_t *)pv); break;
+            case 4:  rc = pcnetR3MmioWriteU32(pDevIns, pThis, off, *(uint32_t *)pv); break;
             default:
                 rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "pcnetR3MmioWrite: unsupported op size: address=%RGp cb=%u\n", off, cb);
@@ -4090 +4091 @@
  * @callback_method_impl{FNDBGFHANDLERDEV}
  */
-static DECLCALLBACK(void) pcnetInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+static DECLCALLBACK(void) pcnetR3Info(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
     PPCNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
@@ -4363 +4364 @@
  * @param  pThis        The PCnet shared instance data.
  */
-static void pcnetTempLinkDown(PPDMDEVINS pDevIns, PPCNETSTATE pThis)
+static void pcnetR3TempLinkDown(PPDMDEVINS pDevIns, PPCNETSTATE pThis)
 {
     if (pThis->fLinkUp)
@@ -4386 +4387 @@
  * @param   pSSM        The saved state handle.
  */
-static void pcnetSaveConfig(PCPDMDEVHLPR3 pHlp, PPCNETSTATE pThis, PSSMHANDLE pSSM)
+static void pcnetR3SaveConfig(PCPDMDEVHLPR3 pHlp, PPCNETSTATE pThis, PSSMHANDLE pSSM)
 {
     pHlp->pfnSSMPutMem(pSSM, &pThis->MacConfigured, sizeof(pThis->MacConfigured));
@@ -4401 +4402 @@
     RT_NOREF(uPass);
     PPCNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
-    pcnetSaveConfig(pDevIns->pHlpR3, pThis, pSSM);
+    pcnetR3SaveConfig(pDevIns->pHlpR3, pThis, pSSM);
     return VINF_SSM_DONT_CALL_AGAIN;
 }
@@ -4445 +4446 @@
     pHlp->pfnSSMPutU16(pSSM, pThis->u16CSR0LastSeenByGuest);
     pHlp->pfnSSMPutU64(pSSM, pThis->u64LastPoll);
-    pcnetSaveConfig(pHlp, pThis, pSSM);
+    pcnetR3SaveConfig(pHlp, pThis, pSSM);
 
     int rc = VINF_SUCCESS;
@@ -4588 +4589 @@
            been lost, unless we've been teleported here. */
         if (!PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns))
-            pcnetTempLinkDown(pDevIns, pThis);
+            pcnetR3TempLinkDown(pDevIns, pThis);
     }
 
@@ -4616 +4617 @@
  * Check if the device/driver can receive data now.
  *
- * Worker for pcnetNetworkDown_WaitReceiveAvail().  This must be called before
+ * Worker for pcnetR3NetworkDown_WaitReceiveAvail().  This must be called before
  * the pfnRecieve() method is called.
  *
@@ -4622 +4623 @@
  * @param   pThis           The PCnet shared instance data.
  */
-static int pcnetCanReceive(PPCNETSTATE pThis)
+static int pcnetR3CanReceive(PPCNETSTATE pThis)
 {
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
@@ -4652 +4653 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnWaitReceiveAvail}
  */
-static DECLCALLBACK(int) pcnetNetworkDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
+static DECLCALLBACK(int) pcnetR3NetworkDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
 {
     PPCNETSTATE pThis = RT_FROM_MEMBER(pInterface, PCNETSTATE, INetworkDown);
     PPDMDEVINS  pDevIns = pThis->pDevInsR3;
 
-    int rc = pcnetCanReceive(pThis);
+    int rc = pcnetR3CanReceive(pThis);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
@@ -4670 +4671 @@
                      || enmVMState == VMSTATE_RUNNING_LS))
     {
-        int rc2 = pcnetCanReceive(pThis);
+        int rc2 = pcnetR3CanReceive(pThis);
         if (RT_SUCCESS(rc2))
         {
@@ -4676 +4677 @@
             break;
         }
-        LogFlow(("pcnetNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
+        LogFlow(("pcnetR3NetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
         /* Start the poll timer once which will remain active as long fMaybeOutOfSpace
          * is true -- even if (transmit) polling is disabled (CSR_DPOLL). */
@@ -4697 +4698 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnReceive}
  */
-static DECLCALLBACK(int) pcnetNetworkDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
+static DECLCALLBACK(int) pcnetR3NetworkDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
 {
     PPCNETSTATE pThis = RT_FROM_MEMBER(pInterface, PCNETSTATE, INetworkDown);
@@ -4751 +4752 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
  */
-static DECLCALLBACK(void) pcnetNetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
+static DECLCALLBACK(void) pcnetR3NetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
 {
     PPCNETSTATE pThis = RT_FROM_MEMBER(pInterface, PCNETSTATE, INetworkDown);
@@ -4763 +4764 @@
  * @interface_method_impl{PDMINETWORKCONFIG,pfnGetMac}
  */
-static DECLCALLBACK(int) pcnetGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
+static DECLCALLBACK(int) pcnetR3NetworkConfig_GetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
     PPCNETSTATE pThis = RT_FROM_MEMBER(pInterface, PCNETSTATE, INetworkConfig);
@@ -4774 +4775 @@
  * @interface_method_impl{PDMINETWORKCONFIG,pfnGetLinkState}
  */
-static DECLCALLBACK(PDMNETWORKLINKSTATE) pcnetGetLinkState(PPDMINETWORKCONFIG pInterface)
+static DECLCALLBACK(PDMNETWORKLINKSTATE) pcnetR3NetworkConfig_GetLinkState(PPDMINETWORKCONFIG pInterface)
 {
     PPCNETSTATE pThis = RT_FROM_MEMBER(pInterface, PCNETSTATE, INetworkConfig);
@@ -4791 +4792 @@
  * @interface_method_impl{PDMINETWORKCONFIG,pfnSetLinkState}
  */
-static DECLCALLBACK(int) pcnetSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
+static DECLCALLBACK(int) pcnetR3NetworkConfig_SetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
     PPCNETSTATE     pThis   = RT_FROM_MEMBER(pInterface, PCNETSTATE, INetworkConfig);
@@ -4802 +4803 @@
     if (enmState == PDMNETWORKLINKSTATE_DOWN_RESUME)
     {
-        pcnetTempLinkDown(pDevIns, pThis);
+        pcnetR3TempLinkDown(pDevIns, pThis);
         /*
          * Note that we do not notify the driver about the link state change because
@@ -4957 +4958 @@
      */
     if (RT_SUCCESS(rc))
-        pcnetTempLinkDown(pDevIns, pThis);
+        pcnetR3TempLinkDown(pDevIns, pThis);
 
     PDMCritSectLeave(&pThis->CritSect);
@@ -5146 +5147 @@
     pThis->IBase.pfnQueryInterface          = pcnetQueryInterface;
     /* INeworkPort */
-    pThis->INetworkDown.pfnWaitReceiveAvail = pcnetNetworkDown_WaitReceiveAvail;
-    pThis->INetworkDown.pfnReceive          = pcnetNetworkDown_Receive;
-    pThis->INetworkDown.pfnXmitPending      = pcnetNetworkDown_XmitPending;
+    pThis->INetworkDown.pfnWaitReceiveAvail = pcnetR3NetworkDown_WaitReceiveAvail;
+    pThis->INetworkDown.pfnReceive          = pcnetR3NetworkDown_Receive;
+    pThis->INetworkDown.pfnXmitPending      = pcnetR3NetworkDown_XmitPending;
     /* INetworkConfig */
-    pThis->INetworkConfig.pfnGetMac         = pcnetGetMac;
-    pThis->INetworkConfig.pfnGetLinkState   = pcnetGetLinkState;
-    pThis->INetworkConfig.pfnSetLinkState   = pcnetSetLinkState;
+    pThis->INetworkConfig.pfnGetMac         = pcnetR3NetworkConfig_GetMac;
+    pThis->INetworkConfig.pfnGetLinkState   = pcnetR3NetworkConfig_GetLinkState;
+    pThis->INetworkConfig.pfnSetLinkState   = pcnetR3NetworkConfig_SetLinkState;
     /* ILeds */
     pThis->ILeds.pfnQueryStatusLed          = pcnetQueryStatusLed;
@@ -5338 +5339 @@
      */
     RTStrPrintf(szTmp, sizeof(szTmp), "pcnet%d", pDevIns->iInstance);
-    PDMDevHlpDBGFInfoRegister(pDevIns, szTmp, "PCNET info.", pcnetInfo);
+    PDMDevHlpDBGFInfoRegister(pDevIns, szTmp, "PCNET info.", pcnetR3Info);
 
     /*