Changeset 6418 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jan 21, 2008 4:51:44 PM (17 years ago)

Author:

vboxsync

Message:

cosmetics on the hrtimer stuff.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDRV.h (modified) (2 diffs)
• linux/SUPDrv-linux.c (modified) (15 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDRV.h

@@ -25 +25 @@
  */
 
-#ifndef __SUPDRV_h__
-#define __SUPDRV_h__
+#ifndef ___SUPDRV_h
+#define ___SUPDRV_h
 
 
@@ -271 +271 @@
 typedef struct timer_list VBOXKTIMER;
 # endif
+typedef VBOXKTIMER       *PVBOXKTIMER;
 #endif
 

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

@@ -42 +42 @@
 #include <linux/module.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-#include <linux/moduleparam.h>
+# include <linux/moduleparam.h>
 #endif
 #include <linux/kernel.h>
@@ -284 +284 @@
 #endif /* !CONFIG_VBOXDRV_AS_MISC */
 
-/** Module parameter */
+/** Module parameter.
+ * Not prefixed because the name is used by macros and the end of this file. */
 static int force_async_tsc = 0;
 
@@ -310 +311 @@
 *******************************************************************************/
 #ifdef VBOX_HRTIMER
-typedef enum hrtimer_restart (*VBOXTIMERFN)(struct hrtimer *);
-#else
-typedef void (*VBOXTIMERFN)(unsigned long);
+typedef enum hrtimer_restart (*PFNVBOXKTIMER)(struct hrtimer *);
+#else
+typedef void (*PFNVBOXKTIMER)(unsigned long);
 #endif
 
@@ -328 +329 @@
 static int      VBoxDrvLinuxTermGip(PSUPDRVDEVEXT pDevExt);
 #ifdef VBOX_HRTIMER
-static enum hrtimer_restart VBoxDrvLinuxGipTimer(struct hrtimer *timer);
+static enum hrtimer_restart VBoxDrvLinuxGipTimer(struct hrtimer *pTimer);
 #else
 static void     VBoxDrvLinuxGipTimer(unsigned long ulUser);
@@ -334 +335 @@
 #ifdef CONFIG_SMP
 # ifdef VBOX_HRTIMER
-static enum hrtimer_restart VBoxDrvLinuxGipTimerPerCpu(struct hrtimer *timer);
+static enum hrtimer_restart VBoxDrvLinuxGipTimerPerCpu(struct hrtimer *pTimer);
 # else
 static void     VBoxDrvLinuxGipTimerPerCpu(unsigned long ulUser);
@@ -370 +371 @@
 #endif
 
-static inline void vbox_ktimer_init(VBOXKTIMER *timer, VBOXTIMERFN function, unsigned long data)
+static inline void vbox_ktimer_init(PVBOXKTIMER pTimer, PFNVBOXKTIMER pfnFunction, unsigned long ulData)
 {
 #ifdef VBOX_HRTIMER
-   hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
-    timer->function = function;
-#else
-    init_timer(timer);
-    timer->data     = data;
-    timer->function = function;
-    timer->expires  = jiffies;
-#endif
-}
-
-static inline void vbox_ktimer_start(VBOXKTIMER *timer)
+    hrtimer_init(pTimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
+    pTimer->function = pfnFunction;
+#else
+    init_timer(pTimer);
+    pTimer->data     = ulData;
+    pTimer->function = pfnFunction;
+    pTimer->expires  = jiffies;
+#endif
+}
+
+static inline void vbox_ktimer_start(PVBOXKTIMER pTimer)
 {
 #ifdef VBOX_HRTIMER
-    hrtimer_start(timer, ktime_add_ns(ktime_get(), 1000000), HRTIMER_MODE_ABS);
-#else
-    mod_timer(timer, jiffies);
-#endif
-}
-
-static inline void vbox_ktimer_stop(VBOXKTIMER *timer)
+    hrtimer_start(pTimer, ktime_add_ns(ktime_get(), 1000000), HRTIMER_MODE_ABS);
+#else
+    mod_timer(pTimer, jiffies);
+#endif
+}
+
+static inline void vbox_ktimer_stop(PVBOXKTIMER pTimer)
 {
 #ifdef VBOX_HRTIMER
-    hrtimer_cancel(timer);
-#else
-    if (timer_pending(timer))
-        del_timer_sync(timer);
+    hrtimer_cancel(pTimer);
+#else
+    if (timer_pending(pTimer))
+        del_timer_sync(pTimer);
 #endif
 }
