Changeset 37500 in vbox

Timestamp:

Jun 16, 2011 2:57:54 PM (13 years ago)

Author:

vboxsync

Message:

DevHPET: code cleanup in progress...

File:

• trunk/src/VBox/Devices/PC/DevHPET.cpp (modified) (9 diffs)

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

@@ -115 +115 @@
 
 
+/**
+ * Acquires the HPET lock or returns.
+ */
+#define DEVHPET_LOCK_RETURN(a_pThis, a_rcBusy)  \
+    do { \
+        int rcLock = PDMCritSectEnter(&(a_pThis)->csLock, (a_rcBusy)); \
+        if (rcLock != VINF_SUCCESS) \
+            return rcLock; \
+    } while (0)
+
+/**
+ * Releases the HPET lock.
+ */
+#define DEVHPET_UNLOCK(a_pThis) \
+    do { PDMCritSectLeave(&(a_pThis)->csLock); } while (0)
+
+
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -205 +222 @@
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
-
-/** @todo Use macros so we can get the source position. */
-DECLINLINE(int) hpetLock(HpetState* pThis, int rcBusy)
-{
-    return PDMCritSectEnter(&pThis->csLock, rcBusy);
-}
-
-DECLINLINE(void) hpetUnlock(HpetState* pThis)
-{
-    PDMCritSectLeave(&pThis->csLock);
-}
 
 DECLINLINE(bool) hpet32bitTimer(HpetTimer *pHpetTimer)
@@ -725 +731 @@
 
     LogFlow(("hpetMMIORead (%d): %llx (%x)\n", cb, (uint64_t)GCPhysAddr, iIndex));
-
-    rc = hpetLock(pThis, VINF_IOM_HC_MMIO_READ);
-    if (RT_UNLIKELY(rc != VINF_SUCCESS))
-        return rc;
+    DEVHPET_LOCK_RETURN(pThis, VINF_IOM_HC_MMIO_READ);
 
     switch (cb)
@@ -802 +805 @@
     }
 
-    hpetUnlock(pThis);
-
+    DEVHPET_UNLOCK(pThis);
     return rc;
 }
@@ -814 +816 @@
 {
     HpetState  *pThis  = PDMINS_2_DATA(pDevIns, HpetState*);
+    uint32_t    iIndex = (uint32_t)(GCPhysAddr - HPET_BASE);
     int         rc     = VINF_SUCCESS;
-    uint32_t    iIndex = (uint32_t)(GCPhysAddr - HPET_BASE);
 
     LogFlow(("hpetMMIOWrite (%d): %llx (%x) <- %x\n",
              cb, (uint64_t)GCPhysAddr, iIndex, cb >= 4 ? *(uint32_t*)pv : 0xdeadbeef));
 
-    rc = hpetLock(pThis, VINF_IOM_HC_MMIO_WRITE);
-    if (RT_UNLIKELY(rc != VINF_SUCCESS))
-        return rc;
+    DEVHPET_LOCK_RETURN(pThis, VINF_IOM_HC_MMIO_WRITE);
 
     switch (cb)
@@ -885 +885 @@
     }
 
-    hpetUnlock(pThis);
+    DEVHPET_UNLOCK(pThis);
     return rc;
 }
@@ -1044 +1044 @@
 
     /* Lock in R3 must either block or succeed */
-    int rc = hpetLock(pThis, VERR_IGNORED);
-    AssertLogRelRCReturnVoid(rc);
+    int rc = PDMCritSectEnter(&pThis->csLock, VERR_IGNORED);
+    AssertRC(rc);
 
     if ((pHpetTimer->u64Config & HPET_TN_PERIODIC) && (u64Period != 0))
@@ -1070 +1070 @@
     hpetIrqUpdate(pHpetTimer);
 
-    hpetUnlock(pThis);
+    PDMCritSectLeave(&pThis->csLock);
 }
 
@@ -1178 +1178 @@
         pThis->aTimers[i].pTimerRC = TMTimerRCPtr(pThis->aTimers[i].pTimerR3);
         pThis->aTimers[i].pTimerR0 = TMTimerR0Ptr(pThis->aTimers[i].pTimerR3);
-        TMR3TimerSetCritSect(pThis->aTimers[i].pTimerR3, &pThis->csLock);
+        /// @todo TMR3TimerSetCritSect(pThis->aTimers[i].pTimerR3, &pThis->csLock);
     }