Changeset 21020 in vbox for trunk

Timestamp:

Jun 29, 2009 11:14:58 AM (16 years ago)

Author:

vboxsync

Message:

wrong return code triggers assertions in the debug build

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (2 diffs)

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

@@ -3769 +3769 @@
             case 0x04: /* IODATA */
                 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;
+
                 E1kLog2(("%s e1kIOPortIn: IODATA(4), reading from selected register %#010x, val=%#010x\n", szInst, pState->uSelectedReg, *pu32));
                 break;
@@ -3819 +3823 @@
                 E1kLog2(("%s e1kIOPortOut: IODATA(4), writing to selected register %#010x, value=%#010x\n", szInst, pState->uSelectedReg, u32));
                 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;
                 break;
             default: