Changeset 5138 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 2, 2007 11:28:26 AM (18 years ago)

Author:

vboxsync

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

25008

Message:

vboxdrv: TICK_NSEC as macro

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (6 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -190 +190 @@
 # define ONE_MSEC_IN_JIFFIES       ((HZ + 999) / 1000)
 # error "HZ is not a multiple of 1000, the GIP stuff won't work right!"
+#endif
+
+/** @def TICK_NSEC
+ * The time between ticks in nsec */
+#ifndef TICK_NSEC
+# define TICK_NSEC (1000000UL / HZ)
 #endif
 
@@ -922 +928 @@
     pGip = (PSUPGLOBALINFOPAGE)page_address(pPage);
     pDevExt->ulLastJiffies  = jiffies;
-#ifdef TICK_NSEC
     pDevExt->u64LastMonotime = (uint64_t)pDevExt->ulLastJiffies * TICK_NSEC;
     dprintf(("VBoxDrvInitGIP: TICK_NSEC=%ld HZ=%d jiffies=%ld now=%lld\n",
              TICK_NSEC, HZ, pDevExt->ulLastJiffies, pDevExt->u64LastMonotime));
-#else
-    pDevExt->u64LastMonotime = (uint64_t)pDevExt->ulLastJiffies * (1000000 / HZ);
-    dprintf(("VBoxDrvInitGIP: TICK_NSEC=%d HZ=%d jiffies=%ld now=%lld\n",
-             (int)(1000000 / HZ), HZ, pDevExt->ulLastJiffies, pDevExt->u64LastMonotime));
-#endif
     supdrvGipInit(pDevExt, pGip, HCPhys, pDevExt->u64LastMonotime,
                   HZ <= 1000 ? HZ : 1000);
@@ -1014 +1014 @@
  * @param   ulUser  The device extension pointer.
  */
-static void     VBoxDrvLinuxGipTimer(unsigned long ulUser)
+static void VBoxDrvLinuxGipTimer(unsigned long ulUser)
 {
     PSUPDRVDEVEXT       pDevExt;
@@ -1035 +1035 @@
         ulDiff = ulNow - pDevExt->aCPUs[iCPU].ulLastJiffies;
         pDevExt->aCPUs[iCPU].ulLastJiffies = ulNow;
-#ifdef TICK_NSEC
         u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * TICK_NSEC;
-#else
-        u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * (1000000 / HZ);
-#endif
         pDevExt->aCPUs[iCPU].u64LastMonotime = u64Monotime;
     }
@@ -1047 +1043 @@
         ulDiff = ulNow - pDevExt->ulLastJiffies;
         pDevExt->ulLastJiffies = ulNow;
-#ifdef TICK_NSEC
         u64Monotime = pDevExt->u64LastMonotime + ulDiff * TICK_NSEC;
-#else
-        u64Monotime = pDevExt->u64LastMonotime + ulDiff * (1000000 / HZ);
-#endif
         pDevExt->u64LastMonotime = u64Monotime;
     }
@@ -1091 +1083 @@
             unsigned long   ulDiff = ulNow - pDevExt->aCPUs[iCPU].ulLastJiffies;
             pDevExt->aCPUs[iCPU].ulLastJiffies = ulNow;
-#ifdef TICK_NSEC
             u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * TICK_NSEC;
-#else
-            u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * (1000000 / HZ);
-#endif
             pDevExt->aCPUs[iCPU].u64LastMonotime = u64Monotime;
             if (RT_LIKELY(pGip))