Changeset 40280 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 28, 2012 7:47:00 PM (13 years ago)

Author:

vboxsync

Message:

Corrected a bunch of HC and GC uses in status codes.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (17 diffs)
• DevPCNet.cpp (modified) (15 diffs)
• DevVirtioNet.cpp (modified) (1 diff)

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

@@ -2197 +2197 @@
     { /* RST */
 #ifndef IN_RING3
-        return VINF_IOM_HC_IOPORT_WRITE;
+        return VINF_IOM_R3_IOPORT_WRITE;
 #else
         e1kHardReset(pState);
@@ -2280 +2280 @@
     return VINF_SUCCESS;
 #else /* !IN_RING3 */
-    return VINF_IOM_HC_MMIO_WRITE;
+    return VINF_IOM_R3_MMIO_WRITE;
 #endif /* !IN_RING3 */
 }
@@ -2317 +2317 @@
     return rc;
 #else /* !IN_RING3 */
-    return VINF_IOM_HC_MMIO_READ;
+    return VINF_IOM_R3_MMIO_READ;
 #endif /* !IN_RING3 */
 }
@@ -2352 +2352 @@
     return VINF_SUCCESS;
 #else /* !IN_RING3 */
-    return VINF_IOM_HC_MMIO_WRITE;
+    return VINF_IOM_R3_MMIO_WRITE;
 #endif /* !IN_RING3 */
 }
