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

Timestamp:

Nov 20, 2008 2:50:10 PM (16 years ago)

Author:

vboxsync

Message:

Call DGFStop instead of returning VERR_INTERNAL_ERROR on I/O port access (avoids guru meditation).

File:

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

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

@@ -3156 +3156 @@
 }
 
+static int pcnetIoportWriteU8(PCNetState *pThis, uint32_t addr, uint32_t val)
+{
+    int rc = VINF_SUCCESS;
+
+#ifdef PCNET_DEBUG_IO
+    Log2(("#%d pcnetIoportWriteU8: addr=%#010x val=%#06x\n", PCNET_INST_NR,
+         addr, val));
+#endif
+    if (RT_LIKELY(!BCR_DWIO(pThis)))
+    {
+        switch (addr & 0x0f)
+        {
+            case 0x04: /* RESET */
+                break;
+        }
+    }
+    else
+        Log(("#%d pcnetIoportWriteU8: addr=%#010x val=%#06x BCR_DWIO !!\n", PCNET_INST_NR, addr, val));
+
+    return rc;
+}
+
+static uint32_t pcnetIoportReadU8(PCNetState *pThis, uint32_t addr, int *pRC)
+{
+    uint32_t val = ~0U;
+
+    *pRC = VINF_SUCCESS;
+
+    if (RT_LIKELY(!BCR_DWIO(pThis)))
+    {
+        switch (addr & 0x0f)
+        {
+            case 0x04: /* RESET */
+                pcnetSoftReset(pThis);
+                val = 0;
+                break;
+        }
+    }
+    else
+        Log(("#%d pcnetIoportReadU8: addr=%#010x val=%#06x BCR_DWIO !!\n", PCNET_INST_NR, addr, val & 0xff));
+
+    pcnetUpdateIrq(pThis);
+
+skip_update_irq:
+#ifdef PCNET_DEBUG_IO
+    Log2(("#%d pcnetIoportReadU8: addr=%#010x val=%#06x\n", PCNET_INST_NR, addr, val & 0xff));
+#endif
+    return val;
+}
+
 static int pcnetIoportWriteU16(PCNetState *pThis, uint32_t addr, uint32_t val)
 {
@@ -3517 +3567 @@
         switch (cb)
         {
+            case 1: *pu32 = pcnetIoportReadU8(pThis, Port, &rc); break;
             case 2: *pu32 = pcnetIoportReadU16(pThis, Port, &rc); break;
             case 4: *pu32 = pcnetIoportReadU32(pThis, Port, &rc); break;
             default:
-                rc = VERR_IOM_IOPORT_UNUSED;
-                break;
+                rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+                                       "pcnetIOPortRead: unsupported op size: offset=%#10x cb=%u\n",
+                                       Port, cb);
         }
         PDMCritSectLeave(&pThis->CritSect);
@@ -3558 +3610 @@
         switch (cb)
         {
+            case 1: rc = pcnetIoportWriteU8(pThis, Port, u32); break;
             case 2: rc = pcnetIoportWriteU16(pThis, Port, u32); break;
             case 4: rc = pcnetIoportWriteU32(pThis, Port, u32); break;
             default:
-                AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
-                rc = VERR_INTERNAL_ERROR;
-                break;
+                rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+                                       "pcnetIOPortWrite: unsupported op size: offset=%#10x cb=%u\n",
+                                       Port, cb);
         }
         PDMCritSectLeave(&pThis->CritSect);
@@ -3609 +3662 @@
                 case 4:  *(uint32_t *)pv = pcnetMMIOReadU32(pThis, GCPhysAddr); break;
                 default:
-                    AssertMsgFailed(("cb=%d\n", cb));
-                    rc = VERR_INTERNAL_ERROR;
-                    break;
+                    rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+                                           "pcnetMMIORead: unsupported op size: address=%RGp cb=%u\n",
+                                           GCPhysAddr, cb);
             }
             PDMCritSectLeave(&pThis->CritSect);
@@ -3662 +3715 @@
                 case 4:  pcnetMMIOWriteU32(pThis, GCPhysAddr, *(uint32_t *)pv); break;
                 default:
-                    AssertMsgFailed(("cb=%d\n", cb));
-                    rc = VERR_INTERNAL_ERROR;
-                    break;
+                    rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+                                           "pcnetMMIOWrite: unsupported op size: address=%RGp cb=%u\n",
+                                           GCPhysAddr, cb);
             }
             PDMCritSectLeave(&pThis->CritSect);