Changeset 1820 for trunk/src/kernel32/cpu.cpp

Timestamp:

Nov 23, 1999, 9:01:18 PM (26 years ago)

Author:

sandervl

Message:

GetSystemInfo supports SMP machines now

File:

• trunk/src/kernel32/cpu.cpp (modified) (6 diffs)

trunk/src/kernel32/cpu.cpp

@@ -1 @@
-/* $Id: cpu.cpp,v 1.1 1999-11-23 19:31:35 sandervl Exp $ */
+/* $Id: cpu.cpp,v 1.2 1999-11-23 20:01:17 sandervl Exp $ */
 /*
  * Odin win32 CPU apis
@@ -25 +25 @@
 
 static BYTE PF[64] = {0,};
-
-//******************************************************************************
-//******************************************************************************
-void InitSystemInfo()
+static nrCPUs = 1;
+//******************************************************************************
+//******************************************************************************
+void InitSystemInfo(int nrcpus)
 {
   SYSTEM_INFO si;
 
+   nrCPUs = nrcpus;
    GetSystemInfo(&si);
 }
@@ -58 +59 @@
  static SYSTEM_INFO cachedsi;
  HKEY   xhkey=0,hkey;
+ HKEY   fpukey=0, xhfpukey;
  char buf[20];
  DWORD features, signature;
@@ -83 +85 @@
         cachedsi.lpMaximumApplicationAddress    = (void *)0x7FFFFFFF;
         cachedsi.dwActiveProcessorMask          = 1;
-        cachedsi.dwNumberOfProcessors           = 1;
+        cachedsi.dwNumberOfProcessors           = nrCPUs;
         cachedsi.dwProcessorType                = PROCESSOR_INTEL_386;
         cachedsi.dwAllocationGranularity        = 0x10000;
@@ -154 +156 @@
                 //Create FPU key if one is present
                 if (features & CPUID_FPU_PRESENT) {
-                 HKEY fpukey;
-                        if (RegCreateKeyA(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor",&fpukey)!=ERROR_SUCCESS) {
-                                dprintf(("Unable to register FPU information\n"));
+                        if (i == 0) {
+                                if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor",&fpukey)!=ERROR_SUCCESS) 
+                                        dprintf(("Unable to register FPU information\n"));
                         }
-                        else    RegCloseKey(fpukey);
+                        // Create a new processor subkey
+                        if(fpukey) {
+                                sprintf(buf,"%d",i);
+                                RegCreateKeyA(fpukey,buf,&xhfpukey);
+                        }
                 }
         
@@ -169 +175 @@
         if (hkey)
                 RegCloseKey(hkey);
+        if (xhfpukey)
+                RegCloseKey(xhfpukey);
+        if (fpukey)
+                RegCloseKey(fpukey);
+
 }