@@ -2437 +2437 @@
 static int e1kRegReadICR(E1KSTATE* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value)
 {
-    int rc = e1kCsEnter(pState, VINF_IOM_HC_MMIO_READ);
+    int rc = e1kCsEnter(pState, VINF_IOM_R3_MMIO_READ);
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
         return rc;
@@ -2503 +2503 @@
 {
     E1K_INC_ISTAT_CNT(pState->uStatIntICS);
-    return e1kRaiseInterrupt(pState, VINF_IOM_HC_MMIO_WRITE, value & s_e1kRegMap[ICS_IDX].writable);
+    return e1kRaiseInterrupt(pState, VINF_IOM_R3_MMIO_WRITE, value & s_e1kRegMap[ICS_IDX].writable);
 }
 
@@ -2550 +2550 @@
 static int e1kRegWriteIMC(E1KSTATE* pState, uint32_t offset, uint32_t index, uint32_t value)
 {
-    int rc = e1kCsEnter(pState, VINF_IOM_HC_MMIO_WRITE);
+    int rc = e1kCsEnter(pState, VINF_IOM_R3_MMIO_WRITE);
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
         return rc;
@@ -2593 +2593 @@
         /* Promiscuity has changed, pass the knowledge on. */
 #ifndef IN_RING3
-        return VINF_IOM_HC_IOPORT_WRITE;
+        return VINF_IOM_R3_IOPORT_WRITE;
 #else
         if (pState->pDrvR3)
@@ -2654 +2654 @@
 #ifndef IN_RING3
     /* XXX */
-//    return VINF_IOM_HC_MMIO_WRITE;
+//    return VINF_IOM_R3_MMIO_WRITE;
 #endif
-    int rc = e1kCsRxEnter(pState, VINF_IOM_HC_MMIO_WRITE);
+    int rc = e1kCsRxEnter(pState, VINF_IOM_R3_MMIO_WRITE);
     if (RT_LIKELY(rc == VINF_SUCCESS))
     {
@@ -2703 +2703 @@
 #endif
         E1K_INC_ISTAT_CNT(pState->uStatIntRDTR);
-        return e1kRaiseInterrupt(pState, VINF_IOM_HC_MMIO_WRITE, ICR_RXT0);
+        return e1kRaiseInterrupt(pState, VINF_IOM_R3_MMIO_WRITE, ICR_RXT0);
     }
 
@@ -3210 +3210 @@
         Assert(pSg->cbUsed <= pSg->cbAvailable);
     }
-/*    E1kLog2(("%s <<< Outgoing packet. Dump follows: >>>\n"
+/*    E1kLog2(("%s < < < Outgoing packet. Dump follows: > > >\n"
             "%.*Rhxd\n"
-            "%s <<<<<<<<<<<<< End of dump >>>>>>>>>>>>\n",
+            "%s < < < < < < < < < < < < <  End of dump > > > > > > > > > > > >\n",
             INSTANCE(pState), cbFrame, pSg->aSegs[0].pvSeg, INSTANCE(pState)));*/
 
@@ -3982 +3982 @@
 static int e1kRegWriteTDT(E1KSTATE* pState, uint32_t offset, uint32_t index, uint32_t value)
 {
-    int rc = e1kCsTxEnter(pState, VINF_IOM_HC_MMIO_WRITE);
+    int rc = e1kCsTxEnter(pState, VINF_IOM_R3_MMIO_WRITE);
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
         return rc;
@@ -4334 +4334 @@
              */
 #ifdef E1K_GLOBAL_MUTEX
-            rc = e1kMutexAcquire(pState, VINF_IOM_HC_MMIO_READ, RT_SRC_POS);
+            rc = e1kMutexAcquire(pState, VINF_IOM_R3_MMIO_READ, RT_SRC_POS);
 #else
             //rc = e1kCsEnter(pState, VERR_SEM_BUSY, RT_SRC_POS);
@@ -4417 +4417 @@
                      INSTANCE(pState), uOffset, u32, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
 #ifdef E1K_GLOBAL_MUTEX
-            rc = e1kMutexAcquire(pState, VINF_IOM_HC_MMIO_WRITE, RT_SRC_POS);
+            rc = e1kMutexAcquire(pState, VINF_IOM_R3_MMIO_WRITE, RT_SRC_POS);
 #else
             //rc = e1kCsEnter(pState, VERR_SEM_BUSY, RT_SRC_POS);
@@ -4541 +4541 @@
                 rc = e1kRegRead(pState, pState->uSelectedReg, pu32, cb);
                 /** @todo wrong return code triggers assertions in the debug build; fix please */
-                if (rc == VINF_IOM_HC_MMIO_READ)
-                    rc = VINF_IOM_HC_IOPORT_READ;
+                if (rc == VINF_IOM_R3_MMIO_READ)
+                    rc = VINF_IOM_R3_IOPORT_READ;
 
                 E1kLog2(("%s e1kIOPortIn: IODATA(4), reading from selected register %#010x, val=%#010x\n", szInst, pState->uSelectedReg, *pu32));
@@ -4595 +4595 @@
                 rc = e1kRegWrite(pState, pState->uSelectedReg, &u32, cb);
                 /** @todo wrong return code triggers assertions in the debug build; fix please */
-                if (rc == VINF_IOM_HC_MMIO_WRITE)
-                    rc = VINF_IOM_HC_IOPORT_WRITE;
+                if (rc == VINF_IOM_R3_MMIO_WRITE)
+                    rc = VINF_IOM_R3_IOPORT_WRITE;
                 break;
             default:
@@ -4942 +4942 @@
             if (!ASMBitTest(pState->auVFTA, E1K_SPEC_VLAN(RT_BE2H_U16(u16Ptr[7]))))
             {
-                E1kLog2(("%s Packet filter: no VLAN match (id=%d)\n", 
+                E1kLog2(("%s Packet filter: no VLAN match (id=%d)\n",
                          INSTANCE(pState), E1K_SPEC_VLAN(RT_BE2H_U16(u16Ptr[7]))));
                 return false;

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

@@ -1215 +1215 @@
     }
     STAM_COUNTER_INC(&CTXALLSUFF(pThis->StatRingWriteFailed)); ;
-    return VINF_IOM_HC_MMIO_WRITE; /* handle in ring3 */
+    return VINF_IOM_R3_MMIO_WRITE; /* handle in ring3 */
 }
 
@@ -2808 +2808 @@
                 {
                     Log(("#%d pcnetCSRWriteU16: pcnetInit requested => HC\n", PCNET_INST_NR));
-                    return VINF_IOM_HC_IOPORT_WRITE;
+                    return VINF_IOM_R3_IOPORT_WRITE;
                 }
 #endif
@@ -2895 +2895 @@
                 Log(("#%d: promiscuous mode changed to %d\n", PCNET_INST_NR, !!(val & 0x8000)));
 #ifndef IN_RING3
-                return VINF_IOM_HC_IOPORT_WRITE;
+                return VINF_IOM_R3_IOPORT_WRITE;
 #else
                 /* check for promiscuous mode change */
@@ -3632 +3632 @@
 
     STAM_PROFILE_ADV_START(&pThis->StatAPROMRead, a);
-    rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_WRITE);
+    rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_R3_IOPORT_WRITE);
     if (rc == VINF_SUCCESS)
     {
@@ -3680 +3680 @@
     {
         STAM_PROFILE_ADV_START(&pThis->StatAPROMWrite, a);
-        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_WRITE);
+        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_R3_IOPORT_WRITE);
         if (RT_LIKELY(rc == VINF_SUCCESS))
         {
@@ -3695 +3695 @@
     LogFlow(("#%d pcnetIOPortAPromWrite: Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", PCNET_INST_NR, Port, u32, cb, rc));
 #ifdef LOG_ENABLED
-    if (rc == VINF_IOM_HC_IOPORT_WRITE)
+    if (rc == VINF_IOM_R3_IOPORT_WRITE)
         LogFlow(("#%d => HC\n", PCNET_INST_NR));
 #endif
@@ -3720 +3720 @@
 
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatIORead), a);
-    rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_READ);
+    rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_R3_IOPORT_READ);
     if (RT_LIKELY(rc == VINF_SUCCESS))
     {
@@ -3738 +3738 @@
     Log2(("#%d pcnetIOPortRead: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", PCNET_INST_NR, Port, *pu32, cb, rc));
 #ifdef LOG_ENABLED
-    if (rc == VINF_IOM_HC_IOPORT_READ)
+    if (rc == VINF_IOM_R3_IOPORT_READ)
         LogFlow(("#%d pcnetIOPortRead/critsect failed in GC => HC\n", PCNET_INST_NR));
 #endif
@@ -3763 +3763 @@
 
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatIOWrite), a);
-    rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_WRITE);
+    rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_R3_IOPORT_WRITE);
     if (RT_LIKELY(rc == VINF_SUCCESS))
     {
@@ -3781 +3781 @@
     Log2(("#%d pcnetIOPortWrite: Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", PCNET_INST_NR, Port, u32, cb, rc));
 #ifdef LOG_ENABLED
-    if (rc == VINF_IOM_HC_IOPORT_WRITE)
+    if (rc == VINF_IOM_R3_IOPORT_WRITE)
         LogFlow(("#%d pcnetIOPortWrite/critsect failed in GC => HC\n", PCNET_INST_NR));
 #endif
@@ -3811 +3811 @@
     {
         STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatMMIORead), a);
