Changeset 26115 in vbox for trunk/src/VBox/Devices/PC/ACPI

Timestamp:

Feb 1, 2010 11:19:57 AM (15 years ago)

Author:

vboxsync

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

57104

Message:

ACPI: reverted hotplug changes until they get fixed (r57068, r57069, r57071)

File:

• trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp (modified) (7 diffs)

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

@@ -42 +42 @@
 /* Statically compiled AML */
 # include <vboxaml.hex>
-# include <vboxssdt-standard.hex>
-# include <vboxssdt-cpuhotplug.hex>
 #endif
 
@@ -139 +137 @@
 #endif
 
-/**
- * Loads an AML file if present in CFGM
- *
- * @returns VBox status code
- * @param   pDevIns        The device instance
- * @param   pcszCfgName    The configuration key holding the file path
- * @param   pcszSignature  The signature to check for
- * @param   ppbAmlCode     Where to store the pointer to the AML code on success.
- * @param   pcbAmlCode     Where to store the number of bytes of the AML code on success.
- */
-static int acpiAmlLoadExternal(PPDMDEVINS pDevIns, const char *pcszCfgName, const char *pcszSignature, uint8_t **ppbAmlCode, size_t *pcbAmlCode)
-{
+/* Two only public functions */
+int acpiPrepareDsdt(PPDMDEVINS pDevIns,  void * *ppPtr, size_t *puDsdtLen)
+{
+#ifdef VBOX_WITH_DYNAMIC_DSDT
+    return prepareDynamicDsdt(pDevIns, ppPtr, puDsdtLen);
+#else
     uint8_t *pbAmlCode = NULL;
     size_t cbAmlCode = 0;
     char *pszAmlFilePath = NULL;
-    int rc = CFGMR3QueryStringAlloc(pDevIns->pCfgHandle, pcszCfgName, &pszAmlFilePath);
-
+    int rc = CFGMR3QueryStringAlloc(pDevIns->pCfgHandle, "AmlFilePath", &pszAmlFilePath);
     if (RT_SUCCESS(rc))
     {
@@ -187 +178 @@
                      */
                     if (   RT_FAILURE(rc)
-                        || strncmp((const char *)pbAmlCode, pcszSignature, 4))
+                        || strncmp((const char *)pbAmlCode, "DSDT", 4))
                     {
                         RTMemFree(pbAmlCode);
@@ -195 +186 @@
                         if (RT_SUCCESS(rc))
                             rc = VERR_PARSE_ERROR;
-                    }
-                    else
-                    {
-                        *ppbAmlCode = pbAmlCode;
-                        *pcbAmlCode = cbAmlCode;
-                        rc = VINF_SUCCESS;
                     }
                 }
@@ -211 +196 @@
         MMR3HeapFree(pszAmlFilePath);
     }
-
-    return rc;
-}
-
-/* Two only public functions */
-int acpiPrepareDsdt(PPDMDEVINS pDevIns,  void * *ppPtr, size_t *puDsdtLen)
-{
-#ifdef VBOX_WITH_DYNAMIC_DSDT
-    return prepareDynamicDsdt(pDevIns, ppPtr, puDsdtLen);
-#else
-    uint8_t *pbAmlCodeDsdt = NULL;
-    size_t cbAmlCodeDsdt = 0;
-    int rc = acpiAmlLoadExternal(pDevIns, "DsdtFilePath", "DSDT", &pbAmlCodeDsdt, &cbAmlCodeDsdt);
-
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+    else if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
         rc = VINF_SUCCESS;
 
         /* Use the compiled in AML code */
-        cbAmlCodeDsdt = sizeof(AmlCode);
-        pbAmlCodeDsdt = (uint8_t *)RTMemAllocZ(cbAmlCodeDsdt);
-        if (pbAmlCodeDsdt)
-            memcpy(pbAmlCodeDsdt, AmlCode, cbAmlCodeDsdt);
+        cbAmlCode = sizeof(AmlCode);
+        pbAmlCode = (uint8_t *)RTMemAllocZ(cbAmlCode);
+        if (pbAmlCode)
+            memcpy(pbAmlCode, AmlCode, cbAmlCode);
         else
             rc = VERR_NO_MEMORY;
@@ -239 +210 @@
     else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"DsdtFilePath\""));
+                                N_("Configuration error: Failed to read \"AmlFilePath\""));
 
     if (RT_SUCCESS(rc))
     {
-        patchAml(pDevIns, pbAmlCodeDsdt, cbAmlCodeDsdt);
-        *ppPtr = pbAmlCodeDsdt;
-        *puDsdtLen = cbAmlCodeDsdt;
+        patchAml(pDevIns, pbAmlCode, cbAmlCode);
+        *ppPtr = pbAmlCode;
+        *puDsdtLen = cbAmlCode;
     }
     return rc;
@@ -262 +233 @@
 }
 
-int acpiPrepareSsdt(PPDMDEVINS pDevIns, void* *ppPtr, size_t *puSsdtLen)
-{
-    uint8_t *pbAmlCodeSsdt = NULL;
-    size_t   cbAmlCodeSsdt = 0;
-    int rc = acpiAmlLoadExternal(pDevIns, "SsdtFilePath", "SSDT", &pbAmlCodeSsdt, &cbAmlCodeSsdt);
-
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-    {
-        bool fCpuHotPlug = false;
-        uint8_t *pbAmlCode = NULL;
-        rc = CFGMR3QueryBoolDef(pDevIns->pCfgHandle, "CpuHotPlug", &fCpuHotPlug, false);
-
-        if (RT_FAILURE(rc))
-            return rc;
-
-        if (fCpuHotPlug)
-        {
-            pbAmlCode     = AmlCodeSsdtCpuHotPlug;
-            cbAmlCodeSsdt = sizeof(AmlCodeSsdtCpuHotPlug);
-        }
-        else
-        {
-            pbAmlCode     = AmlCodeSsdtStandard;
-            cbAmlCodeSsdt = sizeof(AmlCodeSsdtStandard);
-        }
-
-        pbAmlCodeSsdt = (uint8_t *)RTMemAllocZ(cbAmlCodeSsdt);
-        if (pbAmlCodeSsdt)
-            memcpy(pbAmlCodeSsdt, pbAmlCode, cbAmlCodeSsdt);
-        else
-            rc = VERR_NO_MEMORY;
-    }
-    else if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"SsdtFilePath\""));
-
-    if (RT_SUCCESS(rc))
-    {
-        patchAml(pDevIns, pbAmlCodeSsdt, cbAmlCodeSsdt);
-        *ppPtr = pbAmlCodeSsdt;
-        *puSsdtLen = cbAmlCodeSsdt;
-    }
-
-    return VINF_SUCCESS;
-}
-
-int acpiCleanupSsdt(PPDMDEVINS pDevIns, void* pPtr)
-{
-    if (pPtr)
-        RTMemFree(pPtr);
-    return VINF_SUCCESS;
-}
-