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
This commit is contained in:
@@ -29,8 +29,7 @@
|
||||
#include <cpu/x86/msr.h>
|
||||
#include "dmi.h"
|
||||
|
||||
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
|
||||
@@ -204,10 +203,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);
|
||||
|
||||
ALIGN_CURRENT;
|
||||
|
||||
|
Reference in New Issue
Block a user