summaryrefslogtreecommitdiff
path: root/src/mainboard/amd/dbm690t
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2010-03-24 22:02:53 +0000
committerMyles Watson <mylesgw@gmail.com>2010-03-24 22:02:53 +0000
commit565a281f3696bf6252fe3153f4b680db85fe7906 (patch)
treef9ae61466b69b7a06bbe9938e97af2e82dbb5337 /src/mainboard/amd/dbm690t
parentd1149d7ef13ba63baac89dfe687bdd01e93f79ca (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/amd/dbm690t')
-rw-r--r--src/mainboard/amd/dbm690t/acpi_tables.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index b77a3bd507..18d3ec2afc 100644
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -57,13 +57,13 @@ static void dump_mem(u32 start, u32 end)
}
#endif
-extern u8 AmlCode[];
+extern const acpi_header_t AmlCode;
#if CONFIG_ACPI_SSDTX_NUM >= 1
-extern u8 AmlCode_ssdt2[];
-extern u8 AmlCode_ssdt3[];
-extern u8 AmlCode_ssdt4[];
-extern u8 AmlCode_ssdt5[];
+extern const acpi_header_t AmlCode_ssdt2;
+extern const acpi_header_t AmlCode_ssdt3;
+extern const acpi_header_t AmlCode_ssdt4;
+extern const acpi_header_t AmlCode_ssdt5;
#endif
#define IO_APIC_ADDR 0xfec00000UL
@@ -219,25 +219,24 @@ unsigned long write_acpi_tables(unsigned long start)
ssdtx = (acpi_header_t *) current;
switch (sysconf.hcid[i]) {
case 1: /* 8132 */
- p = AmlCode_ssdt2;
+ p = &AmlCode_ssdt2;
break;
case 2: /* 8151 */
- p = AmlCode_ssdt3;
+ p = &AmlCode_ssdt3;
break;
case 3: /* 8131 */
- p = AmlCode_ssdt4;
+ p = &AmlCode_ssdt4;
break;
default:
/* HTX no io apic */
- p = AmlCode_ssdt5;
+ p = &AmlCode_ssdt5;
break;
}
- current += ((acpi_header_t *) p)->length;
- memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *) p)->length);
+ current += p->length;
+ memcpy((void *)ssdtx, p, p->length);
update_ssdtx((void *)ssdtx, i);
ssdtx->checksum = 0;
- ssdtx->checksum =
- acpi_checksum((u8 *)ssdtx, ssdtx->length);
+ ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length);
acpi_add_table(rsdp, ssdtx);
}
#endif
@@ -250,10 +249,9 @@ unsigned long write_acpi_tables(unsigned long start)
/* DSDT */
printk(BIOS_DEBUG, "ACPI: * DSDT\n");
- dsdt = (acpi_header_t *) current;
- memcpy((void *)dsdt, (void *)AmlCode,
- ((acpi_header_t *) AmlCode)->length);
- current += dsdt->length;
+ dsdt = (acpi_header_t *)current;
+ current += AmlCode.length;
+ memcpy((void *)dsdt, &AmlCode, AmlCode.length);
printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length);
/* FADT */
printk(BIOS_DEBUG, "ACPI: * FADT\n");