diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2013-02-27 20:46:40 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2013-03-06 08:55:05 -0500 |
| commit | 3f8d735dd85edc9fc4da8d4018925012a8626877 (patch) | |
| tree | 522103fdd7b9eb29f825122d4b2580e358f967b9 | |
| parent | 11a7234491cb2a027b0fa5e82af38a3e78b44c80 (diff) | |
| download | seabios-3f8d735dd85edc9fc4da8d4018925012a8626877.tar.gz | |
Rename src/ssdt-susp.dsl to src/ssdt-misc.dsl.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/acpi.c | 8 | ||||
| -rw-r--r-- | src/ssdt-misc.dsl (renamed from src/ssdt-susp.dsl) | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -220,7 +220,7 @@ $(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.p $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off $(Q)cat $(OUT)$*.off > $@ -$(OUT)acpi.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex $(OUT)ssdt-susp.hex $(OUT)q35-acpi-dsdt.hex +$(OUT)acpi.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex $(OUT)ssdt-misc.hex $(OUT)q35-acpi-dsdt.hex ################ Kconfig rules @@ -439,7 +439,7 @@ encodeLen(u8 *ssdt_ptr, int length, int bytes) #define SSDT_SIGNATURE 0x54445353 // SSDT #define SSDT_HEADER_LENGTH 36 -#include "ssdt-susp.hex" +#include "ssdt-misc.hex" #include "ssdt-pcihp.hex" #define PCI_RMV_BASE 0xae0c @@ -496,7 +496,7 @@ static void* build_ssdt(void) { int acpi_cpus = MaxCountCPUs > 0xff ? 0xff : MaxCountCPUs; - int length = (sizeof(ssdp_susp_aml) // _S3_ / _S4_ / _S5_ + int length = (sizeof(ssdp_misc_aml) // _S3_ / _S4_ / _S5_ + (1+3+4) // Scope(_SB_) + (acpi_cpus * PROC_SIZEOF) // procs + (1+2+5+(12*acpi_cpus)) // NTFY @@ -518,14 +518,14 @@ build_ssdt(void) if (!sys_states || sys_state_size != 6) sys_states = (char[]){128, 0, 0, 129, 128, 128}; - memcpy(ssdt_ptr, ssdp_susp_aml, sizeof(ssdp_susp_aml)); + memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml)); if (!(sys_states[3] & 128)) ssdt_ptr[acpi_s3_name[0]] = 'X'; if (!(sys_states[4] & 128)) ssdt_ptr[acpi_s4_name[0]] = 'X'; else ssdt_ptr[acpi_s4_pkg[0] + 1] = ssdt[acpi_s4_pkg[0] + 3] = sys_states[4] & 127; - ssdt_ptr += sizeof(ssdp_susp_aml); + ssdt_ptr += sizeof(ssdp_misc_aml); // build Scope(_SB_) header *(ssdt_ptr++) = 0x10; // ScopeOp diff --git a/src/ssdt-susp.dsl b/src/ssdt-misc.dsl index ca9428f..f0a8df3 100644 --- a/src/ssdt-susp.dsl +++ b/src/ssdt-misc.dsl @@ -1,6 +1,6 @@ -ACPI_EXTRACT_ALL_CODE ssdp_susp_aml +ACPI_EXTRACT_ALL_CODE ssdp_misc_aml -DefinitionBlock ("ssdt-susp.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) +DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) { /**************************************************************** |