summaryrefslogtreecommitdiff
path: root/src/mainboard/via
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/via
parentd1149d7ef13ba63baac89dfe687bdd01e93f79ca (diff)
downloadcoreboot-565a281f3696bf6252fe3153f4b680db85fe7906.tar.xz
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')
-rw-r--r--src/mainboard/via/epia-m/acpi_tables.c6
-rw-r--r--src/mainboard/via/epia-m700/acpi_tables.c13
-rw-r--r--src/mainboard/via/epia-n/acpi_tables.c6
-rw-r--r--src/mainboard/via/vt8454c/acpi_tables.c7
4 files changed, 15 insertions, 17 deletions
diff --git a/src/mainboard/via/epia-m/acpi_tables.c b/src/mainboard/via/epia-m/acpi_tables.c
index 7d7bc396eb..2589e3fed8 100644
--- a/src/mainboard/via/epia-m/acpi_tables.c
+++ b/src/mainboard/via/epia-m/acpi_tables.c
@@ -11,7 +11,7 @@
#include <string.h>
#include <arch/acpi.h>
-extern unsigned char AmlCode[];
+extern const acpi_header_t AmlCode;
unsigned long acpi_fill_mcfg(unsigned long current)
{
@@ -75,8 +75,8 @@ unsigned long write_acpi_tables(unsigned long start)
acpi_create_facs(facs);
dsdt = (acpi_header_t *)current;
- current += ((acpi_header_t *)AmlCode)->length;
- memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length);
+ current += AmlCode.length;
+ memcpy((void *)dsdt, &AmlCode, AmlCode.length);
dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
dsdt->checksum = acpi_checksum(dsdt,dsdt->length);
printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
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);
diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c
index 3b1c0278bb..904ddefb07 100644
--- a/src/mainboard/via/epia-n/acpi_tables.c
+++ b/src/mainboard/via/epia-n/acpi_tables.c
@@ -35,7 +35,7 @@
#include <device/pci_ids.h>
#include "../../../southbridge/via/vt8237r/vt8237r.h"
-extern unsigned char AmlCode[];
+extern const acpi_header_t AmlCode;
/*
* These four macros are copied from <arch/smp/mpspec.h>, I have to do this
@@ -161,8 +161,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)->length;
- memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length);
+ current += AmlCode.length;
+ memcpy((void *)dsdt, &AmlCode, AmlCode.length);
dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
dsdt->checksum = acpi_checksum(dsdt,dsdt->length);
printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
diff --git a/src/mainboard/via/vt8454c/acpi_tables.c b/src/mainboard/via/vt8454c/acpi_tables.c
index f5e37f5069..dbd53f3fa6 100644
--- a/src/mainboard/via/vt8454c/acpi_tables.c
+++ b/src/mainboard/via/vt8454c/acpi_tables.c
@@ -27,7 +27,7 @@
#include <device/pci_ids.h>
#include "dmi.h"
-extern unsigned char AmlCode[];
+extern const acpi_header_t AmlCode;
unsigned long acpi_fill_mcfg(unsigned long current)
{
@@ -180,9 +180,8 @@ unsigned long write_acpi_tables(unsigned long start)
acpi_create_facs(facs);
dsdt = (acpi_header_t *) current;
- current += ((acpi_header_t *) AmlCode)->length;
- memcpy((void *) dsdt, (void *) AmlCode,
- ((acpi_header_t *) AmlCode)->length);
+ current += AmlCode.length;
+ memcpy((void *) dsdt, &AmlCode,AmlCode.length);
#if DONT_TRUST_IASL
dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
dsdt->checksum = acpi_checksum(dsdt, dsdt->length);