Changeset 4542 in vbox for trunk/src/VBox/Runtime

Timestamp:

Sep 5, 2007 8:07:47 PM (17 years ago)

Author:

vboxsync

Message:

Some freebsd fixes.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r0drv/freebsd/the-freebsd-kernel.h (modified) (1 diff)
• r0drv/freebsd/timer-r0drv-freebsd.c (modified) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -373 +373 @@
         generic/RTFileMove-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
+        generic/RTTimeLocalNow-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/pathhost-generic.cpp \
@@ -703 +704 @@
         math/gcc/xordi3.c
 endif
-        
-        
+
+
 string/memchr.cpp_CXXFLAGS.win = -Oi-
 string/memcmp.cpp_CXXFLAGS.win = -Oi-

trunk/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h

@@ -53 +53 @@
 #include <sys/sched.h>
 #include <sys/callout.h>
+#include <sys/smp.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>            /* for vtophys */

trunk/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c

@@ -103 +103 @@
         &&  (fFlags & RTTIMER_FLAGS_CPU_MASK) > mp_maxid)
         return VERR_INVALID_PARAMETER;
-    
+
     /*
      * Allocate and initialize the timer handle.
@@ -176 +176 @@
     pTimer->u64StartTS = u64First;
     pTimer->u64NextTS = u64First;
-    
+
     tv.tv_sec  =  u64First / 1000000000;
     tv.tv_usec = (u64First % 1000000000) / 1000;
@@ -206 +206 @@
  *
  * This will perform the timer callback if we're on the right CPU.
- * 
+ *
  * @param   pvTimer The timer.
  */
 static void rtTimerFreeBSDIpiAction(void *pvTimer)
 {
-    PRTTIMER pTimer = (PRTTIMER)pvTimer; 
-    if (    pTimer->iCpu == RTTIMER_FLAGS_CPU_ALL
+    PRTTIMER pTimer = (PRTTIMER)pvTimer;
+    if (    pTimer->iCpu == RTTIMER_FLAGS_CPU_MASK
         ||  (u_int)pTimer->iCpu == curcpu)
         pTimer->pfnTimer(pTimer, pTimer->pvUser);
@@ -235 +235 @@
         if (pTimer->u64NextTS < u64NanoTS)
             pTimer->u64NextTS = u64NanoTS + RTTimerGetSystemGranularity() / 2;
- 
+
         tv.tv_sec = pTimer->u64NextTS / 1000000000;
         tv.tv_usec = (pTimer->u64NextTS % 1000000000) / 1000;