From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFdE-0008Sn-GF for qemu-devel@nongnu.org; Mon, 19 Jan 2015 11:57:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDFd4-0001ru-KG for qemu-devel@nongnu.org; Mon, 19 Jan 2015 11:56:52 -0500 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:35742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFd3-0001rY-PJ for qemu-devel@nongnu.org; Mon, 19 Jan 2015 11:56:42 -0500 Received: by mail-wg0-f44.google.com with SMTP id y19so32820256wgg.3 for ; Mon, 19 Jan 2015 08:56:41 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 19 Jan 2015 17:56:27 +0100 Message-Id: <1421686587-8354-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1421686587-8354-1-git-send-email-pbonzini@redhat.com> References: <1421686587-8354-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/3] pc: move common parts of the DSDT to dsdt-common List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, mst@redhat.com There is no need anymore to #include them in multiple places, and they are not too big so just place them in acpi-dsdt-common.dsl. Signed-off-by: Paolo Bonzini --- hw/i386/acpi-build.c | 12 +- hw/i386/acpi-dsdt-common.dsl | 14 +- hw/i386/acpi-dsdt-common.hex.generated | 1578 +++++++++++++++- hw/i386/acpi-dsdt-isa.dsl | 6 +- hw/i386/acpi-dsdt.dsl | 10 +- hw/i386/acpi-dsdt.hex.generated | 3119 +++++++++----------------------- hw/i386/q35-acpi-dsdt.dsl | 9 +- hw/i386/q35-acpi-dsdt.hex.generated | 2787 +++++++--------------------- tests/acpi-test-data/pc/DSDT | Bin 3920 -> 3923 bytes tests/acpi-test-data/q35/DSDT | Bin 8510 -> 8513 bytes 10 files changed, 3020 insertions(+), 4515 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4ed30d8..920f597 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -53,6 +53,7 @@ #include "hw/i386/q35-acpi-dsdt.hex" #include "hw/i386/acpi-dsdt.hex" +#include "hw/i386/acpi-dsdt-common.hex" #include "qapi/qmp/qint.h" #include "qom/qom-qobject.h" @@ -119,7 +120,6 @@ typedef struct AcpiBuildPciBusHotplugState { static void acpi_get_dsdt(AcpiMiscInfo *info) { - uint16_t *applesmc_sta; Object *piix = piix4_pm_find(); Object *lpc = ich9_lpc_find(); assert(!!piix != !!lpc); @@ -127,17 +127,11 @@ static void acpi_get_dsdt(AcpiMiscInfo *info) if (piix) { info->dsdt_code = AcpiDsdtAmlCode; info->dsdt_size = sizeof AcpiDsdtAmlCode; - applesmc_sta = piix_dsdt_applesmc_sta; } if (lpc) { info->dsdt_code = Q35AcpiDsdtAmlCode; info->dsdt_size = sizeof Q35AcpiDsdtAmlCode; - applesmc_sta = q35_dsdt_applesmc_sta; } - - /* Patch in appropriate value for AppleSMC _STA */ - *(uint8_t *)(info->dsdt_code + *applesmc_sta) = - applesmc_find() ? 0x0b : 0x00; } static @@ -718,7 +712,6 @@ static inline char acpi_get_hex(uint32_t val) #define ACPI_SSDT_SIGNATURE 0x54445353 /* SSDT */ #define ACPI_SSDT_HEADER_LENGTH 36 -#include "hw/i386/acpi-dsdt-common.hex" #include "hw/i386/ssdt-pcihp.hex" #include "hw/i386/ssdt-tpm.hex" @@ -1094,6 +1087,9 @@ push_dsdt_common(GArray *table_data, AcpiPmInfo *pm, AcpiMiscInfo *misc, ACPI_BUILD_SET_LE(dsdt_ptr, sizeof(dsdt_common_aml), dsdt_mctrl_nr_slots[0], 32, nr_mem); + /* Patch in appropriate value for AppleSMC _STA */ + dsdt_ptr[dsdt_applesmc_sta[0]]= applesmc_find() ? 0x0b : 0x00; + g_array_append_vals(table_data, dsdt_ptr + sizeof(AcpiTableHeader), DSDT_COMMON_SIZE); g_free(dsdt_ptr); diff --git a/hw/i386/acpi-dsdt-common.dsl b/hw/i386/acpi-dsdt-common.dsl index f7849c0..1929f8f 100644 --- a/hw/i386/acpi-dsdt-common.dsl +++ b/hw/i386/acpi-dsdt-common.dsl @@ -19,6 +19,17 @@ ACPI_EXTRACT_ALL_CODE dsdt_common_aml DefinitionBlock ("acpi-dsdt-common.aml", "SSDT", 0x01, "BXPC", "BXDSDTCOMM", 0x1) { + External(\_SB.PCI0, DeviceObj) + External(\_SB.PCI0.ISA, DeviceObj) + External(\_SB.PCI0.PCI, DeviceObj) + +#include "hw/acpi/pc-hotplug.h" +#include "acpi-dsdt-dbug.dsl" +#include "acpi-dsdt-hpet.dsl" +#include "acpi-dsdt-isa.dsl" +#include "acpi-dsdt-mem-hotplug.dsl" + + /**************************************************************** * PCI memory ranges ****************************************************************/ @@ -74,9 +85,6 @@ DefinitionBlock ("acpi-dsdt-common.aml", "SSDT", 0x01, "BXPC", "BXDSDTCOMM", 0x1 }) } - External(\_SB.PCI0, DeviceObj) - External(\_SB.PCI0.ISA, DeviceObj) - Scope(\_SB.PCI0.ISA) { Device(PEVT) { Name(_HID, "QEMU0001") diff --git a/hw/i386/acpi-dsdt-common.hex.generated b/hw/i386/acpi-dsdt-common.hex.generated index 5127845..00ad9c3 100644 --- a/hw/i386/acpi-dsdt-common.hex.generated +++ b/hw/i386/acpi-dsdt-common.hex.generated @@ -1,61 +1,1556 @@ -static unsigned char acpi_pci64_length[] = { -0x6f +static unsigned short acpi_pci64_length[] = { +0x646 }; -static unsigned char acpi_s4_pkg[] = { -0x99 +static unsigned short acpi_s4_pkg[] = { +0x670 }; -static unsigned char acpi_s4_name[] = { -0x92 +static unsigned short acpi_s4_name[] = { +0x669 }; -static unsigned char acpi_s3_name[] = { -0x86 +static unsigned short acpi_s3_name[] = { +0x65d }; -static unsigned char acpi_pci32_start[] = { -0x2f +static unsigned short acpi_pci32_start[] = { +0x606 }; -static unsigned char acpi_pci64_valid[] = { -0x43 +static unsigned short acpi_pci64_valid[] = { +0x61a }; -static unsigned char dsdt_isa_pest[] = { -0xda +static unsigned short dsdt_isa_pest[] = { +0x6b1 }; static unsigned char dsdt_common_aml[] = { 0x53, 0x53, 0x44, 0x54, +0x43, +0x7, +0x0, +0x0, +0x1, +0x1, +0x42, +0x58, +0x50, +0x43, +0x0, +0x0, +0x42, +0x58, +0x53, +0x53, +0x44, +0x54, +0x43, +0x4f, +0x1, +0x0, +0x0, +0x0, +0x49, +0x4e, +0x54, +0x4c, +0x13, +0x9, +0x12, +0x20, +0x10, +0x49, +0x4, +0x5c, +0x0, +0x5b, +0x80, +0x44, +0x42, +0x47, +0x5f, +0x1, +0xb, +0x2, +0x4, +0x1, +0x5b, +0x81, +0xb, +0x44, +0x42, +0x47, +0x5f, +0x1, +0x44, +0x42, +0x47, +0x42, +0x8, +0x14, +0x2c, +0x44, +0x42, +0x55, +0x47, +0x1, +0x98, +0x68, +0x60, +0x96, +0x60, +0x60, +0x74, +0x87, +0x60, +0x1, +0x61, +0x70, +0x0, +0x62, +0xa2, +0x10, +0x95, +0x62, +0x61, +0x70, +0x83, +0x88, +0x60, +0x62, +0x0, +0x44, +0x42, +0x47, +0x42, +0x75, +0x62, +0x70, +0xa, +0xa, +0x44, +0x42, +0x47, +0x42, +0x10, +0x4e, +0x8, +0x5c, +0x5f, +0x53, +0x42, +0x5f, +0x5b, +0x82, +0x45, +0x8, +0x48, +0x50, +0x45, +0x54, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0x1, +0x3, +0x8, +0x5f, +0x55, +0x49, +0x44, +0x0, +0x5b, +0x80, +0x48, +0x50, +0x54, +0x4d, +0x0, +0xc, +0x0, +0x0, +0xd0, +0xfe, +0xb, +0x0, +0x4, +0x5b, +0x81, +0x10, +0x48, +0x50, +0x54, +0x4d, +0x13, +0x56, +0x45, +0x4e, +0x44, +0x20, +0x50, +0x52, +0x44, +0x5f, +0x20, +0x14, +0x36, +0x5f, +0x53, +0x54, +0x41, +0x0, +0x70, +0x56, +0x45, +0x4e, +0x44, +0x60, +0x70, +0x50, +0x52, +0x44, +0x5f, +0x61, +0x7a, +0x60, +0xa, +0x10, +0x60, +0xa0, +0xc, +0x91, +0x93, +0x60, +0x0, +0x93, +0x60, +0xb, +0xff, +0xff, +0xa4, +0x0, +0xa0, +0xe, +0x91, +0x93, +0x61, +0x0, +0x94, +0x61, +0xc, +0x0, +0xe1, +0xf5, +0x5, +0xa4, +0x0, +0xa4, +0xa, +0xf, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x11, +0xa, +0xe, +0x86, +0x9, +0x0, +0x0, +0x0, +0x0, +0xd0, +0xfe, +0x0, +0x4, +0x0, +0x0, +0x79, +0x0, +0x10, +0x4b, +0x1e, +0x5c, +0x2f, +0x3, +0x5f, +0x53, +0x42, +0x5f, +0x50, +0x43, +0x49, +0x30, +0x49, +0x53, +0x41, +0x5f, +0x5b, +0x82, +0x2c, +0x53, +0x4d, +0x43, +0x5f, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x6, +0x10, +0x0, +0x1, +0x8, +0x5f, +0x53, +0x54, +0x41, +0xa, +0xf0, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x10, +0xa, +0xd, +0x47, +0x1, +0x0, +0x3, +0x0, +0x3, +0x1, +0x20, +0x22, +0x40, +0x0, +0x79, +0x0, +0x5b, +0x82, +0x2d, +0x52, +0x54, +0x43, +0x5f, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0xb, +0x0, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x18, +0xa, +0x15, +0x47, +0x1, +0x70, +0x0, +0x70, +0x0, +0x10, +0x2, +0x22, +0x0, +0x1, +0x47, +0x1, +0x72, +0x0, +0x72, +0x0, +0x2, +0x6, +0x79, +0x0, +0x5b, +0x82, +0x37, +0x4b, +0x42, +0x44, +0x5f, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0x3, +0x3, +0x14, +0x9, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0xa, +0xf, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x18, +0xa, +0x15, +0x47, +0x1, +0x60, +0x0, +0x60, +0x0, +0x1, +0x1, +0x47, +0x1, +0x64, +0x0, +0x64, +0x0, +0x1, +0x1, +0x22, +0x2, +0x0, +0x79, +0x0, +0x5b, +0x82, +0x27, +0x4d, +0x4f, +0x55, +0x5f, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0xf, +0x13, +0x14, +0x9, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0xa, +0xf, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x8, +0xa, +0x5, +0x22, +0x0, +0x10, +0x79, +0x0, +0x5b, +0x82, +0x4a, +0x4, +0x46, +0x44, +0x43, +0x30, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0x7, +0x0, +0x14, +0x18, +0x5f, +0x53, +0x54, +0x41, +0x0, +0x70, +0x46, +0x44, +0x45, +0x4e, +0x60, +0xa0, +0x6, +0x93, +0x60, +0x0, +0xa4, +0x0, +0xa1, +0x4, +0xa4, +0xa, +0xf, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x1b, +0xa, +0x18, +0x47, +0x1, +0xf2, +0x3, +0xf2, +0x3, +0x0, +0x4, +0x47, +0x1, +0xf7, +0x3, +0xf7, +0x3, +0x0, +0x1, +0x22, +0x40, +0x0, +0x2a, +0x4, +0x0, +0x79, +0x0, +0x5b, +0x82, +0x3e, +0x4c, +0x50, +0x54, +0x5f, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0x4, +0x0, +0x14, +0x18, +0x5f, +0x53, +0x54, +0x41, +0x0, +0x70, +0x4c, +0x50, +0x45, +0x4e, +0x60, +0xa0, +0x6, +0x93, +0x60, +0x0, +0xa4, +0x0, +0xa1, +0x4, +0xa4, +0xa, +0xf, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x10, +0xa, +0xd, +0x47, +0x1, +0x78, +0x3, +0x78, +0x3, +0x8, +0x8, +0x22, +0x80, +0x0, +0x79, +0x0, +0x5b, +0x82, +0x45, +0x4, +0x43, +0x4f, +0x4d, +0x31, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0x5, +0x1, +0x8, +0x5f, +0x55, +0x49, +0x44, +0x1, +0x14, +0x18, +0x5f, +0x53, +0x54, +0x41, +0x0, +0x70, +0x43, +0x41, +0x45, +0x4e, +0x60, +0xa0, +0x6, +0x93, +0x60, +0x0, +0xa4, +0x0, +0xa1, +0x4, +0xa4, +0xa, +0xf, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x10, +0xa, +0xd, +0x47, +0x1, +0xf8, +0x3, +0xf8, +0x3, +0x0, +0x8, +0x22, +0x10, +0x0, +0x79, +0x0, +0x5b, +0x82, +0x46, +0x4, +0x43, +0x4f, +0x4d, +0x32, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0x5, +0x1, +0x8, +0x5f, +0x55, +0x49, +0x44, +0xa, +0x2, +0x14, +0x18, +0x5f, +0x53, +0x54, +0x41, +0x0, +0x70, +0x43, +0x42, +0x45, +0x4e, +0x60, +0xa0, +0x6, +0x93, +0x60, +0x0, +0xa4, +0x0, +0xa1, +0x4, +0xa4, +0xa, +0xf, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0x10, +0xa, +0xd, +0x47, +0x1, +0xf8, +0x2, +0xf8, +0x2, +0x0, +0x8, +0x22, +0x8, +0x0, +0x79, +0x0, +0x10, +0x41, +0x31, +0x5c, +0x2e, +0x5f, +0x53, +0x42, +0x5f, +0x50, +0x43, +0x49, +0x30, +0x5b, +0x82, +0x43, +0x30, +0x4d, +0x48, +0x50, +0x44, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xd, +0x50, +0x4e, +0x50, +0x30, +0x41, +0x30, +0x36, +0x0, +0x8, +0x5f, +0x55, +0x49, +0x44, +0xd, +0x4d, +0x65, +0x6d, +0x6f, +0x72, +0x79, +0x20, +0x68, +0x6f, +0x74, +0x70, 0x6c, +0x75, +0x67, +0x20, +0x72, +0x65, +0x73, +0x6f, +0x75, +0x72, +0x63, +0x65, +0x73, +0x0, +0x5b, +0x80, +0x48, +0x50, +0x4d, +0x52, +0x1, +0xb, +0x0, +0xa, +0xa, +0x18, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0xd, +0xa, +0xa, +0x47, +0x1, +0x0, +0xa, +0x0, +0xa, +0x0, +0x18, +0x79, +0x0, +0x14, +0x13, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa0, +0x9, +0x93, +0x4d, +0x44, +0x4e, +0x52, +0x0, +0xa4, +0x0, +0xa4, +0xa, +0xb, +0x5b, +0x81, +0x1f, +0x48, +0x50, +0x4d, +0x52, +0x3, +0x4d, +0x52, +0x42, +0x4c, +0x20, +0x4d, +0x52, +0x42, +0x48, +0x20, +0x4d, +0x52, +0x4c, +0x4c, +0x20, +0x4d, +0x52, +0x4c, +0x48, +0x20, +0x4d, +0x50, +0x58, +0x5f, +0x20, +0x5b, +0x81, +0x13, +0x48, +0x50, +0x4d, +0x52, +0x1, +0x0, +0x40, +0xa, +0x4d, +0x45, +0x53, +0x5f, +0x1, +0x4d, +0x49, +0x4e, +0x53, +0x1, +0x5b, +0x1, +0x4d, +0x4c, +0x43, +0x4b, +0x0, +0x5b, +0x81, +0x15, +0x48, +0x50, +0x4d, +0x52, +0x3, +0x4d, +0x53, +0x45, +0x4c, +0x20, +0x4d, +0x4f, +0x45, +0x56, +0x20, +0x4d, +0x4f, +0x53, +0x43, +0x20, +0x14, +0x4a, +0x4, +0x4d, +0x53, +0x43, +0x4e, +0x0, +0xa0, +0x9, +0x93, +0x4d, +0x44, +0x4e, +0x52, +0x0, +0xa4, +0x0, +0x70, +0x0, +0x60, +0x5b, +0x23, +0x4d, +0x4c, +0x43, +0x4b, +0xff, +0xff, +0xa2, +0x25, +0x95, +0x60, +0x4d, +0x44, +0x4e, +0x52, +0x70, +0x60, +0x4d, +0x53, +0x45, +0x4c, +0xa0, +0x13, +0x93, +0x4d, +0x49, +0x4e, +0x53, +0x1, +0x4d, +0x54, +0x46, +0x59, +0x60, +0x1, +0x70, +0x1, +0x4d, +0x49, +0x4e, +0x53, +0x72, +0x60, +0x1, +0x60, +0x5b, +0x27, +0x4d, +0x4c, +0x43, +0x4b, +0xa4, +0x1, +0x14, +0x2d, +0x4d, +0x52, +0x53, +0x54, +0x1, +0x70, +0x0, +0x60, +0x5b, +0x23, +0x4d, +0x4c, +0x43, +0x4b, +0xff, +0xff, +0x70, +0x99, +0x68, +0x0, +0x4d, +0x53, +0x45, +0x4c, +0xa0, +0xb, +0x93, +0x4d, +0x45, +0x53, +0x5f, +0x1, +0x70, +0xa, +0xf, +0x60, +0x5b, +0x27, +0x4d, +0x4c, +0x43, +0x4b, +0xa4, +0x60, +0x14, +0x41, +0x18, +0x4d, +0x43, +0x52, +0x53, +0x9, +0x5b, +0x23, +0x4d, +0x4c, +0x43, +0x4b, +0xff, +0xff, +0x70, +0x99, +0x68, +0x0, +0x4d, +0x53, +0x45, +0x4c, +0x8, +0x4d, +0x52, +0x36, +0x34, +0x11, +0x33, +0xa, +0x30, +0x8a, +0x2b, +0x0, +0x0, +0xc, +0x3, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0xfe, +0xff, +0xff, +0xff, +0xff, +0xff, +0xff, +0xff, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0xff, +0xff, +0xff, +0xff, +0xff, +0xff, +0xff, +0xff, +0x79, +0x0, +0x8a, +0x4d, +0x52, +0x36, +0x34, +0xa, +0xe, +0x4d, +0x49, +0x4e, +0x4c, +0x8a, +0x4d, +0x52, +0x36, +0x34, +0xa, +0x12, +0x4d, +0x49, +0x4e, +0x48, +0x8a, +0x4d, +0x52, +0x36, +0x34, +0xa, +0x26, +0x4c, +0x45, +0x4e, +0x4c, +0x8a, +0x4d, +0x52, +0x36, +0x34, +0xa, +0x2a, +0x4c, +0x45, +0x4e, +0x48, +0x8a, +0x4d, +0x52, +0x36, +0x34, +0xa, +0x16, +0x4d, +0x41, +0x58, +0x4c, +0x8a, +0x4d, +0x52, +0x36, +0x34, +0xa, +0x1a, +0x4d, +0x41, +0x58, +0x48, +0x70, +0x4d, +0x52, +0x42, +0x48, +0x4d, +0x49, +0x4e, +0x48, +0x70, +0x4d, +0x52, +0x42, +0x4c, +0x4d, +0x49, +0x4e, +0x4c, +0x70, +0x4d, +0x52, +0x4c, +0x48, +0x4c, +0x45, +0x4e, +0x48, +0x70, +0x4d, +0x52, +0x4c, +0x4c, +0x4c, +0x45, +0x4e, +0x4c, +0x72, +0x4d, +0x49, +0x4e, +0x4c, +0x4c, +0x45, +0x4e, +0x4c, +0x4d, +0x41, +0x58, +0x4c, +0x72, +0x4d, +0x49, +0x4e, +0x48, +0x4c, +0x45, +0x4e, +0x48, +0x4d, +0x41, +0x58, +0x48, +0xa0, +0x14, +0x95, +0x4d, +0x41, +0x58, +0x4c, +0x4d, +0x49, +0x4e, +0x4c, +0x72, +0x4d, +0x41, +0x58, +0x48, +0x1, +0x4d, +0x41, +0x58, +0x48, +0xa0, +0x11, +0x95, +0x4d, +0x41, +0x58, +0x4c, +0x1, +0x74, +0x4d, +0x41, +0x58, +0x48, 0x1, +0x4d, +0x41, +0x58, +0x48, +0x74, +0x4d, +0x41, +0x58, +0x4c, +0x1, +0x4d, +0x41, +0x58, +0x4c, +0xa0, +0x44, +0x7, +0x93, +0x4d, +0x41, +0x58, +0x48, +0x0, +0x8, +0x4d, +0x52, +0x33, +0x32, +0x11, +0x1f, +0xa, +0x1c, +0x87, +0x17, 0x0, 0x0, -0x1, -0x2f, -0x42, +0xc, +0x3, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0xfe, +0xff, +0xff, +0xff, +0x0, +0x0, +0x0, +0x0, +0xff, +0xff, +0xff, +0xff, +0x79, +0x0, +0x8a, +0x4d, +0x52, +0x33, +0x32, +0xa, +0xa, +0x4d, +0x49, +0x4e, +0x5f, +0x8a, +0x4d, +0x52, +0x33, +0x32, +0xa, +0xe, +0x4d, +0x41, +0x58, +0x5f, +0x8a, +0x4d, +0x52, +0x33, +0x32, +0xa, +0x16, +0x4c, +0x45, +0x4e, +0x5f, +0x70, +0x4d, +0x49, +0x4e, +0x4c, +0x4d, +0x49, +0x4e, +0x5f, +0x70, +0x4d, +0x41, +0x58, +0x4c, +0x4d, +0x41, 0x58, +0x5f, +0x70, +0x4c, +0x45, +0x4e, +0x4c, +0x4c, +0x45, +0x4e, +0x5f, +0x5b, +0x27, +0x4d, +0x4c, +0x43, +0x4b, +0xa4, +0x4d, +0x52, +0x33, +0x32, +0x5b, +0x27, +0x4d, +0x4c, +0x43, +0x4b, +0xa4, +0x4d, +0x52, +0x36, +0x34, +0x14, +0x24, +0x4d, 0x50, +0x58, +0x4d, +0x1, +0x5b, +0x23, +0x4d, +0x4c, 0x43, +0x4b, +0xff, +0xff, +0x70, +0x99, +0x68, 0x0, -0x0, -0x42, -0x58, +0x4d, 0x53, +0x45, +0x4c, +0x70, +0x4d, +0x50, +0x58, +0x5f, +0x60, +0x5b, +0x27, +0x4d, +0x4c, +0x43, +0x4b, +0xa4, +0x60, +0x14, +0x28, +0x4d, +0x4f, 0x53, -0x44, 0x54, +0x4, +0x5b, +0x23, +0x4d, +0x4c, 0x43, -0x4f, -0x1, -0x0, -0x0, +0x4b, +0xff, +0xff, +0x70, +0x99, +0x68, 0x0, -0x49, -0x4e, -0x54, +0x4d, +0x53, +0x45, 0x4c, -0x13, -0x9, -0x12, -0x20, +0x70, +0x69, +0x4d, +0x4f, +0x45, +0x56, +0x70, +0x6a, +0x4d, +0x4f, +0x53, +0x43, +0x5b, +0x27, +0x4d, +0x4c, +0x43, +0x4b, 0x10, 0x4c, 0x5, @@ -385,15 +1880,18 @@ static unsigned char dsdt_common_aml[] = { 0x4d, 0x58 }; -static unsigned char acpi_pci64_start[] = { -0x4d +static unsigned short acpi_pci64_start[] = { +0x624 +}; +static unsigned short acpi_pci64_end[] = { +0x635 }; -static unsigned char acpi_pci64_end[] = { -0x5e +static unsigned short acpi_pci32_end[] = { +0x610 }; -static unsigned char acpi_pci32_end[] = { -0x39 +static unsigned short dsdt_applesmc_sta[] = { +0x126 }; -static unsigned char dsdt_mctrl_nr_slots[] = { -0x7d +static unsigned short dsdt_mctrl_nr_slots[] = { +0x654 }; diff --git a/hw/i386/acpi-dsdt-isa.dsl b/hw/i386/acpi-dsdt-isa.dsl index deb37de..a8851b0 100644 --- a/hw/i386/acpi-dsdt-isa.dsl +++ b/hw/i386/acpi-dsdt-isa.dsl @@ -19,7 +19,7 @@ Scope(\_SB.PCI0.ISA) { Device (SMC) { Name(_HID, EisaId("APP0001")) /* _STA will be patched to 0x0B if AppleSMC is present */ - ACPI_EXTRACT_NAME_BYTE_CONST DSDT_APPLESMC_STA + ACPI_EXTRACT_NAME_BYTE_CONST dsdt_applesmc_sta Name(_STA, 0xF0) Name(_CRS, ResourceTemplate () { IO (Decode16, 0x0300, 0x0300, 0x01, 0x20) @@ -58,6 +58,7 @@ Scope(\_SB.PCI0.ISA) { }) } + External(FDEN) Device(FDC0) { Name(_HID, EisaId("PNP0700")) Method(_STA, 0, NotSerialized) { @@ -76,6 +77,7 @@ Scope(\_SB.PCI0.ISA) { }) } + External(LPEN) Device(LPT) { Name(_HID, EisaId("PNP0400")) Method(_STA, 0, NotSerialized) { @@ -92,6 +94,7 @@ Scope(\_SB.PCI0.ISA) { }) } + External(CAEN) Device(COM1) { Name(_HID, EisaId("PNP0501")) Name(_UID, 0x01) @@ -109,6 +112,7 @@ Scope(\_SB.PCI0.ISA) { }) } + External(CBEN) Device(COM2) { Name(_HID, EisaId("PNP0501")) Name(_UID, 0x02) diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl index e50efeb..71d1e3f 100644 --- a/hw/i386/acpi-dsdt.dsl +++ b/hw/i386/acpi-dsdt.dsl @@ -29,9 +29,6 @@ DefinitionBlock ( ) { -#include "acpi-dsdt-dbug.dsl" - - /**************************************************************** * PCI Bus definition ****************************************************************/ @@ -86,7 +83,6 @@ DefinitionBlock ( } #include "acpi-dsdt-pci-crs.dsl" -#include "acpi-dsdt-hpet.dsl" /**************************************************************** @@ -130,9 +126,6 @@ DefinitionBlock ( } } -#define DSDT_APPLESMC_STA piix_dsdt_applesmc_sta -#include "acpi-dsdt-isa.dsl" - /**************************************************************** * PCI hotplug @@ -297,7 +290,6 @@ DefinitionBlock ( #include "hw/acpi/pc-hotplug.h" #define CPU_STATUS_BASE PIIX4_CPU_HOTPLUG_IO_BASE #include "acpi-dsdt-cpu-hotplug.dsl" -#include "acpi-dsdt-mem-hotplug.dsl" /**************************************************************** @@ -318,6 +310,8 @@ DefinitionBlock ( // CPU hotplug event \_SB.PRSC() } + External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE, DeviceObj) + External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD, MethodObj) Method(_E03) { // Memory hotplug event \_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD() diff --git a/hw/i386/acpi-dsdt.hex.generated b/hw/i386/acpi-dsdt.hex.generated index 875570e..5c3500a 100644 --- a/hw/i386/acpi-dsdt.hex.generated +++ b/hw/i386/acpi-dsdt.hex.generated @@ -3,12 +3,12 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x53, 0x44, 0x54, +0x34, 0x8, -0xe, 0x0, 0x0, 0x1, -0xfc, +0x26, 0x42, 0x58, 0x50, @@ -31,85 +31,11 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x4e, 0x54, 0x4c, -0x28, -0x8, -0x14, +0x13, +0x9, +0x12, 0x20, 0x10, -0x49, -0x4, -0x5c, -0x0, -0x5b, -0x80, -0x44, -0x42, -0x47, -0x5f, -0x1, -0xb, -0x2, -0x4, -0x1, -0x5b, -0x81, -0xb, -0x44, -0x42, -0x47, -0x5f, -0x1, -0x44, -0x42, -0x47, -0x42, -0x8, -0x14, -0x2c, -0x44, -0x42, -0x55, -0x47, -0x1, -0x98, -0x68, -0x60, -0x96, -0x60, -0x60, -0x74, -0x87, -0x60, -0x1, -0x61, -0x70, -0x0, -0x62, -0xa2, -0x10, -0x95, -0x62, -0x61, -0x70, -0x83, -0x88, -0x60, -0x62, -0x0, -0x44, -0x42, -0x47, -0x42, -0x75, -0x62, -0x70, -0xa, -0xa, -0x44, -0x42, -0x47, -0x42, -0x10, 0x22, 0x5f, 0x53, @@ -544,148 +470,6 @@ static unsigned char AcpiDsdtAmlCode[] = { 0xa4, 0x60, 0x10, -0x4d, -0x8, -0x5f, -0x53, -0x42, -0x5f, -0x5b, -0x82, -0x45, -0x8, -0x48, -0x50, -0x45, -0x54, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x1, -0x3, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x0, -0x5b, -0x80, -0x48, -0x50, -0x54, -0x4d, -0x0, -0xc, -0x0, -0x0, -0xd0, -0xfe, -0xb, -0x0, -0x4, -0x5b, -0x81, -0x10, -0x48, -0x50, -0x54, -0x4d, -0x13, -0x56, -0x45, -0x4e, -0x44, -0x20, -0x50, -0x52, -0x44, -0x5f, -0x20, -0x14, -0x36, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x56, -0x45, -0x4e, -0x44, -0x60, -0x70, -0x50, -0x52, -0x44, -0x5f, -0x61, -0x7a, -0x60, -0xa, -0x10, -0x60, -0xa0, -0xc, -0x91, -0x93, -0x60, -0x0, -0x93, -0x60, -0xb, -0xff, -0xff, -0xa4, -0x0, -0xa0, -0xe, -0x91, -0x93, -0x61, -0x0, -0x94, -0x61, -0xc, -0x0, -0xe1, -0xf5, -0x5, -0xa4, -0x0, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x11, -0xa, -0xe, -0x86, -0x9, -0x0, -0x0, -0x0, -0x0, -0xd0, -0xfe, -0x0, -0x4, -0x0, -0x0, -0x79, -0x0, -0x10, 0x25, 0x2e, 0x5f, @@ -811,10 +595,9 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x4e, 0x1, 0x10, -0x4a, -0x1e, -0x2f, -0x3, +0x48, +0x8, +0x2e, 0x5f, 0x53, 0x42, @@ -823,420 +606,431 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x43, 0x49, 0x30, -0x49, -0x53, -0x41, -0x5f, 0x5b, -0x82, -0x2c, -0x53, -0x4d, +0x80, +0x50, 0x43, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x6, -0x10, -0x0, -0x1, -0x8, -0x5f, 0x53, 0x54, -0x41, +0x1, +0xb, +0x0, +0xae, 0xa, -0xf0, 0x8, -0x5f, +0x5b, +0x81, +0x10, +0x50, 0x43, -0x52, 0x53, -0x11, -0x10, -0xa, -0xd, -0x47, -0x1, -0x0, -0x3, -0x0, -0x3, -0x1, -0x20, -0x22, -0x40, -0x0, -0x79, -0x0, -0x5b, -0x82, -0x2d, -0x52, 0x54, 0x43, -0x5f, -0x8, -0x5f, -0x48, +0x50, +0x43, +0x49, +0x55, +0x20, +0x50, +0x43, 0x49, 0x44, -0xc, -0x41, -0xd0, +0x20, +0x5b, +0x80, +0x53, +0x45, +0x4a, +0x5f, +0x1, 0xb, -0x0, 0x8, +0xae, +0xa, +0x4, +0x5b, +0x81, +0xb, +0x53, +0x45, +0x4a, 0x5f, 0x43, +0x42, +0x30, +0x45, +0x4a, +0x20, +0x5b, +0x80, +0x42, +0x4e, +0x4d, 0x52, -0x53, -0x11, -0x18, -0xa, -0x15, -0x47, 0x1, -0x70, -0x0, -0x70, -0x0, +0xb, 0x10, -0x2, -0x22, -0x0, -0x1, -0x47, +0xae, +0xa, +0x4, +0x5b, +0x81, +0xb, +0x42, +0x4e, +0x4d, +0x52, +0x43, +0x42, +0x4e, +0x55, +0x4d, +0x20, +0x5b, 0x1, -0x72, -0x0, -0x72, +0x42, +0x4c, +0x43, +0x4b, 0x0, +0x14, +0x25, +0x50, +0x43, +0x45, +0x4a, 0x2, -0x6, +0x5b, +0x23, +0x42, +0x4c, +0x43, +0x4b, +0xff, +0xff, +0x70, +0x68, +0x42, +0x4e, +0x55, +0x4d, +0x70, 0x79, +0x1, +0x69, 0x0, +0x42, +0x30, +0x45, +0x4a, 0x5b, -0x82, -0x37, -0x4b, +0x27, 0x42, -0x44, +0x4c, +0x43, +0x4b, +0xa4, +0x0, +0x10, +0x4e, +0x36, 0x5f, -0x8, +0x53, +0x42, 0x5f, -0x48, +0x10, +0x4b, +0xa, +0x50, +0x43, 0x49, -0x44, -0xc, -0x41, -0xd0, -0x3, -0x3, +0x30, 0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, +0x44, 0xa, -0xf, -0x8, 0x5f, -0x43, +0x50, 0x52, -0x53, -0x11, -0x18, -0xa, -0x15, -0x47, -0x1, -0x60, +0x54, 0x0, +0x70, +0x12, +0x2, +0x80, 0x60, +0x70, 0x0, -0x1, -0x1, -0x47, -0x1, -0x64, -0x0, -0x64, -0x0, -0x1, -0x1, -0x22, +0x61, +0xa2, +0x42, +0x9, +0x95, +0x61, +0xa, +0x80, +0x70, +0x7a, +0x61, +0xa, 0x2, 0x0, -0x79, -0x0, -0x5b, -0x82, -0x27, -0x4d, -0x4f, -0x55, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xf, -0x13, -0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, +0x62, +0x70, +0x7b, +0x72, +0x61, +0x62, 0x0, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x8, 0xa, -0x5, -0x22, +0x3, 0x0, +0x63, +0xa0, 0x10, -0x79, +0x93, +0x63, 0x0, -0x5b, -0x82, -0x4a, +0x70, +0x12, +0x9, 0x4, -0x46, -0x44, -0x43, -0x30, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x7, 0x0, -0x14, -0x18, -0x5f, -0x53, -0x54, -0x41, 0x0, -0x70, -0x46, -0x44, -0x45, +0x4c, 0x4e, -0x60, +0x4b, +0x44, +0x0, +0x64, 0xa0, -0x6, +0x24, 0x93, -0x60, -0x0, -0xa4, -0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, +0x63, +0x1, +0xa0, 0x11, -0x1b, +0x93, +0x61, 0xa, -0x18, -0x47, -0x1, -0xf2, -0x3, -0xf2, -0x3, -0x0, 0x4, -0x47, -0x1, -0xf7, -0x3, -0xf7, -0x3, +0x70, +0x12, +0x9, +0x4, 0x0, -0x1, -0x22, -0x40, 0x0, -0x2a, +0x4c, +0x4e, +0x4b, +0x53, +0x0, +0x64, +0xa1, +0xd, +0x70, +0x12, +0x9, 0x4, 0x0, -0x79, 0x0, -0x5b, -0x82, -0x3e, 0x4c, -0x50, -0x54, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, +0x4e, +0x4b, 0x41, -0xd0, +0x0, +0x64, +0xa0, +0x11, +0x93, +0x63, +0xa, +0x2, +0x70, +0x12, +0x9, 0x4, 0x0, -0x14, -0x18, -0x5f, -0x53, -0x54, -0x41, 0x0, -0x70, 0x4c, -0x50, -0x45, 0x4e, -0x60, +0x4b, +0x42, +0x0, +0x64, 0xa0, -0x6, +0x11, 0x93, -0x60, +0x63, +0xa, +0x3, +0x70, +0x12, +0x9, +0x4, 0x0, -0xa4, 0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, -0x8, -0x5f, +0x4c, +0x4e, +0x4b, 0x43, -0x52, -0x53, -0x11, +0x0, +0x64, +0x70, +0x7d, +0x79, +0x62, +0xa, 0x10, +0x0, +0xb, +0xff, +0xff, +0x0, +0x88, +0x64, +0x0, +0x0, +0x70, +0x7b, +0x61, 0xa, -0xd, -0x47, -0x1, -0x78, 0x3, -0x78, -0x3, -0x8, -0x8, -0x22, -0x80, 0x0, -0x79, +0x88, +0x64, +0x1, +0x0, +0x70, +0x64, +0x88, +0x60, +0x61, 0x0, +0x75, +0x61, +0xa4, +0x60, 0x5b, -0x82, -0x45, -0x4, +0x81, +0x24, +0x2f, +0x3, +0x50, 0x43, -0x4f, -0x4d, -0x31, -0x8, -0x5f, -0x48, 0x49, -0x44, -0xc, +0x30, +0x49, +0x53, 0x41, -0xd0, -0x5, -0x1, -0x8, 0x5f, -0x55, -0x49, -0x44, +0x50, +0x34, +0x30, +0x43, 0x1, +0x50, +0x52, +0x51, +0x30, +0x8, +0x50, +0x52, +0x51, +0x31, +0x8, +0x50, +0x52, +0x51, +0x32, +0x8, +0x50, +0x52, +0x51, +0x33, +0x8, 0x14, -0x18, -0x5f, +0x13, +0x49, +0x51, 0x53, 0x54, -0x41, -0x0, -0x70, -0x43, -0x41, -0x45, -0x4e, -0x60, +0x1, 0xa0, -0x6, -0x93, -0x60, +0x9, +0x7b, +0xa, +0x80, +0x68, 0x0, 0xa4, -0x0, -0xa1, -0x4, +0xa, +0x9, 0xa4, 0xa, -0xf, -0x8, -0x5f, +0xb, +0x14, +0x36, +0x49, +0x51, 0x43, 0x52, -0x53, +0x9, +0x8, +0x50, +0x52, +0x52, +0x30, 0x11, -0x10, +0xe, 0xa, -0xd, -0x47, +0xb, +0x89, +0x6, +0x0, +0x9, 0x1, -0xf8, -0x3, -0xf8, -0x3, 0x0, -0x8, -0x22, -0x10, +0x0, +0x0, 0x0, 0x79, 0x0, +0x8a, +0x50, +0x52, +0x52, +0x30, +0xa, +0x5, +0x50, +0x52, +0x52, +0x49, +0xa0, +0xb, +0x95, +0x68, +0xa, +0x80, +0x70, +0x68, +0x50, +0x52, +0x52, +0x49, +0xa4, +0x50, +0x52, +0x52, +0x30, 0x5b, 0x82, -0x46, -0x4, -0x43, -0x4f, -0x4d, -0x32, +0x4c, +0x7, +0x4c, +0x4e, +0x4b, +0x41, 0x8, 0x5f, 0x48, @@ -1245,499 +1039,377 @@ static unsigned char AcpiDsdtAmlCode[] = { 0xc, 0x41, 0xd0, -0x5, -0x1, +0xc, +0xf, 0x8, 0x5f, 0x55, 0x49, 0x44, -0xa, -0x2, -0x14, -0x18, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x43, -0x42, -0x45, -0x4e, -0x60, -0xa0, -0x6, -0x93, -0x60, 0x0, -0xa4, -0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, 0x8, 0x5f, -0x43, +0x50, 0x52, 0x53, 0x11, -0x10, +0x16, 0xa, -0xd, -0x47, -0x1, -0xf8, -0x2, -0xf8, -0x2, +0x13, +0x89, +0xe, +0x0, +0x9, +0x3, +0x5, +0x0, +0x0, +0x0, +0xa, +0x0, +0x0, +0x0, +0xb, +0x0, 0x0, -0x8, -0x22, -0x8, 0x0, 0x79, 0x0, -0x10, -0x48, -0x8, -0x2e, +0x14, +0xf, 0x5f, 0x53, -0x42, -0x5f, +0x54, +0x41, +0x0, +0xa4, +0x49, +0x51, +0x53, +0x54, 0x50, -0x43, +0x52, +0x51, +0x30, +0x14, +0x11, +0x5f, +0x44, 0x49, +0x53, +0x0, +0x7d, +0x50, +0x52, +0x51, 0x30, -0x5b, +0xa, 0x80, 0x50, +0x52, +0x51, +0x30, +0x14, +0xf, +0x5f, 0x43, +0x52, 0x53, -0x54, -0x1, -0xb, 0x0, -0xae, -0xa, -0x8, -0x5b, -0x81, -0x10, -0x50, +0xa4, +0x49, +0x51, 0x43, +0x52, +0x50, +0x52, +0x51, +0x30, +0x14, +0x17, +0x5f, 0x53, -0x54, -0x43, +0x52, +0x53, +0x1, +0x8a, +0x68, +0xa, +0x5, 0x50, -0x43, +0x52, +0x52, 0x49, -0x55, -0x20, +0x70, 0x50, -0x43, +0x52, +0x52, 0x49, -0x44, -0x20, +0x50, +0x52, +0x51, +0x30, 0x5b, -0x80, -0x53, -0x45, -0x4a, +0x82, +0x4c, +0x7, +0x4c, +0x4e, +0x4b, +0x42, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0xc, +0xf, +0x8, 0x5f, +0x55, +0x49, +0x44, 0x1, -0xb, 0x8, -0xae, +0x5f, +0x50, +0x52, +0x53, +0x11, +0x16, 0xa, -0x4, -0x5b, -0x81, +0x13, +0x89, +0xe, +0x0, +0x9, +0x3, +0x5, +0x0, +0x0, +0x0, +0xa, +0x0, +0x0, +0x0, 0xb, +0x0, +0x0, +0x0, +0x79, +0x0, +0x14, +0xf, +0x5f, 0x53, -0x45, -0x4a, +0x54, +0x41, +0x0, +0xa4, +0x49, +0x51, +0x53, +0x54, +0x50, +0x52, +0x51, +0x31, +0x14, +0x11, 0x5f, -0x43, -0x42, -0x30, -0x45, -0x4a, -0x20, -0x5b, -0x80, -0x42, -0x4e, -0x4d, +0x44, +0x49, +0x53, +0x0, +0x7d, +0x50, 0x52, -0x1, -0xb, -0x10, -0xae, +0x51, +0x31, 0xa, -0x4, -0x5b, -0x81, -0xb, -0x42, -0x4e, -0x4d, +0x80, +0x50, 0x52, -0x43, -0x42, -0x4e, -0x55, -0x4d, -0x20, -0x5b, -0x1, -0x42, -0x4c, -0x43, -0x4b, -0x0, +0x51, +0x31, 0x14, -0x25, -0x50, +0xf, +0x5f, 0x43, -0x45, -0x4a, -0x2, -0x5b, -0x23, -0x42, -0x4c, +0x52, +0x53, +0x0, +0xa4, +0x49, +0x51, 0x43, -0x4b, -0xff, -0xff, -0x70, +0x52, +0x50, +0x52, +0x51, +0x31, +0x14, +0x17, +0x5f, +0x53, +0x52, +0x53, +0x1, +0x8a, 0x68, -0x42, -0x4e, -0x55, -0x4d, +0xa, +0x5, +0x50, +0x52, +0x52, +0x49, 0x70, -0x79, -0x1, -0x69, -0x0, -0x42, -0x30, -0x45, -0x4a, +0x50, +0x52, +0x52, +0x49, +0x50, +0x52, +0x51, +0x31, 0x5b, -0x27, -0x42, +0x82, +0x4d, +0x7, 0x4c, -0x43, -0x4b, -0xa4, -0x0, -0x10, 0x4e, -0x36, -0x5f, -0x53, -0x42, -0x5f, -0x10, 0x4b, -0xa, -0x50, 0x43, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0xc, +0xf, +0x8, +0x5f, +0x55, 0x49, -0x30, -0x14, 0x44, 0xa, +0x2, +0x8, 0x5f, 0x50, 0x52, -0x54, -0x0, -0x70, -0x12, -0x2, -0x80, -0x60, -0x70, +0x53, +0x11, +0x16, +0xa, +0x13, +0x89, +0xe, 0x0, -0x61, -0xa2, -0x42, 0x9, -0x95, -0x61, -0xa, -0x80, -0x70, -0x7a, -0x61, -0xa, -0x2, +0x3, +0x5, +0x0, 0x0, -0x62, -0x70, -0x7b, -0x72, -0x61, -0x62, 0x0, 0xa, -0x3, 0x0, -0x63, -0xa0, -0x10, -0x93, -0x63, 0x0, -0x70, -0x12, -0x9, -0x4, 0x0, +0xb, 0x0, -0x4c, -0x4e, -0x4b, -0x44, 0x0, -0x64, -0xa0, -0x24, -0x93, -0x63, -0x1, -0xa0, -0x11, -0x93, -0x61, -0xa, -0x4, -0x70, -0x12, -0x9, -0x4, 0x0, +0x79, 0x0, -0x4c, -0x4e, -0x4b, +0x14, +0xf, +0x5f, 0x53, -0x0, -0x64, -0xa1, -0xd, -0x70, -0x12, -0x9, -0x4, -0x0, -0x0, -0x4c, -0x4e, -0x4b, +0x54, 0x41, 0x0, -0x64, -0xa0, -0x11, -0x93, -0x63, -0xa, -0x2, -0x70, -0x12, -0x9, -0x4, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x64, -0xa0, -0x11, -0x93, -0x63, -0xa, -0x3, -0x70, -0x12, -0x9, -0x4, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x64, -0x70, -0x7d, -0x79, -0x62, -0xa, -0x10, -0x0, -0xb, -0xff, -0xff, -0x0, -0x88, -0x64, -0x0, -0x0, -0x70, -0x7b, -0x61, -0xa, -0x3, -0x0, -0x88, -0x64, -0x1, -0x0, -0x70, -0x64, -0x88, -0x60, -0x61, -0x0, -0x75, -0x61, 0xa4, -0x60, -0x5b, -0x81, -0x24, -0x2f, -0x3, -0x50, -0x43, -0x49, -0x30, 0x49, -0x53, -0x41, -0x5f, -0x50, -0x34, -0x30, -0x43, -0x1, -0x50, -0x52, 0x51, -0x30, -0x8, +0x53, +0x54, 0x50, 0x52, 0x51, -0x31, -0x8, +0x32, +0x14, +0x11, +0x5f, +0x44, +0x49, +0x53, +0x0, +0x7d, 0x50, 0x52, 0x51, 0x32, -0x8, +0xa, +0x80, 0x50, 0x52, 0x51, -0x33, -0x8, +0x32, 0x14, -0x13, -0x49, -0x51, +0xf, +0x5f, +0x43, +0x52, 0x53, -0x54, -0x1, -0xa0, -0x9, -0x7b, -0xa, -0x80, -0x68, 0x0, 0xa4, -0xa, -0x9, -0xa4, -0xa, -0xb, -0x14, -0x36, 0x49, 0x51, 0x43, 0x52, -0x9, -0x8, 0x50, 0x52, +0x51, +0x32, +0x14, +0x17, +0x5f, +0x53, 0x52, -0x30, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, +0x53, 0x1, -0x0, -0x0, -0x0, -0x0, -0x79, -0x0, 0x8a, -0x50, -0x52, -0x52, -0x30, +0x68, 0xa, 0x5, 0x50, 0x52, 0x52, 0x49, -0xa0, -0xb, -0x95, -0x68, -0xa, -0x80, 0x70, -0x68, 0x50, 0x52, 0x52, 0x49, -0xa4, 0x50, 0x52, -0x52, -0x30, +0x51, +0x32, 0x5b, 0x82, -0x4c, +0x4d, 0x7, 0x4c, 0x4e, 0x4b, -0x41, +0x44, 0x8, 0x5f, 0x48, @@ -1753,7 +1425,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x55, 0x49, 0x44, -0x0, +0xa, +0x3, 0x8, 0x5f, 0x50, @@ -1797,7 +1470,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x50, 0x52, 0x51, -0x30, +0x33, 0x14, 0x11, 0x5f, @@ -1809,13 +1482,13 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x50, 0x52, 0x51, -0x30, +0x33, 0xa, 0x80, 0x50, 0x52, 0x51, -0x30, +0x33, 0x14, 0xf, 0x5f, @@ -1831,7 +1504,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x50, 0x52, 0x51, -0x30, +0x33, 0x14, 0x17, 0x5f, @@ -1855,15 +1528,15 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x50, 0x52, 0x51, -0x30, +0x33, 0x5b, 0x82, -0x4c, -0x7, +0x4f, +0x4, 0x4c, 0x4e, 0x4b, -0x42, +0x53, 0x8, 0x5f, 0x48, @@ -1879,458 +1552,219 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x55, 0x49, 0x44, -0x1, +0xa, +0x4, 0x8, 0x5f, 0x50, 0x52, 0x53, 0x11, -0x16, +0xe, 0xa, -0x13, +0xb, 0x89, -0xe, +0x6, 0x0, 0x9, -0x3, -0x5, -0x0, -0x0, -0x0, -0xa, -0x0, -0x0, -0x0, -0xb, +0x1, +0x9, 0x0, 0x0, 0x0, 0x79, 0x0, 0x14, -0xf, +0x9, 0x5f, 0x53, 0x54, 0x41, 0x0, 0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x31, +0xa, +0xb, 0x14, -0x11, +0x6, 0x5f, 0x44, 0x49, 0x53, 0x0, -0x7d, -0x50, -0x52, -0x51, -0x31, -0xa, -0x80, -0x50, -0x52, -0x51, -0x31, 0x14, -0xf, +0xb, 0x5f, 0x43, 0x52, 0x53, 0x0, 0xa4, -0x49, -0x51, -0x43, -0x52, +0x5f, 0x50, 0x52, -0x51, -0x31, +0x53, 0x14, -0x17, +0x6, 0x5f, 0x53, 0x52, 0x53, 0x1, -0x8a, -0x68, -0xa, -0x5, -0x50, -0x52, -0x52, -0x49, -0x70, -0x50, -0x52, -0x52, -0x49, +0x10, +0x42, +0x11, +0x5f, +0x53, +0x42, +0x5f, +0x14, +0x35, +0x43, 0x50, -0x52, -0x51, -0x31, -0x5b, -0x82, 0x4d, -0x7, -0x4c, -0x4e, -0x4b, -0x43, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, 0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x2, -0x8, -0x5f, +0x1, +0x70, +0x83, +0x88, +0x43, 0x50, -0x52, -0x53, +0x4f, +0x4e, +0x68, +0x0, +0x60, +0x70, 0x11, -0x16, +0xb, 0xa, -0x13, -0x89, -0xe, -0x0, -0x9, -0x3, -0x5, +0x8, 0x0, +0x8, 0x0, 0x0, -0xa, 0x0, 0x0, 0x0, -0xb, 0x0, +0x61, +0x70, +0x68, +0x88, +0x61, +0xa, +0x2, 0x0, +0x70, +0x68, +0x88, +0x61, +0xa, +0x3, 0x0, -0x79, +0x70, +0x60, +0x88, +0x61, +0xa, +0x4, 0x0, +0xa4, +0x61, 0x14, -0xf, -0x5f, +0x1a, +0x43, +0x50, 0x53, 0x54, -0x41, +0x1, +0x70, +0x83, +0x88, +0x43, +0x50, +0x4f, +0x4e, +0x68, 0x0, +0x60, +0xa0, +0x5, +0x60, +0xa4, +0xa, +0xf, +0xa1, +0x3, 0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x32, -0x14, -0x11, -0x5f, -0x44, -0x49, -0x53, 0x0, -0x7d, +0x14, +0xa, +0x43, 0x50, -0x52, -0x51, -0x32, +0x45, +0x4a, +0x2, +0x5b, +0x22, 0xa, +0xc8, +0x5b, 0x80, 0x50, 0x52, -0x51, -0x32, -0x14, -0xf, -0x5f, -0x43, -0x52, 0x53, +0x54, +0x1, +0xb, 0x0, -0xa4, -0x49, -0x51, -0x43, -0x52, +0xaf, +0xa, +0x20, +0x5b, +0x81, +0xc, 0x50, 0x52, -0x51, -0x32, -0x14, -0x17, -0x5f, -0x53, -0x52, 0x53, +0x54, 0x1, -0x8a, -0x68, -0xa, -0x5, 0x50, 0x52, +0x53, +0x5f, +0x40, +0x10, +0x14, +0x4a, +0x6, +0x50, 0x52, -0x49, +0x53, +0x43, +0x0, 0x70, 0x50, 0x52, -0x52, -0x49, +0x53, +0x5f, +0x65, +0x70, +0x0, +0x62, +0x70, +0x0, +0x60, +0xa2, +0x46, +0x5, +0x95, +0x60, +0x87, +0x43, 0x50, -0x52, -0x51, -0x32, -0x5b, -0x82, -0x4d, -0x7, -0x4c, +0x4f, 0x4e, -0x4b, -0x44, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x3, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0x16, -0xa, -0x13, -0x89, -0xe, -0x0, -0x9, -0x3, -0x5, -0x0, -0x0, -0x0, -0xa, -0x0, -0x0, -0x0, -0xb, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0xf, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x33, -0x14, -0x11, -0x5f, -0x44, -0x49, -0x53, -0x0, -0x7d, -0x50, -0x52, -0x51, -0x33, -0xa, -0x80, -0x50, -0x52, -0x51, -0x33, -0x14, -0xf, -0x5f, -0x43, -0x52, -0x53, -0x0, -0xa4, -0x49, -0x51, -0x43, -0x52, -0x50, -0x52, -0x51, -0x33, -0x14, -0x17, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x8a, -0x68, -0xa, -0x5, -0x50, -0x52, -0x52, -0x49, -0x70, -0x50, -0x52, -0x52, -0x49, -0x50, -0x52, -0x51, -0x33, -0x5b, -0x82, -0x4f, -0x4, -0x4c, -0x4e, -0x4b, -0x53, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x4, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, -0x1, -0x9, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0xa, -0xb, -0x14, -0x6, -0x5f, -0x44, -0x49, -0x53, -0x0, -0x14, -0xb, -0x5f, -0x43, -0x52, -0x53, -0x0, -0xa4, -0x5f, -0x50, -0x52, -0x53, -0x14, -0x6, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x10, -0x42, -0x11, -0x5f, -0x53, -0x42, -0x5f, -0x14, -0x35, -0x43, -0x50, -0x4d, -0x41, -0x1, 0x70, 0x83, 0x88, @@ -2338,1045 +1772,119 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x50, 0x4f, 0x4e, -0x68, -0x0, -0x60, -0x70, -0x11, -0xb, -0xa, -0x8, -0x0, -0x8, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x61, -0x70, -0x68, -0x88, -0x61, -0xa, -0x2, -0x0, -0x70, -0x68, -0x88, -0x61, -0xa, -0x3, -0x0, -0x70, 0x60, -0x88, -0x61, -0xa, -0x4, -0x0, -0xa4, -0x61, -0x14, -0x1a, -0x43, -0x50, -0x53, -0x54, -0x1, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x68, -0x0, -0x60, -0xa0, -0x5, -0x60, -0xa4, -0xa, -0xf, -0xa1, -0x3, -0xa4, -0x0, -0x14, -0xa, -0x43, -0x50, -0x45, -0x4a, -0x2, -0x5b, -0x22, -0xa, -0xc8, -0x5b, -0x80, -0x50, -0x52, -0x53, -0x54, -0x1, -0xb, -0x0, -0xaf, -0xa, -0x20, -0x5b, -0x81, -0xc, -0x50, -0x52, -0x53, -0x54, -0x1, -0x50, -0x52, -0x53, -0x5f, -0x40, -0x10, -0x14, -0x4a, -0x6, -0x50, -0x52, -0x53, -0x43, -0x0, -0x70, -0x50, -0x52, -0x53, -0x5f, -0x65, -0x70, -0x0, -0x62, -0x70, -0x0, -0x60, -0xa2, -0x46, -0x5, -0x95, -0x60, -0x87, -0x43, -0x50, -0x4f, -0x4e, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x60, -0x0, -0x61, -0xa0, -0xa, -0x7b, -0x60, -0xa, -0x7, -0x0, -0x7a, -0x62, -0x1, -0x62, -0xa1, -0xc, -0x70, -0x83, -0x88, -0x65, -0x7a, -0x60, -0xa, -0x3, -0x0, -0x0, -0x62, -0x70, -0x7b, -0x62, -0x1, -0x0, -0x63, -0xa0, -0x22, -0x92, -0x93, -0x61, -0x63, -0x70, -0x63, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x60, -0x0, -0xa0, -0xa, -0x93, -0x63, -0x1, -0x4e, -0x54, -0x46, -0x59, -0x60, -0x1, -0xa1, -0x8, -0x4e, -0x54, -0x46, -0x59, -0x60, -0xa, -0x3, -0x75, -0x60, -0x5b, -0x82, -0x29, -0x50, -0x52, -0x45, -0x53, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xa, -0x6, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0xd, -0xa, -0xa, -0x47, -0x1, -0x0, -0xaf, -0x0, -0xaf, -0x0, -0x20, -0x79, -0x0, -0x8, -0x5f, -0x53, -0x54, -0x41, -0xa, -0xb, -0x10, -0x40, -0x31, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x5b, -0x82, -0x43, -0x30, -0x4d, -0x48, -0x50, -0x44, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xd, -0x50, -0x4e, -0x50, -0x30, -0x41, -0x30, -0x36, -0x0, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xd, -0x4d, -0x65, -0x6d, -0x6f, -0x72, -0x79, -0x20, -0x68, -0x6f, -0x74, -0x70, -0x6c, -0x75, -0x67, -0x20, -0x72, -0x65, -0x73, -0x6f, -0x75, -0x72, -0x63, -0x65, -0x73, -0x0, -0x5b, -0x80, -0x48, -0x50, -0x4d, -0x52, -0x1, -0xb, -0x0, -0xa, -0xa, -0x18, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0xd, -0xa, -0xa, -0x47, -0x1, -0x0, -0xa, -0x0, -0xa, -0x0, -0x18, -0x79, -0x0, -0x14, -0x13, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa0, -0x9, -0x93, -0x4d, -0x44, -0x4e, -0x52, -0x0, -0xa4, -0x0, -0xa4, -0xa, -0xb, -0x5b, -0x81, -0x1f, -0x48, -0x50, -0x4d, -0x52, -0x3, -0x4d, -0x52, -0x42, -0x4c, -0x20, -0x4d, -0x52, -0x42, -0x48, -0x20, -0x4d, -0x52, -0x4c, -0x4c, -0x20, -0x4d, -0x52, -0x4c, -0x48, -0x20, -0x4d, -0x50, -0x58, -0x5f, -0x20, -0x5b, -0x81, -0x13, -0x48, -0x50, -0x4d, -0x52, -0x1, -0x0, -0x40, -0xa, -0x4d, -0x45, -0x53, -0x5f, -0x1, -0x4d, -0x49, -0x4e, -0x53, -0x1, -0x5b, -0x1, -0x4d, -0x4c, -0x43, -0x4b, -0x0, -0x5b, -0x81, -0x15, -0x48, -0x50, -0x4d, -0x52, -0x3, -0x4d, -0x53, -0x45, -0x4c, -0x20, -0x4d, -0x4f, -0x45, -0x56, -0x20, -0x4d, -0x4f, -0x53, -0x43, -0x20, -0x14, -0x4a, -0x4, -0x4d, -0x53, -0x43, -0x4e, -0x0, -0xa0, -0x9, -0x93, -0x4d, -0x44, -0x4e, -0x52, -0x0, -0xa4, -0x0, -0x70, -0x0, -0x60, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0xa2, -0x25, -0x95, -0x60, -0x4d, -0x44, -0x4e, -0x52, -0x70, -0x60, -0x4d, -0x53, -0x45, -0x4c, -0xa0, -0x13, -0x93, -0x4d, -0x49, -0x4e, -0x53, -0x1, -0x4d, -0x54, -0x46, -0x59, -0x60, -0x1, -0x70, -0x1, -0x4d, -0x49, -0x4e, -0x53, -0x72, -0x60, -0x1, -0x60, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x1, -0x14, -0x2d, -0x4d, -0x52, -0x53, -0x54, -0x1, -0x70, -0x0, -0x60, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0x70, -0x99, -0x68, -0x0, -0x4d, -0x53, -0x45, -0x4c, -0xa0, -0xb, -0x93, -0x4d, -0x45, -0x53, -0x5f, -0x1, -0x70, -0xa, -0xf, -0x60, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x60, -0x14, -0x41, -0x18, -0x4d, -0x43, -0x52, -0x53, -0x9, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0x70, -0x99, -0x68, -0x0, -0x4d, -0x53, -0x45, -0x4c, -0x8, -0x4d, -0x52, -0x36, -0x34, -0x11, -0x33, -0xa, -0x30, -0x8a, -0x2b, -0x0, -0x0, -0xc, -0x3, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xfe, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0x79, -0x0, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0xe, -0x4d, -0x49, -0x4e, -0x4c, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x12, -0x4d, -0x49, -0x4e, -0x48, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x26, -0x4c, -0x45, -0x4e, -0x4c, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x2a, -0x4c, -0x45, -0x4e, -0x48, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x16, -0x4d, -0x41, -0x58, -0x4c, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x1a, -0x4d, -0x41, -0x58, -0x48, -0x70, -0x4d, -0x52, -0x42, -0x48, -0x4d, -0x49, -0x4e, -0x48, -0x70, -0x4d, -0x52, -0x42, -0x4c, -0x4d, -0x49, -0x4e, -0x4c, -0x70, -0x4d, -0x52, -0x4c, -0x48, -0x4c, -0x45, -0x4e, -0x48, -0x70, -0x4d, -0x52, -0x4c, -0x4c, -0x4c, -0x45, -0x4e, -0x4c, -0x72, -0x4d, -0x49, -0x4e, -0x4c, -0x4c, -0x45, -0x4e, -0x4c, -0x4d, -0x41, -0x58, -0x4c, -0x72, -0x4d, -0x49, -0x4e, -0x48, -0x4c, -0x45, -0x4e, -0x48, -0x4d, -0x41, -0x58, -0x48, -0xa0, -0x14, -0x95, -0x4d, -0x41, -0x58, -0x4c, -0x4d, -0x49, -0x4e, -0x4c, -0x72, -0x4d, -0x41, -0x58, -0x48, -0x1, -0x4d, -0x41, -0x58, -0x48, -0xa0, -0x11, -0x95, -0x4d, -0x41, -0x58, -0x4c, -0x1, -0x74, -0x4d, -0x41, -0x58, -0x48, -0x1, -0x4d, -0x41, -0x58, -0x48, -0x74, -0x4d, -0x41, -0x58, -0x4c, -0x1, -0x4d, -0x41, -0x58, -0x4c, -0xa0, -0x44, -0x7, -0x93, -0x4d, -0x41, -0x58, -0x48, 0x0, -0x8, -0x4d, -0x52, -0x33, -0x32, -0x11, -0x1f, +0x61, +0xa0, 0xa, -0x1c, -0x87, -0x17, -0x0, +0x7b, +0x60, +0xa, +0x7, 0x0, +0x7a, +0x62, +0x1, +0x62, +0xa1, 0xc, +0x70, +0x83, +0x88, +0x65, +0x7a, +0x60, +0xa, 0x3, 0x0, 0x0, +0x62, +0x70, +0x7b, +0x62, +0x1, 0x0, +0x63, +0xa0, +0x22, +0x92, +0x93, +0x61, +0x63, +0x70, +0x63, +0x88, +0x43, +0x50, +0x4f, +0x4e, +0x60, 0x0, -0x0, -0x0, -0x0, -0x0, -0xfe, -0xff, -0xff, -0xff, -0x0, -0x0, -0x0, -0x0, -0xff, -0xff, -0xff, -0xff, -0x79, -0x0, -0x8a, -0x4d, -0x52, -0x33, -0x32, -0xa, +0xa0, 0xa, -0x4d, -0x49, +0x93, +0x63, +0x1, 0x4e, -0x5f, -0x8a, -0x4d, -0x52, -0x33, -0x32, +0x54, +0x46, +0x59, +0x60, +0x1, +0xa1, +0x8, +0x4e, +0x54, +0x46, +0x59, +0x60, 0xa, -0xe, -0x4d, -0x41, -0x58, -0x5f, -0x8a, -0x4d, +0x3, +0x75, +0x60, +0x5b, +0x82, +0x29, +0x50, 0x52, -0x33, -0x32, -0xa, -0x16, -0x4c, 0x45, -0x4e, +0x53, +0x8, 0x5f, -0x70, -0x4d, -0x49, -0x4e, -0x4c, -0x4d, +0x48, 0x49, -0x4e, -0x5f, -0x70, -0x4d, -0x41, -0x58, -0x4c, -0x4d, +0x44, +0xc, 0x41, -0x58, -0x5f, -0x70, -0x4c, -0x45, -0x4e, -0x4c, -0x4c, -0x45, -0x4e, +0xd0, +0xa, +0x6, +0x8, 0x5f, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x4d, -0x52, -0x33, -0x32, -0x5b, -0x27, -0x4d, -0x4c, 0x43, -0x4b, -0xa4, -0x4d, 0x52, -0x36, -0x34, -0x14, -0x24, -0x4d, -0x50, -0x58, -0x4d, +0x53, +0x11, +0xd, +0xa, +0xa, +0x47, 0x1, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0x70, -0x99, -0x68, 0x0, -0x4d, -0x53, -0x45, -0x4c, -0x70, -0x4d, -0x50, -0x58, +0xaf, +0x0, +0xaf, +0x0, +0x20, +0x79, +0x0, +0x8, 0x5f, -0x60, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x60, -0x14, -0x28, -0x4d, -0x4f, 0x53, 0x54, -0x4, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0x70, -0x99, -0x68, -0x0, -0x4d, -0x53, -0x45, -0x4c, -0x70, -0x69, -0x4d, -0x4f, -0x45, -0x56, -0x70, -0x6a, -0x4d, -0x4f, -0x53, -0x43, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, +0x41, +0xa, +0xb, 0x10, 0x45, 0xd, @@ -3592,6 +2100,3 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x46, 0x0 }; -static unsigned short piix_dsdt_applesmc_sta[] = { -0x353 -}; diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl index e1cee5d..398aec1 100644 --- a/hw/i386/q35-acpi-dsdt.dsl +++ b/hw/i386/q35-acpi-dsdt.dsl @@ -34,7 +34,6 @@ DefinitionBlock ( ) { -#include "acpi-dsdt-dbug.dsl" Scope(\_SB) { OperationRegion(PCST, SystemIO, 0xae00, 0x0c) @@ -132,8 +131,6 @@ DefinitionBlock ( } #include "acpi-dsdt-pci-crs.dsl" -#include "acpi-dsdt-hpet.dsl" - /**************************************************************** * LPC ISA bridge @@ -168,9 +165,6 @@ DefinitionBlock ( } } -#define DSDT_APPLESMC_STA q35_dsdt_applesmc_sta -#include "acpi-dsdt-isa.dsl" - /**************************************************************** * PCI IRQs @@ -405,7 +399,6 @@ DefinitionBlock ( #include "hw/acpi/pc-hotplug.h" #define CPU_STATUS_BASE ICH9_CPU_HOTPLUG_IO_BASE #include "acpi-dsdt-cpu-hotplug.dsl" -#include "acpi-dsdt-mem-hotplug.dsl" /**************************************************************** @@ -422,6 +415,8 @@ DefinitionBlock ( // CPU hotplug event \_SB.PRSC() } + External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE, DeviceObj) + External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD, MethodObj) Method(_E03) { // Memory hotplug event \_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD() diff --git a/hw/i386/q35-acpi-dsdt.hex.generated b/hw/i386/q35-acpi-dsdt.hex.generated index 4807bdf..a82b9a7 100644 --- a/hw/i386/q35-acpi-dsdt.hex.generated +++ b/hw/i386/q35-acpi-dsdt.hex.generated @@ -3,12 +3,12 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x53, 0x44, 0x54, -0xf6, -0x1f, +0x22, +0x1a, 0x0, 0x0, 0x1, -0x91, +0xba, 0x42, 0x58, 0x50, @@ -31,85 +31,11 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x4e, 0x54, 0x4c, -0x28, -0x8, -0x14, +0x13, +0x9, +0x12, 0x20, 0x10, -0x49, -0x4, -0x5c, -0x0, -0x5b, -0x80, -0x44, -0x42, -0x47, -0x5f, -0x1, -0xb, -0x2, -0x4, -0x1, -0x5b, -0x81, -0xb, -0x44, -0x42, -0x47, -0x5f, -0x1, -0x44, -0x42, -0x47, -0x42, -0x8, -0x14, -0x2c, -0x44, -0x42, -0x55, -0x47, -0x1, -0x98, -0x68, -0x60, -0x96, -0x60, -0x60, -0x74, -0x87, -0x60, -0x1, -0x61, -0x70, -0x0, -0x62, -0xa2, -0x10, -0x95, -0x62, -0x61, -0x70, -0x83, -0x88, -0x60, -0x62, -0x0, -0x44, -0x42, -0x47, -0x42, -0x75, -0x62, -0x70, -0xa, -0xa, -0x44, -0x42, -0x47, -0x42, -0x10, 0x29, 0x5f, 0x53, @@ -711,148 +637,6 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xa4, 0x60, 0x10, -0x4d, -0x8, -0x5f, -0x53, -0x42, -0x5f, -0x5b, -0x82, -0x45, -0x8, -0x48, -0x50, -0x45, -0x54, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x1, -0x3, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x0, -0x5b, -0x80, -0x48, -0x50, -0x54, -0x4d, -0x0, -0xc, -0x0, -0x0, -0xd0, -0xfe, -0xb, -0x0, -0x4, -0x5b, -0x81, -0x10, -0x48, -0x50, -0x54, -0x4d, -0x13, -0x56, -0x45, -0x4e, -0x44, -0x20, -0x50, -0x52, -0x44, -0x5f, -0x20, -0x14, -0x36, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x56, -0x45, -0x4e, -0x44, -0x60, -0x70, -0x50, -0x52, -0x44, -0x5f, -0x61, -0x7a, -0x60, -0xa, -0x10, -0x60, -0xa0, -0xc, -0x91, -0x93, -0x60, -0x0, -0x93, -0x60, -0xb, -0xff, -0xff, -0xa4, -0x0, -0xa0, -0xe, -0x91, -0x93, -0x61, -0x0, -0x94, -0x61, -0xc, -0x0, -0xe1, -0xf5, -0x5, -0xa4, -0x0, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x11, -0xa, -0xe, -0x86, -0x9, -0x0, -0x0, -0x0, -0x0, -0xd0, -0xfe, -0x0, -0x4, -0x0, -0x0, -0x79, -0x0, -0x10, 0x4c, 0x7, 0x2e, @@ -977,597 +761,338 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x45, 0x4e, 0x1, +0x8, +0x50, +0x49, +0x43, +0x46, +0x0, +0x14, +0xc, +0x5f, +0x50, +0x49, +0x43, +0x1, +0x70, +0x68, +0x50, +0x49, +0x43, +0x46, 0x10, -0x4a, -0x1e, -0x2f, -0x3, +0x8e, +0x55, +0x1, 0x5f, 0x53, 0x42, 0x5f, +0x10, +0x43, +0xea, 0x50, 0x43, 0x49, 0x30, -0x49, -0x53, -0x41, -0x5f, -0x5b, -0x82, -0x2c, -0x53, -0x4d, -0x43, -0x5f, 0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x6, -0x10, -0x0, -0x1, -0x8, -0x5f, -0x53, -0x54, -0x41, -0xa, -0xf0, -0x8, -0x5f, -0x43, +0x50, 0x52, -0x53, -0x11, -0x10, -0xa, -0xd, -0x47, -0x1, +0x54, +0x50, +0x12, +0x4b, +0x73, +0x80, +0x12, +0xb, +0x4, +0xb, +0xff, +0xff, 0x0, -0x3, +0x4c, +0x4e, +0x4b, +0x45, 0x0, -0x3, +0x12, +0xb, +0x4, +0xb, +0xff, +0xff, 0x1, -0x20, -0x22, -0x40, -0x0, -0x79, +0x4c, +0x4e, +0x4b, +0x46, 0x0, -0x5b, -0x82, -0x2d, -0x52, -0x54, -0x43, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, +0x12, 0xc, -0x41, -0xd0, +0x4, 0xb, -0x0, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x18, +0xff, +0xff, 0xa, -0x15, +0x2, +0x4c, +0x4e, +0x4b, 0x47, +0x0, +0x12, +0xc, +0x4, +0xb, +0xff, +0xff, +0xa, +0x3, +0x4c, +0x4e, +0x4b, +0x48, +0x0, +0x12, +0xd, +0x4, +0xc, +0xff, +0xff, 0x1, -0x70, 0x0, -0x70, 0x0, -0x10, -0x2, -0x22, +0x4c, +0x4e, +0x4b, +0x46, 0x0, +0x12, +0xd, +0x4, +0xc, +0xff, +0xff, 0x1, -0x47, +0x0, 0x1, -0x72, +0x4c, +0x4e, +0x4b, +0x47, 0x0, -0x72, +0x12, +0xe, +0x4, +0xc, +0xff, +0xff, +0x1, 0x0, +0xa, 0x2, -0x6, -0x79, -0x0, -0x5b, -0x82, -0x37, +0x4c, +0x4e, 0x4b, -0x42, -0x44, -0x5f, -0x8, -0x5f, 0x48, -0x49, -0x44, +0x0, +0x12, +0xe, +0x4, 0xc, -0x41, -0xd0, -0x3, -0x3, -0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, +0xff, +0xff, +0x1, 0x0, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x18, 0xa, -0x15, -0x47, -0x1, -0x60, +0x3, +0x4c, +0x4e, +0x4b, +0x45, 0x0, -0x60, +0x12, +0xd, +0x4, +0xc, +0xff, +0xff, +0x2, 0x0, -0x1, -0x1, -0x47, -0x1, -0x64, 0x0, -0x64, +0x4c, +0x4e, +0x4b, +0x47, 0x0, -0x1, -0x1, -0x22, +0x12, +0xd, +0x4, +0xc, +0xff, +0xff, 0x2, 0x0, -0x79, -0x0, -0x5b, -0x82, -0x27, -0x4d, -0x4f, -0x55, -0x5f, -0x8, -0x5f, +0x1, +0x4c, +0x4e, +0x4b, 0x48, -0x49, -0x44, +0x0, +0x12, +0xe, +0x4, 0xc, -0x41, -0xd0, -0xf, -0x13, -0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, +0xff, +0xff, +0x2, 0x0, -0xa4, 0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x8, -0xa, -0x5, -0x22, -0x0, -0x10, -0x79, +0x2, +0x4c, +0x4e, +0x4b, +0x45, 0x0, -0x5b, -0x82, -0x4a, +0x12, +0xe, 0x4, -0x46, -0x44, -0x43, -0x30, -0x8, -0x5f, -0x48, -0x49, -0x44, 0xc, -0x41, -0xd0, -0x7, -0x0, -0x14, -0x18, -0x5f, -0x53, -0x54, -0x41, +0xff, +0xff, +0x2, 0x0, -0x70, -0x46, -0x44, -0x45, +0xa, +0x3, +0x4c, 0x4e, -0x60, -0xa0, -0x6, -0x93, -0x60, -0x0, -0xa4, +0x4b, +0x46, 0x0, -0xa1, +0x12, +0xd, 0x4, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x1b, -0xa, -0x18, -0x47, -0x1, -0xf2, -0x3, -0xf2, +0xc, +0xff, +0xff, 0x3, 0x0, +0x0, +0x4c, +0x4e, +0x4b, +0x48, +0x0, +0x12, +0xd, 0x4, -0x47, -0x1, -0xf7, -0x3, -0xf7, +0xc, +0xff, +0xff, 0x3, 0x0, 0x1, -0x22, -0x40, +0x4c, +0x4e, +0x4b, +0x45, 0x0, -0x2a, +0x12, +0xe, 0x4, +0xc, +0xff, +0xff, +0x3, 0x0, -0x79, +0xa, +0x2, +0x4c, +0x4e, +0x4b, +0x46, 0x0, -0x5b, -0x82, -0x3e, +0x12, +0xe, +0x4, +0xc, +0xff, +0xff, +0x3, +0x0, +0xa, +0x3, 0x4c, -0x50, -0x54, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, +0x4e, +0x4b, +0x47, +0x0, +0x12, +0xd, +0x4, 0xc, -0x41, -0xd0, +0xff, +0xff, 0x4, 0x0, -0x14, -0x18, -0x5f, -0x53, -0x54, -0x41, 0x0, -0x70, 0x4c, -0x50, -0x45, 0x4e, -0x60, -0xa0, -0x6, -0x93, -0x60, +0x4b, +0x45, 0x0, -0xa4, +0x12, +0xd, +0x4, +0xc, +0xff, +0xff, +0x4, 0x0, -0xa1, +0x1, +0x4c, +0x4e, +0x4b, +0x46, +0x0, +0x12, +0xe, 0x4, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x10, +0xc, +0xff, +0xff, +0x4, +0x0, 0xa, -0xd, +0x2, +0x4c, +0x4e, +0x4b, 0x47, -0x1, -0x78, -0x3, -0x78, -0x3, -0x8, -0x8, -0x22, -0x80, -0x0, -0x79, 0x0, -0x5b, -0x82, -0x45, +0x12, +0xe, 0x4, -0x43, -0x4f, -0x4d, -0x31, -0x8, -0x5f, -0x48, -0x49, -0x44, 0xc, -0x41, -0xd0, -0x5, -0x1, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x1, -0x14, -0x18, -0x5f, -0x53, -0x54, -0x41, +0xff, +0xff, +0x4, 0x0, -0x70, -0x43, -0x41, -0x45, +0xa, +0x3, +0x4c, 0x4e, -0x60, -0xa0, -0x6, -0x93, -0x60, -0x0, -0xa4, +0x4b, +0x48, 0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x10, -0xa, -0xd, -0x47, -0x1, -0xf8, -0x3, -0xf8, -0x3, -0x0, -0x8, -0x22, -0x10, -0x0, -0x79, -0x0, -0x5b, -0x82, -0x46, -0x4, -0x43, -0x4f, -0x4d, -0x32, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x5, -0x1, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x2, -0x14, -0x18, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x43, -0x42, -0x45, -0x4e, -0x60, -0xa0, -0x6, -0x93, -0x60, -0x0, -0xa4, -0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x10, -0xa, -0xd, -0x47, -0x1, -0xf8, -0x2, -0xf8, -0x2, -0x0, -0x8, -0x22, -0x8, -0x0, -0x79, -0x0, -0x8, -0x50, -0x49, -0x43, -0x46, -0x0, -0x14, -0xc, -0x5f, -0x50, -0x49, -0x43, -0x1, -0x70, -0x68, -0x50, -0x49, -0x43, -0x46, -0x10, -0x8e, -0x55, -0x1, -0x5f, -0x53, -0x42, -0x5f, -0x10, -0x43, -0xea, -0x50, -0x43, -0x49, -0x30, -0x8, -0x50, -0x52, -0x54, -0x50, -0x12, -0x4b, -0x73, -0x80, -0x12, -0xb, -0x4, -0xb, -0xff, -0xff, -0x0, -0x4c, -0x4e, -0x4b, -0x45, -0x0, -0x12, -0xb, -0x4, -0xb, -0xff, -0xff, -0x1, -0x4c, -0x4e, -0x4b, -0x46, -0x0, -0x12, -0xc, -0x4, -0xb, -0xff, -0xff, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x47, -0x0, -0x12, -0xc, -0x4, -0xb, -0xff, -0xff, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x48, -0x0, -0x12, -0xd, +0x12, +0xd, 0x4, 0xc, 0xff, 0xff, -0x1, +0x5, 0x0, 0x0, 0x4c, @@ -1581,7 +1106,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x1, +0x5, 0x0, 0x1, 0x4c, @@ -1595,7 +1120,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x1, +0x5, 0x0, 0xa, 0x2, @@ -1610,7 +1135,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x1, +0x5, 0x0, 0xa, 0x3, @@ -1625,7 +1150,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x2, +0x6, 0x0, 0x0, 0x4c, @@ -1639,7 +1164,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x2, +0x6, 0x0, 0x1, 0x4c, @@ -1653,7 +1178,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x2, +0x6, 0x0, 0xa, 0x2, @@ -1668,7 +1193,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x2, +0x6, 0x0, 0xa, 0x3, @@ -1683,7 +1208,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x3, +0x7, 0x0, 0x0, 0x4c, @@ -1697,7 +1222,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x3, +0x7, 0x0, 0x1, 0x4c, @@ -1711,7 +1236,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x3, +0x7, 0x0, 0xa, 0x2, @@ -1726,7 +1251,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x3, +0x7, 0x0, 0xa, 0x3, @@ -1741,7 +1266,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x4, +0x8, 0x0, 0x0, 0x4c, @@ -1755,7 +1280,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x4, +0x8, 0x0, 0x1, 0x4c, @@ -1769,7 +1294,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x4, +0x8, 0x0, 0xa, 0x2, @@ -1784,7 +1309,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x4, +0x8, 0x0, 0xa, 0x3, @@ -1799,7 +1324,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x5, +0x9, 0x0, 0x0, 0x4c, @@ -1813,7 +1338,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x5, +0x9, 0x0, 0x1, 0x4c, @@ -1827,7 +1352,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x5, +0x9, 0x0, 0xa, 0x2, @@ -1842,7 +1367,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x5, +0x9, 0x0, 0xa, 0x3, @@ -1857,7 +1382,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x6, +0xa, 0x0, 0x0, 0x4c, @@ -1871,7 +1396,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x6, +0xa, 0x0, 0x1, 0x4c, @@ -1885,7 +1410,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x6, +0xa, 0x0, 0xa, 0x2, @@ -1900,7 +1425,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x6, +0xa, 0x0, 0xa, 0x3, @@ -1915,7 +1440,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x7, +0xb, 0x0, 0x0, 0x4c, @@ -1929,7 +1454,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x7, +0xb, 0x0, 0x1, 0x4c, @@ -1943,7 +1468,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x7, +0xb, 0x0, 0xa, 0x2, @@ -1958,7 +1483,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x7, +0xb, 0x0, 0xa, 0x3, @@ -1973,7 +1498,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x8, +0xc, 0x0, 0x0, 0x4c, @@ -1987,7 +1512,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x8, +0xc, 0x0, 0x1, 0x4c, @@ -2001,239 +1526,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0xc, 0xff, 0xff, -0x8, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x47, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x8, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x48, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x46, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x47, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x48, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x45, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x47, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x48, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x45, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x46, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x48, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x45, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x46, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x47, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xc, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x45, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xc, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x46, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xc, +0xc, 0x0, 0xa, 0x2, @@ -6814,1210 +6107,425 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x5f, 0x53, 0x52, -0x53, -0x1, -0x5b, -0x82, -0x45, -0x4, -0x47, -0x53, -0x49, -0x47, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x0, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, -0x1, -0x16, -0x0, -0x0, -0x0, -0x79, -0x0, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, -0x1, -0x16, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0x6, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x5b, -0x82, -0x45, -0x4, -0x47, -0x53, -0x49, -0x48, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x0, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, -0x1, -0x17, -0x0, -0x0, -0x0, -0x79, -0x0, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, -0x1, -0x17, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0x6, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x10, -0x42, -0x11, -0x5f, -0x53, -0x42, -0x5f, -0x14, -0x35, -0x43, -0x50, -0x4d, -0x41, -0x1, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x68, -0x0, -0x60, -0x70, -0x11, -0xb, -0xa, -0x8, -0x0, -0x8, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x61, -0x70, -0x68, -0x88, -0x61, -0xa, -0x2, -0x0, -0x70, -0x68, -0x88, -0x61, -0xa, -0x3, -0x0, -0x70, -0x60, -0x88, -0x61, -0xa, -0x4, -0x0, -0xa4, -0x61, -0x14, -0x1a, -0x43, -0x50, -0x53, -0x54, -0x1, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x68, -0x0, -0x60, -0xa0, -0x5, -0x60, -0xa4, -0xa, -0xf, -0xa1, -0x3, -0xa4, -0x0, -0x14, -0xa, -0x43, -0x50, -0x45, -0x4a, -0x2, -0x5b, -0x22, -0xa, -0xc8, -0x5b, -0x80, -0x50, -0x52, -0x53, -0x54, -0x1, -0xb, -0xd8, -0xc, -0xa, -0x20, -0x5b, -0x81, -0xc, -0x50, -0x52, -0x53, -0x54, -0x1, -0x50, -0x52, -0x53, -0x5f, -0x40, -0x10, -0x14, -0x4a, -0x6, -0x50, -0x52, -0x53, -0x43, -0x0, -0x70, -0x50, -0x52, -0x53, -0x5f, -0x65, -0x70, -0x0, -0x62, -0x70, -0x0, -0x60, -0xa2, -0x46, -0x5, -0x95, -0x60, -0x87, -0x43, -0x50, -0x4f, -0x4e, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x60, -0x0, -0x61, -0xa0, -0xa, -0x7b, -0x60, -0xa, -0x7, -0x0, -0x7a, -0x62, -0x1, -0x62, -0xa1, -0xc, -0x70, -0x83, -0x88, -0x65, -0x7a, -0x60, -0xa, -0x3, -0x0, -0x0, -0x62, -0x70, -0x7b, -0x62, -0x1, -0x0, -0x63, -0xa0, -0x22, -0x92, -0x93, -0x61, -0x63, -0x70, -0x63, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x60, -0x0, -0xa0, -0xa, -0x93, -0x63, -0x1, -0x4e, -0x54, -0x46, -0x59, -0x60, -0x1, -0xa1, -0x8, -0x4e, -0x54, -0x46, -0x59, -0x60, -0xa, -0x3, -0x75, -0x60, -0x5b, -0x82, -0x29, -0x50, -0x52, -0x45, -0x53, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xa, -0x6, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0xd, -0xa, -0xa, -0x47, -0x1, -0xd8, -0xc, -0xd8, -0xc, -0x0, -0x20, -0x79, -0x0, -0x8, -0x5f, -0x53, -0x54, -0x41, -0xa, -0xb, -0x10, -0x40, -0x31, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x5b, -0x82, -0x43, -0x30, -0x4d, -0x48, -0x50, -0x44, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xd, -0x50, -0x4e, -0x50, -0x30, -0x41, -0x30, -0x36, -0x0, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xd, -0x4d, -0x65, -0x6d, -0x6f, -0x72, -0x79, -0x20, -0x68, -0x6f, -0x74, -0x70, -0x6c, -0x75, -0x67, -0x20, -0x72, -0x65, -0x73, -0x6f, -0x75, -0x72, -0x63, -0x65, -0x73, -0x0, -0x5b, -0x80, -0x48, -0x50, -0x4d, -0x52, -0x1, -0xb, -0x0, -0xa, -0xa, -0x18, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0xd, -0xa, -0xa, -0x47, -0x1, -0x0, -0xa, -0x0, -0xa, -0x0, -0x18, -0x79, -0x0, -0x14, -0x13, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa0, -0x9, -0x93, -0x4d, -0x44, -0x4e, -0x52, -0x0, -0xa4, -0x0, -0xa4, -0xa, -0xb, -0x5b, -0x81, -0x1f, -0x48, -0x50, -0x4d, -0x52, -0x3, -0x4d, -0x52, -0x42, -0x4c, -0x20, -0x4d, -0x52, -0x42, -0x48, -0x20, -0x4d, -0x52, -0x4c, -0x4c, -0x20, -0x4d, -0x52, -0x4c, -0x48, -0x20, -0x4d, -0x50, -0x58, -0x5f, -0x20, -0x5b, -0x81, -0x13, -0x48, -0x50, -0x4d, -0x52, -0x1, -0x0, -0x40, -0xa, -0x4d, -0x45, -0x53, -0x5f, -0x1, -0x4d, -0x49, -0x4e, -0x53, -0x1, -0x5b, -0x1, -0x4d, -0x4c, -0x43, -0x4b, -0x0, -0x5b, -0x81, -0x15, -0x48, -0x50, -0x4d, -0x52, -0x3, -0x4d, -0x53, -0x45, -0x4c, -0x20, -0x4d, -0x4f, -0x45, -0x56, -0x20, -0x4d, -0x4f, -0x53, -0x43, -0x20, -0x14, -0x4a, -0x4, -0x4d, -0x53, -0x43, -0x4e, -0x0, -0xa0, -0x9, -0x93, -0x4d, -0x44, -0x4e, -0x52, -0x0, -0xa4, -0x0, -0x70, -0x0, -0x60, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0xa2, -0x25, -0x95, -0x60, -0x4d, -0x44, -0x4e, -0x52, -0x70, -0x60, -0x4d, -0x53, -0x45, -0x4c, -0xa0, -0x13, -0x93, -0x4d, -0x49, -0x4e, -0x53, -0x1, -0x4d, -0x54, -0x46, -0x59, -0x60, -0x1, -0x70, -0x1, -0x4d, -0x49, -0x4e, -0x53, -0x72, -0x60, -0x1, -0x60, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x1, -0x14, -0x2d, -0x4d, -0x52, -0x53, -0x54, -0x1, -0x70, -0x0, -0x60, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0x70, -0x99, -0x68, -0x0, -0x4d, -0x53, -0x45, -0x4c, -0xa0, -0xb, -0x93, -0x4d, -0x45, -0x53, -0x5f, -0x1, -0x70, -0xa, -0xf, -0x60, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x60, -0x14, -0x41, -0x18, -0x4d, -0x43, -0x52, -0x53, -0x9, -0x5b, -0x23, -0x4d, -0x4c, -0x43, -0x4b, -0xff, -0xff, -0x70, -0x99, -0x68, -0x0, -0x4d, -0x53, -0x45, -0x4c, -0x8, -0x4d, -0x52, -0x36, -0x34, -0x11, -0x33, -0xa, -0x30, -0x8a, -0x2b, -0x0, -0x0, -0xc, -0x3, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xfe, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0xff, -0x79, -0x0, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0xe, -0x4d, -0x49, -0x4e, -0x4c, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x12, -0x4d, -0x49, -0x4e, -0x48, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x26, -0x4c, -0x45, -0x4e, -0x4c, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x2a, -0x4c, -0x45, -0x4e, -0x48, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x16, -0x4d, -0x41, -0x58, -0x4c, -0x8a, -0x4d, -0x52, -0x36, -0x34, -0xa, -0x1a, -0x4d, -0x41, -0x58, -0x48, -0x70, -0x4d, -0x52, -0x42, -0x48, -0x4d, -0x49, -0x4e, -0x48, -0x70, -0x4d, -0x52, -0x42, -0x4c, -0x4d, -0x49, -0x4e, -0x4c, -0x70, -0x4d, -0x52, -0x4c, -0x48, -0x4c, -0x45, -0x4e, -0x48, -0x70, -0x4d, -0x52, -0x4c, -0x4c, -0x4c, -0x45, -0x4e, -0x4c, -0x72, -0x4d, -0x49, -0x4e, -0x4c, -0x4c, -0x45, -0x4e, -0x4c, -0x4d, -0x41, -0x58, -0x4c, -0x72, -0x4d, -0x49, -0x4e, -0x48, -0x4c, -0x45, -0x4e, -0x48, -0x4d, -0x41, -0x58, -0x48, -0xa0, -0x14, -0x95, -0x4d, -0x41, -0x58, -0x4c, -0x4d, -0x49, -0x4e, -0x4c, -0x72, -0x4d, -0x41, -0x58, -0x48, -0x1, -0x4d, -0x41, -0x58, -0x48, -0xa0, -0x11, -0x95, -0x4d, -0x41, -0x58, -0x4c, -0x1, -0x74, -0x4d, -0x41, -0x58, -0x48, +0x53, 0x1, -0x4d, -0x41, -0x58, +0x5b, +0x82, +0x45, +0x4, +0x47, +0x53, +0x49, +0x47, +0x8, +0x5f, 0x48, -0x74, -0x4d, -0x41, -0x58, -0x4c, -0x1, -0x4d, -0x41, -0x58, -0x4c, -0xa0, +0x49, 0x44, -0x7, -0x93, -0x4d, +0xc, 0x41, -0x58, -0x48, +0xd0, +0xc, +0xf, +0x8, +0x5f, +0x55, +0x49, +0x44, 0x0, 0x8, -0x4d, +0x5f, +0x50, 0x52, -0x33, -0x32, +0x53, 0x11, -0x1f, +0xe, 0xa, -0x1c, -0x87, -0x17, +0xb, +0x89, +0x6, +0x0, +0x9, +0x1, +0x16, 0x0, 0x0, -0xc, -0x3, 0x0, +0x79, 0x0, +0x8, +0x5f, +0x43, +0x52, +0x53, +0x11, +0xe, +0xa, +0xb, +0x89, +0x6, 0x0, +0x9, +0x1, +0x16, 0x0, 0x0, 0x0, +0x79, 0x0, +0x14, +0x6, +0x5f, +0x53, +0x52, +0x53, +0x1, +0x5b, +0x82, +0x45, +0x4, +0x47, +0x53, +0x49, +0x48, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0xc, +0xf, +0x8, +0x5f, +0x55, +0x49, +0x44, 0x0, -0xfe, -0xff, -0xff, -0xff, +0x8, +0x5f, +0x50, +0x52, +0x53, +0x11, +0xe, +0xa, +0xb, +0x89, +0x6, 0x0, +0x9, +0x1, +0x17, 0x0, 0x0, 0x0, -0xff, -0xff, -0xff, -0xff, 0x79, 0x0, -0x8a, -0x4d, -0x52, -0x33, -0x32, -0xa, -0xa, -0x4d, -0x49, -0x4e, +0x8, 0x5f, -0x8a, -0x4d, +0x43, 0x52, -0x33, -0x32, -0xa, +0x53, +0x11, 0xe, -0x4d, -0x41, -0x58, +0xa, +0xb, +0x89, +0x6, +0x0, +0x9, +0x1, +0x17, +0x0, +0x0, +0x0, +0x79, +0x0, +0x14, +0x6, 0x5f, -0x8a, -0x4d, +0x53, 0x52, -0x33, -0x32, -0xa, -0x16, -0x4c, -0x45, -0x4e, +0x53, +0x1, +0x10, +0x42, +0x11, 0x5f, -0x70, -0x4d, -0x49, -0x4e, -0x4c, -0x4d, -0x49, -0x4e, +0x53, +0x42, 0x5f, -0x70, -0x4d, -0x41, -0x58, -0x4c, +0x14, +0x35, +0x43, +0x50, 0x4d, 0x41, -0x58, -0x5f, +0x1, +0x70, +0x83, +0x88, +0x43, +0x50, +0x4f, +0x4e, +0x68, +0x0, +0x60, +0x70, +0x11, +0xb, +0xa, +0x8, +0x0, +0x8, +0x0, +0x0, +0x0, +0x0, +0x0, +0x0, +0x61, +0x70, +0x68, +0x88, +0x61, +0xa, +0x2, +0x0, +0x70, +0x68, +0x88, +0x61, +0xa, +0x3, +0x0, +0x70, +0x60, +0x88, +0x61, +0xa, +0x4, +0x0, +0xa4, +0x61, +0x14, +0x1a, +0x43, +0x50, +0x53, +0x54, +0x1, 0x70, -0x4c, -0x45, +0x83, +0x88, +0x43, +0x50, +0x4f, 0x4e, -0x4c, -0x4c, +0x68, +0x0, +0x60, +0xa0, +0x5, +0x60, +0xa4, +0xa, +0xf, +0xa1, +0x3, +0xa4, +0x0, +0x14, +0xa, +0x43, +0x50, 0x45, -0x4e, -0x5f, +0x4a, +0x2, 0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x4d, +0x22, +0xa, +0xc8, +0x5b, +0x80, +0x50, 0x52, -0x33, -0x32, +0x53, +0x54, +0x1, +0xb, +0xd8, +0xc, +0xa, +0x20, 0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, -0x4d, +0x81, +0xc, +0x50, 0x52, -0x36, -0x34, +0x53, +0x54, +0x1, +0x50, +0x52, +0x53, +0x5f, +0x40, +0x10, 0x14, -0x24, -0x4d, +0x4a, +0x6, 0x50, -0x58, -0x4d, -0x1, -0x5b, -0x23, -0x4d, -0x4c, +0x52, +0x53, 0x43, -0x4b, -0xff, -0xff, -0x70, -0x99, -0x68, 0x0, -0x4d, -0x53, -0x45, -0x4c, 0x70, -0x4d, 0x50, -0x58, +0x52, +0x53, 0x5f, +0x65, +0x70, +0x0, +0x62, +0x70, +0x0, 0x60, -0x5b, -0x27, -0x4d, -0x4c, -0x43, -0x4b, -0xa4, +0xa2, +0x46, +0x5, +0x95, 0x60, -0x14, -0x28, -0x4d, +0x87, +0x43, +0x50, 0x4f, -0x53, -0x54, -0x4, -0x5b, -0x23, -0x4d, -0x4c, +0x4e, +0x70, +0x83, +0x88, 0x43, -0x4b, -0xff, -0xff, +0x50, +0x4f, +0x4e, +0x60, +0x0, +0x61, +0xa0, +0xa, +0x7b, +0x60, +0xa, +0x7, +0x0, +0x7a, +0x62, +0x1, +0x62, +0xa1, +0xc, 0x70, -0x99, -0x68, +0x83, +0x88, +0x65, +0x7a, +0x60, +0xa, +0x3, 0x0, -0x4d, -0x53, -0x45, -0x4c, +0x0, +0x62, 0x70, -0x69, -0x4d, -0x4f, -0x45, -0x56, +0x7b, +0x62, +0x1, +0x0, +0x63, +0xa0, +0x22, +0x92, +0x93, +0x61, +0x63, 0x70, -0x6a, -0x4d, -0x4f, -0x53, +0x63, +0x88, 0x43, +0x50, +0x4f, +0x4e, +0x60, +0x0, +0xa0, +0xa, +0x93, +0x63, +0x1, +0x4e, +0x54, +0x46, +0x59, +0x60, +0x1, +0xa1, +0x8, +0x4e, +0x54, +0x46, +0x59, +0x60, +0xa, +0x3, +0x75, +0x60, 0x5b, -0x27, -0x4d, -0x4c, +0x82, +0x29, +0x50, +0x52, +0x45, +0x53, +0x8, +0x5f, +0x48, +0x49, +0x44, +0xc, +0x41, +0xd0, +0xa, +0x6, +0x8, +0x5f, 0x43, -0x4b, +0x52, +0x53, +0x11, +0xd, +0xa, +0xa, +0x47, +0x1, +0xd8, +0xc, +0xd8, +0xc, +0x0, +0x20, +0x79, +0x0, +0x8, +0x5f, +0x53, +0x54, +0x41, +0xa, +0xb, 0x10, 0x42, 0xa, @@ -8182,6 +6690,3 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x46, 0x0 }; -static unsigned short q35_dsdt_applesmc_sta[] = { -0x3fa -}; diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT index 9bcc9ba9540f768afeba95231229e093b538d020..76edb15b23cf1f9a0fcdb17807492553c1115b61 100644 GIT binary patch delta 69 zcmV-L0J{Is9@8EQL{mgmQx5Y>lF delta 68 zcmV-K0K5OeLcT%@L{mgmJ|O@A0ez7Q874lW-c0lYRnx0}x6cv;P|C a0kir7h86-qF|+F&4+E2c8KblMA4dVp*A_