From f2592f9bcefa3031bf339f45911cb4033a5753b8 Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Thu, 23 Aug 2018 10:33:29 -0600 Subject: [PATCH] vendorcode/amd/cimx/sb*: Rename RSDP header Rename RSDP to RSDP_HEADER to match other AMD vendorcode and to not pollute the namespace. We will use RSDP in a future patch. Change-Id: I3b66135ae1732b86b5ebfcdc01a850a0d9d3eb50 Signed-off-by: Marc Jones Reviewed-on: https://review.coreboot.org/28294 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- src/vendorcode/amd/cimx/sb800/ACPILIB.c | 2 +- src/vendorcode/amd/cimx/sb800/ACPILIB.h | 2 +- src/vendorcode/amd/cimx/sb900/AcpiLib.c | 2 +- src/vendorcode/amd/cimx/sb900/AcpiLib.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vendorcode/amd/cimx/sb800/ACPILIB.c b/src/vendorcode/amd/cimx/sb800/ACPILIB.c index bc11209f6b..e112fe814c 100644 --- a/src/vendorcode/amd/cimx/sb800/ACPILIB.c +++ b/src/vendorcode/amd/cimx/sb800/ACPILIB.c @@ -63,7 +63,7 @@ ACPI_LocateTable ( Rsdt = NULL; do { if ( *RsdPtr == Int32FromChar('R', 'S', 'D', ' ') && *(RsdPtr + 1) == Int32FromChar('P', 'T', 'R', ' ')) { - Rsdt = (UINT32*) (UINTN) ((RSDP*)RsdPtr)->RsdtAddress; + Rsdt = (UINT32*) (UINTN) ((RSDP_HEADER*)RsdPtr)->RsdtAddress; break; } RsdPtr += 4; diff --git a/src/vendorcode/amd/cimx/sb800/ACPILIB.h b/src/vendorcode/amd/cimx/sb800/ACPILIB.h index 73571f4273..442043a4fb 100644 --- a/src/vendorcode/amd/cimx/sb800/ACPILIB.h +++ b/src/vendorcode/amd/cimx/sb800/ACPILIB.h @@ -44,7 +44,7 @@ typedef struct _RSDP unsigned long long XsdtAddress; /* physical address of XSDT */ unsigned char ExtendedChecksum; /* chechsum of whole table */ unsigned char Reserved[3]; -} RSDP; +} RSDP_HEADER; /** diff --git a/src/vendorcode/amd/cimx/sb900/AcpiLib.c b/src/vendorcode/amd/cimx/sb900/AcpiLib.c index 2b8a38961b..845b34df12 100644 --- a/src/vendorcode/amd/cimx/sb900/AcpiLib.c +++ b/src/vendorcode/amd/cimx/sb900/AcpiLib.c @@ -61,7 +61,7 @@ ACPI_LocateTable ( // if ( *RsdPtr == ' DSR' && *(RsdPtr + 1) == ' RTP' ) { // if ( (*RsdPtr == 0x52534420) && (*(RsdPtr + 1) == 0x50545220) ) { if ( (*RsdPtr == 0x20445352) && (*(RsdPtr + 1) == 0x20525450) ) { - Rsdt = (UINT32*) (UINTN) ((RSDP*)RsdPtr)->RsdtAddress; + Rsdt = (UINT32*) (UINTN) ((RSDP_HEADER*)RsdPtr)->RsdtAddress; break; } RsdPtr += 4; diff --git a/src/vendorcode/amd/cimx/sb900/AcpiLib.h b/src/vendorcode/amd/cimx/sb900/AcpiLib.h index 63913c22e1..c604023736 100644 --- a/src/vendorcode/amd/cimx/sb900/AcpiLib.h +++ b/src/vendorcode/amd/cimx/sb900/AcpiLib.h @@ -40,7 +40,7 @@ typedef struct _RSDP { unsigned long long XsdtAddress; ///< physical address of XSDT unsigned char ExtendedChecksum; ///< chechsum of whole table unsigned char Reserved[3]; ///< Reserved -} RSDP; +} RSDP_HEADER; /// DESCRIPTION_HEADER - ACPI common table header