Changeset 36870 in vbox

Timestamp:

Apr 28, 2011 7:44:09 AM (14 years ago)

Author:

vboxsync

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

71447

Message:

Devices/HPET: cosmetical nitpicking

Location:

trunk/src/VBox/Devices

Files:

• PC/DevHPET.cpp (modified) (18 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -58 +58 @@
 
 /*
- * 69841279 femtoseconds == 69.84 ns
+ * 69841279 femtoseconds == 69.84 ns (1 / 14.31818MHz)
  */
 #define HPET_CLK_PERIOD_ICH9        69841279UL
@@ -259 +259 @@
      * with the same speed.
      */
-    return  nsToHpetTicks(pThis, TMTimerGet(pThis->aTimers[0].CTX_SUFF(pTimer)) +
-                          pThis->u64HpetOffset);
+    return nsToHpetTicks(pThis, TMTimerGet(pThis->aTimers[0].CTX_SUFF(pTimer)) +
+                                pThis->u64HpetOffset);
 }
 
@@ -297 +297 @@
         u32Diff = ((int32_t)u32Diff > 0) ? u32Diff : (uint32_t)0;
         return (uint64_t)u32Diff;
-    } else {
+    }
+    else
+    {
         uint64_t u64Diff;
 
@@ -311 +313 @@
 {
   uint64_t u64Period = pTimer->u64Period;
-  if ((pTimer->u64Config & HPET_TN_PERIODIC) && (u64Period != 0))
+  if (   (pTimer->u64Config & HPET_TN_PERIODIC)
+      && (u64Period != 0))
   {
       /* While loop is suboptimal */
@@ -348 +351 @@
     if (!pTimer->CTX_SUFF(pHpet)->fIch9)
     {
-        if ((pTimer->u64Config & HPET_TN_32BIT) && !(pTimer->u64Config & HPET_TN_PERIODIC))
+        if (    (pTimer->u64Config & HPET_TN_32BIT)
+            && !(pTimer->u64Config & HPET_TN_PERIODIC))
         {
             u32TillWrap = 0xffffffff - (uint32_t)u64Ticks;
@@ -381 +385 @@
      * to the different ICs.
      */
-    if ((pTimer->u8TimerNumber <= 1) &&
-        (pTimer->CTX_SUFF(pHpet)->u64HpetConfig & HPET_CFG_LEGACY))
+    if (   (pTimer->u8TimerNumber <= 1)
+        && (pTimer->CTX_SUFF(pHpet)->u64HpetConfig & HPET_CFG_LEGACY))
         return (pTimer->u8TimerNumber == 0) ? 0 : 8;
-    else
-        return (pTimer->u64Config & HPET_TN_INT_ROUTE_MASK) >> HPET_TN_INT_ROUTE_SHIFT;
-}
-
-static int hpetTimerRegRead32(HpetState* pThis,
+        
+    return (pTimer->u64Config & HPET_TN_INT_ROUTE_MASK) >> HPET_TN_INT_ROUTE_SHIFT;
+}
+
+static int hpetTimerRegRead32(HpetState *pThis,
                               uint32_t   iTimerNo,
                               uint32_t   iTimerReg,
-                              uint32_t * pValue)
+                              uint32_t  *pValue)
 {
     HpetTimer *pTimer;
@@ -434 +438 @@
 }
 
-static int hpetConfigRegRead32(HpetState* pThis,
+static int hpetConfigRegRead32(HpetState *pThis,
                                uint32_t   iIndex,
                                uint32_t  *pValue)
@@ -540 +544 @@
                 if (pTimer->u64Config & HPET_TN_32BIT)
                     pTimer->u64Config &= ~HPET_TN_SETVAL;
-            } else if (pTimer->u64Config & HPET_TN_PERIODIC)
+            }
+            else if (pTimer->u64Config & HPET_TN_PERIODIC)
             {
                 iNewValue &= (pTimer->u64Config & HPET_TN_32BIT ? ~0U : ~0ULL) >> 1;
                 pTimer->u64Period = (pTimer->u64Period & 0xffffffff00000000ULL)
-                        | iNewValue;
+                                  | iNewValue;
             }
 
             pTimer->u64Cmp = (pTimer->u64Cmp & 0xffffffff00000000ULL)
-                    | iNewValue;
+                           | iNewValue;
 
             Log2(("after HPET_TN_CMP cmp=%llx per=%llx\n", pTimer->u64Cmp, pTimer->u64Period));
@@ -566 +571 @@
                 /* HPET_TN_SETVAL allows to adjust comparator w/o updating period, and it's cleared on access */
                 pTimer->u64Config &= ~HPET_TN_SETVAL;
-            } else if (pTimer->u64Config & HPET_TN_PERIODIC)
+            }
+            else if (pTimer->u64Config & HPET_TN_PERIODIC)
             {
                  pTimer->u64Period = (pTimer->u64Period & 0xffffffffULL)
-                         | ((uint64_t)iNewValue << 32);
+                                   | ((uint64_t)iNewValue << 32);
             }
 
             pTimer->u64Cmp = (pTimer->u64Cmp & 0xffffffffULL)
