Changeset 20592 in vbox for trunk/src/VBox/Devices/PC/DevACPI.cpp

Timestamp:

Jun 15, 2009 2:32:18 PM (16 years ago)

Author:

vboxsync

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

48631

Message:

ACPI: cleanup, restored removed AML patching

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -137 +137 @@
     SYSTEM_INFO_INDEX_FDC_STATUS        = 4,
     SYSTEM_INFO_INDEX_CPU0_STATUS       = 5,
-    SYSTEM_INFO_INDEX_CPU1_STATUS       = 6,
-    SYSTEM_INFO_INDEX_CPU2_STATUS       = 7,
-    SYSTEM_INFO_INDEX_CPU3_STATUS       = 8,
-    SYSTEM_INFO_INDEX_HIGH_MEMORY_LENGTH= 9,
-    SYSTEM_INFO_INDEX_RTC_STATUS        = 10,
-    SYSTEM_INFO_INDEX_END               = 11,
+    SYSTEM_INFO_INDEX_HIGH_MEMORY_LENGTH= 6,
+    SYSTEM_INFO_INDEX_RTC_STATUS        = 7,
+    SYSTEM_INFO_INDEX_END               = 8,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -1324 +1321 @@
 
                 case SYSTEM_INFO_INDEX_CPU0_STATUS:
-                case SYSTEM_INFO_INDEX_CPU1_STATUS:
-                case SYSTEM_INFO_INDEX_CPU2_STATUS:
-                case SYSTEM_INFO_INDEX_CPU3_STATUS:
                     *pu32 = s->fShowCpu
-                         && s->uSystemInfoIndex - SYSTEM_INFO_INDEX_CPU0_STATUS < s->cCpus
-                          ?   STA_DEVICE_PRESENT_MASK
-                            | STA_DEVICE_ENABLED_MASK
-                            | STA_DEVICE_SHOW_IN_UI_MASK
-                            | STA_DEVICE_FUNCTIONING_PROPERLY_MASK
-                          : 0;
+                      ?   STA_DEVICE_PRESENT_MASK
+                      | STA_DEVICE_ENABLED_MASK
+                      | STA_DEVICE_SHOW_IN_UI_MASK
+                      | STA_DEVICE_FUNCTIONING_PROPERLY_MASK
+                      : 0;
                     break;