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/intel | |
| 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/intel')
| -rw-r--r-- | src/mainboard/intel/d945gclf/acpi_tables.c | 8 | ||||
| -rw-r--r-- | src/mainboard/intel/eagleheights/acpi_tables.c | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c index 8539f0ff26..5be0c9aef2 100644 --- a/src/mainboard/intel/d945gclf/acpi_tables.c +++ b/src/mainboard/intel/d945gclf/acpi_tables.c @@ -31,8 +31,7 @@ #define OLD_ACPI 0 -extern unsigned char AmlCode[]; -void *amlcodeptr = &AmlCode; +extern const acpi_header_t AmlCode; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -273,10 +272,9 @@ unsigned long write_acpi_tables(unsigned long start) ALIGN_CURRENT; acpi_create_facs(facs); - int len = ((acpi_header_t *) amlcodeptr)->length; dsdt = (acpi_header_t *) current; - current += len; - memcpy((void *) dsdt, amlcodeptr, len); + current += AmlCode.length; + memcpy((void *) dsdt, &AmlCode, AmlCode.length); #if OLD_ACPI for (i=0; i < dsdt->length; i++) { diff --git a/src/mainboard/intel/eagleheights/acpi_tables.c b/src/mainboard/intel/eagleheights/acpi_tables.c index 0dbad24160..da642b636f 100644 --- a/src/mainboard/intel/eagleheights/acpi_tables.c +++ b/src/mainboard/intel/eagleheights/acpi_tables.c @@ -28,7 +28,7 @@ #include <device/pci_ids.h> #include "ioapic.h" -extern unsigned char AmlCode[]; +extern const acpi_header_t AmlCode; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -206,10 +206,9 @@ unsigned long write_acpi_tables(unsigned long start) acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += ((acpi_header_t *) AmlCode)->length; + current += AmlCode.length; ALIGN_CURRENT; - memcpy((void *) dsdt, (void *) AmlCode, - ((acpi_header_t *) AmlCode)->length); + memcpy((void *) dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); |