Changeset 20592 in vbox

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

Location:

trunk/src/VBox/Devices/PC

Files:

• ACPI/VBoxAcpi.cpp (modified) (6 diffs)
• DevACPI.cpp (modified) (2 diffs)
• vbox.dsl (modified) (1 diff)

trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp

@@ -24 +24 @@
 #endif
 
+#define LOG_GROUP LOG_GROUP_DEV_ACPI
 #include <VBox/pdmdev.h>
 #include <VBox/pgm.h>
@@ -45 +46 @@
                               size_t     *puDsdtLen)
 {
-    //LogRel(("file is %s\n", g_abVboxDslSource));
-    *ppPtr = NULL;
-    *puDsdtLen = 0;
-    return 0;
+  *ppPtr = NULL;
+  *puDsdtLen = 0;
+  return 0;
 }
 
@@ -68 +68 @@
         return rc;
 
+#if 0
+    /* Can clear CPU objects at all  here, if needed */
+    bool fShowCpu;
+    rc = CFGMR3QueryBoolDef(pDevIns->pCfgHandle, "ShowCpu", &fShowCpu, false);
+    if (RT_FAILURE(rc))
+      return rc;
+
+    if (!fShowCpu)
+      cNumCpus = 0;
+#endif
+
     /**
      * Now search AML for:
@@ -75 +86 @@
      * for VCPU not configured
      */
-    uint16_t cAcpiCpus = 0;
-    for (uint32_t i = 0; i < uAmlLen - 5; i++)
+    for (uint32_t i = 0; i < uAmlLen - 7; i++)
     {
         /*
@@ -94 +104 @@
                 continue;
 
-            /* Maybe use ProcID instead? */
-            cAcpiCpus++;
-            if (cAcpiCpus <= cNumCpus)
-                continue;
+            /* Processor ID */
+            if (pAml[i+7] < cNumCpus)
+              continue;
 
             /* Will fill unwanted CPU block with NOOPs */
@@ -133 +142 @@
     return prepareDynamicDsdt(pDevIns, ppPtr, puDsdtLen);
 #else
+    patchAml(pDevIns, AmlCode, sizeof(AmlCode));
     *ppPtr = AmlCode;
     *puDsdtLen = sizeof(AmlCode);

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;
 

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -374 +374 @@
             // @todo: maybe make it bitmask instead?
             UCP0,  32,
-            UCP1,  32,
-            UCP2,  32,
-            UCP3,  32,
             MEMH,  32,
             URTC,  32,