diff options
author | Myles Watson <mylesgw@gmail.com> | 2010-03-24 22:02:53 +0000 |
---|---|---|
committer | Myles Watson <mylesgw@gmail.com> | 2010-03-24 22:02:53 +0000 |
commit | 565a281f3696bf6252fe3153f4b680db85fe7906 (patch) | |
tree | f9ae61466b69b7a06bbe9938e97af2e82dbb5337 /src/mainboard/via/epia-m700 | |
parent | d1149d7ef13ba63baac89dfe687bdd01e93f79ca (diff) |
Get rid of type-punned pointer errors.
Defining AmlCode differently in different source files is a bit ugly...
Creating a void * to do the casting is not exactly beautiful either...
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5286 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/via/epia-m700')
-rw-r--r-- | src/mainboard/via/epia-m700/acpi_tables.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mainboard/via/epia-m700/acpi_tables.c b/src/mainboard/via/epia-m700/acpi_tables.c index ff32f9ae4c..b826d6b3ed 100644 --- a/src/mainboard/via/epia-m700/acpi_tables.c +++ b/src/mainboard/via/epia-m700/acpi_tables.c @@ -35,8 +35,8 @@ #include <device/pci_ids.h> #include <../../../northbridge/via/vx800/vx800.h> -extern unsigned char AmlCode_dsdt[]; -extern unsigned char AmlCode_ssdt[]; +extern const acpi_header_t AmlCode_dsdt; +extern const acpi_header_t AmlCode_ssdt; extern u32 wake_vec; @@ -158,9 +158,8 @@ unsigned long write_acpi_tables(unsigned long start) printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode_dsdt)->length; - memcpy((void *)dsdt, (void *)AmlCode_dsdt, - ((acpi_header_t *) AmlCode_dsdt)->length); + current += AmlCode_dsdt.length; + memcpy((void *)dsdt, &AmlCode_dsdt, AmlCode_dsdt.length); dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = acpi_checksum(dsdt, dsdt->length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); @@ -190,8 +189,8 @@ unsigned long write_acpi_tables(unsigned long start) #if 0 printk(BIOS_DEBUG, "ACPI: * SSDT\n"); ssdt = (acpi_header_t *) current; - current += ((acpi_header_t *)AmlCode_ssdt)->length; - memcpy((void *)ssdt,(void *)AmlCode_ssdt, ((acpi_header_t *)AmlCode_ssdt)->length); + current += AmlCode_ssdt.length; + memcpy((void *)ssdt, &AmlCode_ssdt, AmlCode_ssdt.length); ssdt->checksum = 0; /* Don't trust iasl to get this right. */ ssdt->checksum = acpi_checksum(ssdt, ssdt->length); acpi_add_table(rsdp, ssdt); |