Changeset 108346 in vbox

Timestamp:

Feb 24, 2025 11:59:01 AM (3 weeks ago)

Author:

vboxsync

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

167705

Message:

Main/src-client/SystemTableBuilder.cpp: Use Eisa IDs where appropriate, bugref:10733

File:

• trunk/src/VBox/Main/src-client/SystemTableBuilder.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/SystemTableBuilder.cpp

@@ -62 +62 @@
     const char *pszAcpiName;
     const char *pszAcpiHid;
+    bool       fEisaId;
 } SYSTEMTABLEDEVICE;
 typedef SYSTEMTABLEDEVICE *PSYSTEMTABLEDEVICE;
@@ -72 +73 @@
 static const SYSTEMTABLEDEVICE g_aSysTblDevices[] =
 {
-    { "qemu-fw-cfg",        "fw-cfg",   "qemu,fw-cfg-mmio",         "FWC", "QEMU0002" },
-    { "arm-pl011",          "pl011",    "arm,pl011",                "SRL", "ARMH0011" },
-    { "arm-pl061-gpio",     "pl061",    "arm,pl061",                "GPI", "ARMH0061" },
-    { "pci-generic-ecam",   "pcie",     "pci-host-ecam-generic",    "PCI", "PNP0A08"  },
+    { "qemu-fw-cfg",        "fw-cfg",   "qemu,fw-cfg-mmio",         "FWC", "QEMU0002", false },
+    { "arm-pl011",          "pl011",    "arm,pl011",                "SRL", "ARMH0011", false },
+    { "arm-pl061-gpio",     "pl061",    "arm,pl061",                "GPI", "ARMH0061", false },
+    { "pci-generic-ecam",   "pcie",     "pci-host-ecam-generic",    "PCI", "PNP0A08",  true  },
 };
 
@@ -302 +303 @@
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_HID");
-    RTAcpiTblStringAppend(m_hAcpiDsdt, pSysTblDev->pszAcpiHid);
+    if (pSysTblDev->fEisaId)
+        RTAcpiTblEisaIdAppend(m_hAcpiDsdt, pSysTblDev->pszAcpiHid);
+    else
+        RTAcpiTblStringAppend(m_hAcpiDsdt, pSysTblDev->pszAcpiHid);
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_UID");
@@ -324 +328 @@
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_HID");
-    RTAcpiTblStringAppend(m_hAcpiDsdt, pSysTblDev->pszAcpiHid);
+    if (pSysTblDev->fEisaId)
+        RTAcpiTblEisaIdAppend(m_hAcpiDsdt, pSysTblDev->pszAcpiHid);
+    else
+        RTAcpiTblStringAppend(m_hAcpiDsdt, pSysTblDev->pszAcpiHid);
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_UID");
@@ -370 +377 @@
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_CID");
-    RTAcpiTblStringAppend(m_hAcpiDsdt, "PNP0A03"); /** @todo */
+    RTAcpiTblEisaIdAppend(m_hAcpiDsdt, "PNP0A03");
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_UID");
@@ -415 +422 @@
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_HID");
-    RTAcpiTblStringAppend(m_hAcpiDsdt, "PNP0C02");
+    RTAcpiTblEisaIdAppend(m_hAcpiDsdt, "PNP0C02");
 
     RTAcpiTblNameAppend(m_hAcpiDsdt, "_CRS");