From 4704dc520b1d5eb8ae730b336ee5f6b7401f7dfc Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 22 Jul 2009 01:11:37 +0000 Subject: Fix up the tree again... * acpi_add_table requires a pointer to the RSDP, not the RSDT anymore, in order to properly support XSDT generation. * fix compilation the DSDT on gigabyte/m57sli * drop a remaining, forgotten HPET_NAME for "HPET" Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4461 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/boot/acpi.c | 2 +- src/arch/i386/include/arch/acpi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arch/i386') diff --git a/src/arch/i386/boot/acpi.c b/src/arch/i386/boot/acpi.c index 515976636d..baff4f0dd6 100644 --- a/src/arch/i386/boot/acpi.c +++ b/src/arch/i386/boot/acpi.c @@ -341,7 +341,7 @@ void acpi_create_hpet(acpi_hpet_t *hpet) memset((void *)hpet, 0, sizeof(acpi_hpet_t)); /* fill out header fields */ - memcpy(header->signature, HPET_NAME, 4); + memcpy(header->signature, "HPET", 4); memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h index 7f87f64a03..f5668c343b 100644 --- a/src/arch/i386/include/arch/acpi.h +++ b/src/arch/i386/include/arch/acpi.h @@ -389,7 +389,7 @@ int acpi_get_sleep_type(void); #endif -unsigned long acpi_add_ssdt_pstates(acpi_rsdt_t *rsdt, unsigned long current); +unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current); #define ACPI_WRITE_MADT_IOAPIC(dev,id) \ do { \ -- cgit v1.2.3