-                    | ((uint64_t)iNewValue << 32);
+                           | ((uint64_t)iNewValue << 32);
 
             Log2(("after HPET_TN_CMP+4 cmp=%llx per=%llx\n", pTimer->u64Cmp, pTimer->u64Period));
@@ -741 +747 @@
         case 4:
         {
-            if ((iIndex >= 0x100) && (iIndex < 0x400))
+            if (iIndex >= 0x100 && iIndex < 0x400)
                 rc = hpetTimerRegRead32(pThis, (iIndex - 0x100) / 0x20, (iIndex - 0x100) % 0x20, (uint32_t*)pv);
             else
@@ -749 +755 @@
         case 8:
         {
-            union {
+            union
+            {
                 uint32_t u32[2];
                 uint64_t u64;
@@ -761 +768 @@
                 break;
             }
-            if ((iIndex >= 0x100) && (iIndex < 0x400))
+            if (iIndex >= 0x100 && iIndex < 0x400)
             {
                 uint32_t iTimer = (iIndex - 0x100) / 0x20;
@@ -778 +785 @@
                     /* When reading HPET counter we must read it in a single read,
                        to avoid unexpected time jumps on 32-bit overflow. */
-                    value.u64 =
-                            (pThis->u64HpetConfig & HPET_CFG_ENABLE) != 0
-                            ?
-                            hpetGetTicks(pThis)
-                            :
-                            pThis->u64HpetCounter;
+                    value.u64 = (pThis->u64HpetConfig & HPET_CFG_ENABLE) != 0
+                              ? hpetGetTicks(pThis)
+                              : pThis->u64HpetCounter;
                     rc = VINF_SUCCESS;
                 }
@@ -837 +841 @@
         case 4:
         {
-            if ((iIndex >= 0x100) && (iIndex < 0x400))
+            if (iIndex >= 0x100 && iIndex < 0x400)
                 rc = hpetTimerRegWrite32(pThis,
                                          (iIndex - 0x100) / 0x20,
@@ -848 +852 @@
         case 8:
         {
-            union {
+            union
+            {
                 uint32_t u32[2];
                 uint64_t u64;
@@ -862 +867 @@
             value.u64 = *(uint64_t*)pv;
             // for 8-byte accesses we just split them, happens under lock anyway
-            if ((iIndex >= 0x100) && (iIndex < 0x400))
+            if (iIndex >= 0x100 && iIndex < 0x400)
             {
                 uint32_t iTimer = (iIndex - 0x100) / 0x20;
@@ -1018 +1023 @@
 
     /** @todo: is it correct? */
-    if (!!(pTimer->u64Config & HPET_TN_ENABLE) &&
-        !!(pThis->u64HpetConfig & HPET_CFG_ENABLE))
+    if (   !!(pTimer->u64Config & HPET_TN_ENABLE)
+        && !!(pThis->u64HpetConfig & HPET_CFG_ENABLE))
     {
         Log4(("HPET: raising IRQ %d\n", irq));
@@ -1071 +1076 @@
         TMTimerSetNano(pTmTimer, hpetTicksToNs(pThis, u64Diff));
     }
-    else if ((pTimer->u64Config & HPET_TN_32BIT) &&
-             !(pTimer->u64Config & HPET_TN_PERIODIC))
+    else if (    (pTimer->u64Config & HPET_TN_32BIT)
+             && !(pTimer->u64Config & HPET_TN_PERIODIC))
     {
         if (pTimer->u8Wrap)

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1675 +1675 @@
     GEN_CHECK_OFF(HpetState, u64Isr);
     GEN_CHECK_OFF(HpetState, u64HpetCounter);
+    GEN_CHECK_OFF(HpetState, csLock);
+    GEN_CHECK_OFF(HpetState, fIch9);
 
     GEN_CHECK_SIZE(HpetTimer);