-        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_MMIO_READ);
+        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_R3_MMIO_READ);
         if (RT_LIKELY(rc == VINF_SUCCESS))
         {
@@ -3834 +3834 @@
              PCNET_INST_NR, pv, cb, pv, cb, GCPhysAddr, rc));
 #ifdef LOG_ENABLED
-    if (rc == VINF_IOM_HC_MMIO_READ)
+    if (rc == VINF_IOM_R3_MMIO_READ)
         LogFlow(("#%d => HC\n", PCNET_INST_NR));
 #endif
@@ -3864 +3864 @@
     {
         STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatMMIOWrite), a);
-        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_MMIO_WRITE);
+        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_R3_MMIO_WRITE);
         if (RT_LIKELY(rc == VINF_SUCCESS))
         {
@@ -3879 +3879 @@
             PDMCritSectLeave(&pThis->CritSect);
         }
-        // else rc == VINF_IOM_HC_MMIO_WRITE => handle in ring3
+        // else rc == VINF_IOM_R3_MMIO_WRITE => handle in ring3
 
         STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatMMIOWrite), a);
@@ -3886 +3886 @@
              PCNET_INST_NR, pv, cb, pv, cb, GCPhysAddr, rc));
 #ifdef LOG_ENABLED
-    if (rc == VINF_IOM_HC_MMIO_WRITE)
+    if (rc == VINF_IOM_R3_MMIO_WRITE)
         LogFlow(("#%d => HC\n", PCNET_INST_NR));
 #endif

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

@@ -418 +418 @@
     pState->uIsTransmitting   = 0;
 #ifndef IN_RING3
-    return VINF_IOM_HC_IOPORT_WRITE;
+    return VINF_IOM_R3_IOPORT_WRITE;
 #else
     if (pState->pDrv)