Changeset 37324 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Jun 3, 2011 4:28:03 PM (14 years ago)

Author:

vboxsync

Message:

TM,Devices: Fixed default critical section screwup and adjusted its usage in the devices.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevAPIC.cpp (modified) (1 diff)
• DevHPET.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -1427 +1427 @@
     Assert(pThis->pTimerR3 == pTimer);
     Assert(pThis->fTimerArmed);
+    Assert(PDMCritSectIsOwned(dev->pCritSectR3));
 
     if (!(pThis->lvt[APIC_LVT_TIMER] & APIC_LVT_MASKED)) {

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -364 +364 @@
         if (u32TillWrap < (uint32_t)u64Diff)
         {
-            Log(("wrap on timer %d: till=%u ticks=%lld diff64=%lld\n", 
+            Log(("wrap on timer %d: till=%u ticks=%lld diff64=%lld\n",
                  pTimer->u8TimerNumber, u32TillWrap, u64Ticks, u64Diff));
             u64Diff = u32TillWrap;
@@ -1063 +1063 @@
     HpetTimer *pTimer     = (HpetTimer *)pvUser;
     uint64_t   u64Period  = pTimer->u64Period;
-    uint64_t   u64CurTick = hpetGetTicks(pThis);
+    uint64_t   u64CurTick = hpetGetTicks(pThis); /** @todo this should be done AFTER locking the HPET. */
     uint64_t   u64Diff;
     int        rc;
@@ -1146 +1146 @@
         /* capable of periodic operations and 64-bits */
         if (pThis->fIch9)
-            pTimer->u64Config = (i == 0) ?  
-                    (HPET_TN_PERIODIC_CAP | HPET_TN_SIZE_CAP) 
-                    : 
+            pTimer->u64Config = (i == 0) ?
+                    (HPET_TN_PERIODIC_CAP | HPET_TN_SIZE_CAP)
+                    :
                     0;
         else
             pTimer->u64Config = HPET_TN_PERIODIC_CAP | HPET_TN_SIZE_CAP;
-        
+
         /* We can do all IRQs */
         uint32_t u32RoutingCap = 0xffffffff;
@@ -1186 +1186 @@
 static int hpetInit(PPDMDEVINS pDevIns)
 {
-    unsigned   i;
-    int        rc;
     HpetState *pThis = PDMINS_2_DATA(pDevIns, HpetState *);
 
@@ -1194 +1192 @@
     pThis->pDevInsRC  = PDMDEVINS_2_RCPTR(pDevIns);
 
-    for (i = 0; i < HPET_NUM_TIMERS; i++)
-    {
-        HpetTimer *timer = &pThis->aTimers[i];
-
-        timer->pHpetR3 = pThis;
-        timer->pHpetR0 = PDMINS_2_DATA_R0PTR(pDevIns);
-        timer->pHpetRC = PDMINS_2_DATA_RCPTR(pDevIns);
-
-        rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, hpetTimer, timer,
-                                    TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "HPET Timer",
-                                    &pThis->aTimers[i].pTimerR3);
+    for (unsigned i = 0; i < HPET_NUM_TIMERS; i++)
+    {
+        HpetTimer *pTimer = &pThis->aTimers[i];
+
+        pTimer->pHpetR3 = pThis;
+        pTimer->pHpetR0 = PDMINS_2_DATA_R0PTR(pDevIns);
+        pTimer->pHpetRC = PDMINS_2_DATA_RCPTR(pDevIns);
+
+        int rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, hpetTimer, pTimer,
+                                        TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "HPET Timer",
+                                        &pThis->aTimers[i].pTimerR3);
         if (RT_FAILURE(rc))
             return rc;