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

Timestamp:

Feb 22, 2008 1:41:40 PM (17 years ago)

Author:

vboxsync

Message:

pcnet: debugging update

File:

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

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

@@ -1425 +1425 @@
 static void pcnetStart(PCNetState *pData)
 {
-    Log(("%#d pcnetStart:\n", PCNETSTATE_2_DEVINS(pData)->iInstance));
+    Log(("#%d pcnetStart:\n", PCNETSTATE_2_DEVINS(pData)->iInstance));
     if (!CSR_DTX(pData))
         pData->aCSR[0] |= 0x0010;    /* set TXON */
@@ -2340 +2340 @@
 #ifdef LOG_ENABLED
     TMD dummy;
-    Log2(("#%d pcnetPollTimer time=%#010x TDMD=%d TXON=%d POLL=%d TDTE=%d TDRA=%#x\n",
-          PCNETSTATE_2_DEVINS(pData)->iInstance, RTTimeMilliTS(), CSR_TDMD(pData), CSR_TXON(pData),
-          !CSR_DPOLL(pData), pcnetTdtePoll(pData, &dummy), pData->GCTDRA));
+    if (CSR_STOP(pData) || CSR_SPND(pData))
+        Log2(("#%d pcnetPollTimer time=%#010llx CSR_STOP=%d CSR_SPND=%d\n",
+             PCNETSTATE_2_DEVINS(pData)->iInstance, RTTimeMilliTS(), CSR_STOP(pData), CSR_SPND(pData)));
+    else
+        Log2(("#%d pcnetPollTimer time=%#010llx TDMD=%d TXON=%d POLL=%d TDTE=%d TDRA=%#x\n",
+             PCNETSTATE_2_DEVINS(pData)->iInstance, RTTimeMilliTS(), CSR_TDMD(pData), CSR_TXON(pData),
+             !CSR_DPOLL(pData), pcnetTdtePoll(pData, &dummy), pData->GCTDRA));
     Log2(("#%d pcnetPollTimer: CSR_CXDA=%#x CSR_XMTRL=%d CSR_XMTRC=%d\n",
           PCNETSTATE_2_DEVINS(pData)->iInstance, CSR_CXDA(pData), CSR_XMTRL(pData), CSR_XMTRC(pData)));
@@ -2409 +2413 @@
                     val &= ~3;
 
+                Log(("#%d pcnetWriteCSR0: %#06x => %#06x\n", pData->aCSR[0], csr0));
+
 #ifndef IN_RING3
                 if (!(csr0 & 0x0001/*init*/) && (val & 1))
@@ -2435 +2441 @@
                     pcnetTransmit(pData);
 
-                return rc;
-            }
-        case 7:
-            {
-                uint16_t csr7 = pData->aCSR[7];
-                csr7 &=        ~0x0400 ;
-                csr7 &= ~(val & 0x0800);
-                csr7 |=  (val & 0x0400);
-                pData->aCSR[7] = csr7;
                 return rc;
             }
@@ -2507 +2504 @@
             val |= pData->aCSR[5] & 0x0a90;
             break;
+        case 7: /* Extended Control and Interrupt 2 */
+            {
+                uint16_t csr7 = pData->aCSR[7];
+                csr7 &=        ~0x0400 ;
+                csr7 &= ~(val & 0x0800);
+                csr7 |=  (val & 0x0400);
+                pData->aCSR[7] = csr7;
+                return rc;
+            }
         case 15: /* Mode */
             if ((pData->aCSR[15] & 0x8000) != (val & 0x8000) && pData->pDrv)