Changeset 54208 in vbox

Timestamp:

Feb 13, 2015 6:17:39 PM (10 years ago)

Author:

vboxsync

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

98270

Message:

IPRT,SUPDrv: Support more than 255 CPUs via RTTIME_FLAGS_XXX, bumping supdrv major verison.

Location:

trunk

Files:

• include/iprt/timer.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c (modified) (1 diff)

trunk/include/iprt/timer.h

@@ -123 +123 @@
 #define RTTIMER_FLAGS_CPU_ANY       UINT32_C(0)
 /** One specific CPU */
-#define RTTIMER_FLAGS_CPU_SPECIFIC  RT_BIT(8)
+#define RTTIMER_FLAGS_CPU_SPECIFIC  RT_BIT(16)
 /** Omni timer, run on all online CPUs.
  * @remarks The timer callback isn't necessarily running at the time same time on each CPU. */
 #define RTTIMER_FLAGS_CPU_ALL       ( RTTIMER_FLAGS_CPU_MASK | RTTIMER_FLAGS_CPU_SPECIFIC )
 /** CPU mask. */
-#define RTTIMER_FLAGS_CPU_MASK      UINT32_C(0xff)
+#define RTTIMER_FLAGS_CPU_MASK      UINT32_C(0xffff)
 /** Desire a high resolution timer that works with RTTimerChangeInterval and
  * isn't subject to RTTimerGetSystemGranularity rounding.
  * @remarks This is quietly ignored if the feature isn't supported. */
-#define RTTIMER_FLAGS_HIGH_RES      RT_BIT(9)
+#define RTTIMER_FLAGS_HIGH_RES      RT_BIT(17)
 /** Convert a CPU set index (0-based) to RTTimerCreateEx flags.
  * This will automatically OR in the RTTIMER_FLAGS_CPU_SPECIFIC flag. */
@@ -138 +138 @@
 /** Macro that validates the flags. */
 #define RTTIMER_FLAGS_ARE_VALID(fFlags) \
-    ( !((fFlags) & ~((fFlags) & RTTIMER_FLAGS_CPU_SPECIFIC ? UINT32_C(0x3ff) : UINT32_C(0x300))) )
+    ( !((fFlags) & ~((fFlags) & RTTIMER_FLAGS_CPU_SPECIFIC ? UINT32_C(0x3ffff) : UINT32_C(0x30000))) )
 /** @} */
 

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

@@ -215 +215 @@
  *          - (none).
  */
-#define SUPDRV_IOC_VERSION                              0x001d0002
+#define SUPDRV_IOC_VERSION                              0x001e0000
 
 /** SUP_IOCTL_COOKIE. */

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

@@ -63 +63 @@
     uint8_t                 fSpecificCpu;
     /** The CPU it must run on if fSpecificCpu is set. */
-    uint8_t                 iCpu;
+    uint32_t                iCpu;
     /** The FreeBSD callout structure. */
     struct callout          Callout;