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

Timestamp:

May 12, 2011 3:13:12 PM (14 years ago)

Author:

vboxsync

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

71684

Message:

mp-r0drv-darwin.cpp: Eliminate MY_DARWIN_MAX_CPUS - snow leopard sports up to 32 CPUs.

File:

• trunk/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp

@@ -42 +42 @@
 
 /*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-#define MY_DARWIN_MAX_CPUS      (0xf + 1) /* see MAX_CPUS */
-
-
-/*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
@@ -61 +55 @@
     {
         printf("IPRT: sysctlbyname(hw.ncpu) failed with rc=%d!\n", rc);
-        cCpus = MY_DARWIN_MAX_CPUS;
+        cCpus = 64; /* whatever */
     }
 
@@ -86 +80 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < RTCPUSET_MAX_CPUS && idCpu < MY_DARWIN_MAX_CPUS ? (int)idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS ? (int)idCpu : -1;
 }
 
@@ -92 +86 @@
 RTDECL(RTCPUID) RTMpCpuIdFromSetIndex(int iCpu)
 {
-    return (unsigned)iCpu < MY_DARWIN_MAX_CPUS ? (RTCPUID)iCpu : NIL_RTCPUID;
+    return (unsigned)iCpu < RTCPUSET_MAX_CPUS ? (RTCPUID)iCpu : NIL_RTCPUID;
 }
 
@@ -104 +98 @@
 RTDECL(bool) RTMpIsCpuPossible(RTCPUID idCpu)
 {
-    return idCpu < MY_DARWIN_MAX_CPUS
+    return idCpu < RTCPUSET_MAX_CPUS
         && idCpu < (RTCPUID)rtMpDarwinMaxCpus();
 }