@@ -701 +702 @@
                     printk(KERN_INFO DEVICE_NAME ": TSC mode is %s, kernel timer mode is "
 #ifdef VBOX_HRTIMER
-                            "'high-res'"
-#else
-                            "'normal'"
-#endif
-                            ".\n",
-                            g_DevExt.pGip->u32Mode == SUPGIPMODE_SYNC_TSC ? "'synchronous'" : "'asynchronous'");
+                           "'high-res'"
+#else
+                           "'normal'"
+#endif
+                           ".\n",
+                           g_DevExt.pGip->u32Mode == SUPGIPMODE_SYNC_TSC ? "'synchronous'" : "'asynchronous'");
                     dprintf(("VBoxDrv::ModuleInit returning %#x\n", rc));
                     printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version "
@@ -1107 +1108 @@
  */
 #ifdef VBOX_HRTIMER
-static enum hrtimer_restart VBoxDrvLinuxGipTimer(struct hrtimer* timer)
+static enum hrtimer_restart VBoxDrvLinuxGipTimer(struct hrtimer *pTimer)
 #else
 static void VBoxDrvLinuxGipTimer(unsigned long ulUser)
@@ -1119 +1120 @@
     unsigned long       SavedFlags;
 #ifdef VBOX_HRTIMER
-    ktime_t             kNow;
+    ktime_t             KtNow;
 #endif
 
@@ -1126 +1127 @@
     ulNow   = jiffies;
 #ifdef VBOX_HRTIMER
-    kNow    = ktime_get();
+    KtNow   = ktime_get();
     pDevExt = &g_DevExt;
 #else
@@ -1155 +1156 @@
     {
 #ifdef VBOX_HRTIMER
-        hrtimer_forward(&g_GipTimer, kNow, ktime_set(0, 1000000));
+        hrtimer_forward(&g_GipTimer, KtNow, ktime_set(0, 1000000));
 #else
         mod_timer(&g_GipTimer, ulNow + ONE_MSEC_IN_JIFFIES);
@@ -1176 +1177 @@
  */
 #ifdef VBOX_HRTIMER
-static enum hrtimer_restart VBoxDrvLinuxGipTimerPerCpu(struct hrtimer *timer)
+static enum hrtimer_restart VBoxDrvLinuxGipTimerPerCpu(struct hrtimer *pTimer)
 #else
 static void VBoxDrvLinuxGipTimerPerCpu(unsigned long iTimerCPU)
@@ -1189 +1190 @@
 # ifdef VBOX_HRTIMER
     unsigned long       iTimerCPU;
-    ktime_t             kNow;
+    ktime_t             KtNow;
 # endif
 
@@ -1200 +1201 @@
 # ifdef VBOX_HRTIMER
     iTimerCPU = iCPU; /* XXX hrtimer does not support a 'data' field */
-    kNow    = ktime_get();
+    KtNow   = ktime_get();
 # endif
 
@@ -1216 +1217 @@
             {
 # ifdef VBOX_HRTIMER
-                hrtimer_forward(&pDevExt->aCPUs[iCPU].Timer, kNow, ktime_set(0, 1000000));
+                hrtimer_forward(&pDevExt->aCPUs[iCPU].Timer, KtNow, ktime_set(0, 1000000));
 # else
                 mod_timer(&pDevExt->aCPUs[iCPU].Timer, ulNow + ONE_MSEC_IN_JIFFIES);