Changeset 7110 in vbox

Timestamp:

Feb 25, 2008 2:44:22 PM (17 years ago)

Author:

vboxsync

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

28358

Message:

r=bird: The rate of the virtual clock is subject to change, don't assume 1GHz - use the new TMTimerSetNano for the CSR7 timer and convert the 2ms period for the other one.

File:

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

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

@@ -1245 +1245 @@
     }
 
-    if ((pData->aCSR[7] & 0x0C00) == 0x0C00)
+    if ((pData->aCSR[7] & 0x0C00) == 0x0C00) /* STINT + STINTE */
         iISR = 1;
 
@@ -2384 +2384 @@
             /* Poll timer interval is fixed to 500Hz. Don't stop it. */
             TMTimerSet(pData->CTXSUFF(pTimerPoll),
-                       TMTimerGet(pData->CTXSUFF(pTimerPoll)) + 2000000);
+                       TMTimerGet(pData->CTXSUFF(pTimerPoll))
+                       + TMTimerFromMilli(pData->CTXSUFF(pTimerPoll), 2));
 #endif
     }
@@ -2718 +2719 @@
             pData->aBCR[BCR_STVAL] = val;
             if (pData->fAm79C973)
-                TMTimerSet(pData->CTXSUFF(pTimerSoftInt), (uint64_t)12800 * val);
+                TMTimerSetNano(pData->CTXSUFF(pTimerSoftInt), (uint64_t)12800 * val);
             break;
 
@@ -2793 +2794 @@
         case 2:
             /* PHY identifier 1. */
-            val = 0x22;     /* Am79C874 PHY */ 
+            val = 0x22;     /* Am79C874 PHY */
             break;
 
         case 3:
             /* PHY identifier 2. */
-            val = 0x561b;   /* Am79C874 PHY */  
+            val = 0x561b;   /* Am79C874 PHY */
             break;
 
@@ -2806 +2807 @@
 #if 0
                 // Advertising flow control is a) not the default, and b) confuses
-                // the link speed detection routine in Windows PCnet driver 
+                // the link speed detection routine in Windows PCnet driver
                   | 0x0400  /* Try flow control. */
 #endif
@@ -3496 +3497 @@
 }
 
+
 /**
  * Software interrupt timer callback function.
@@ -3507 +3509 @@
     PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
 
-    pData->aCSR[7] |= 0x0800;
+    pData->aCSR[7] |= 0x0800; /* STINT */
     pcnetUpdateIrq(pData);
-    TMTimerSet(pData->CTXSUFF(pTimerSoftInt), (uint64_t)12800 * (pData->aBCR[BCR_STVAL] & 0xffff));
+    TMTimerSetNano(pData->CTXSUFF(pTimerSoftInt), (uint64_t)12800 * (pData->aBCR[BCR_STVAL] & 0xffff));
 }
 
@@ -4457 +4459 @@
         /* Software Interrupt timer */
         rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, pcnetTimerSoftInt,
-                                   "PCNet SoftInt Timer", &pData->pTimerSoftIntHC);
+                                    "PCNet SoftInt Timer", &pData->pTimerSoftIntHC);
         if (VBOX_FAILURE(rc))
         {