Patch set updated for coreboot: 8876d3b AGESA: Fix error status code return type to enum from UINT32
Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6182
-gerrit
commit 8876d3b62d198a2eadd7d90ffc23631e7458d7e9 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Sat Jul 5 15:24:50 2014 +1000
AGESA: Fix error status code return type to enum from UINT32
AGESA correctly uses the enum AGESA_STATUS type whereas boards use a mess of UINT32 typecasts.
Change-Id: I16ccfcc73cda6b917c7ff5fd42ee2cd04e7dc0dd Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/mainboard/amd/dinar/agesawrapper.c | 46 +++++++-------- src/mainboard/amd/dinar/agesawrapper.h | 20 +++---- src/mainboard/amd/inagua/agesawrapper.c | 50 +++++++--------- src/mainboard/amd/inagua/agesawrapper.h | 26 ++++----- src/mainboard/amd/olivehill/agesawrapper.c | 66 +++++++++------------- src/mainboard/amd/olivehill/agesawrapper.h | 30 +++++----- src/mainboard/amd/parmer/agesawrapper.c | 66 +++++++++------------- src/mainboard/amd/parmer/agesawrapper.h | 30 +++++----- src/mainboard/amd/persimmon/agesawrapper.c | 65 +++++++++------------ src/mainboard/amd/persimmon/agesawrapper.h | 30 +++++----- src/mainboard/amd/south_station/agesawrapper.c | 50 +++++++--------- src/mainboard/amd/south_station/agesawrapper.h | 26 ++++----- src/mainboard/amd/thatcher/agesawrapper.c | 66 +++++++++------------- src/mainboard/amd/thatcher/agesawrapper.h | 30 +++++----- src/mainboard/amd/torpedo/agesawrapper.c | 49 +++++++--------- src/mainboard/amd/torpedo/agesawrapper.h | 22 ++++---- src/mainboard/amd/union_station/agesawrapper.c | 50 +++++++--------- src/mainboard/amd/union_station/agesawrapper.h | 26 ++++----- src/mainboard/asrock/e350m1/agesawrapper.c | 50 +++++++--------- src/mainboard/asrock/e350m1/agesawrapper.h | 22 ++++---- src/mainboard/asrock/imb-a180/agesawrapper.c | 66 +++++++++------------- src/mainboard/asrock/imb-a180/agesawrapper.h | 30 +++++----- src/mainboard/asus/f2a85-m/agesawrapper.c | 66 +++++++++------------- src/mainboard/asus/f2a85-m/agesawrapper.h | 30 +++++----- src/mainboard/gizmosphere/gizmo/agesawrapper.c | 65 +++++++++------------ src/mainboard/gizmosphere/gizmo/agesawrapper.h | 26 ++++----- src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c | 61 +++++++++----------- src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h | 28 ++++----- src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h | 2 +- .../lippert/frontrunner-af/agesawrapper.c | 65 +++++++++------------ .../lippert/frontrunner-af/agesawrapper.h | 26 ++++----- src/mainboard/lippert/toucan-af/agesawrapper.c | 65 +++++++++------------ src/mainboard/lippert/toucan-af/agesawrapper.h | 26 ++++----- src/mainboard/supermicro/h8qgi/agesawrapper.c | 48 ++++++++-------- src/mainboard/supermicro/h8qgi/agesawrapper.h | 20 +++---- src/mainboard/supermicro/h8scm/agesawrapper.c | 48 ++++++++-------- src/mainboard/supermicro/h8scm/agesawrapper.h | 20 +++---- src/mainboard/tyan/s8226/agesawrapper.c | 49 ++++++++-------- src/mainboard/tyan/s8226/agesawrapper.h | 20 +++---- 39 files changed, 706 insertions(+), 875 deletions(-)
diff --git a/src/mainboard/amd/dinar/agesawrapper.c b/src/mainboard/amd/dinar/agesawrapper.c index f8a5803..782512d 100644 --- a/src/mainboard/amd/dinar/agesawrapper.c +++ b/src/mainboard/amd/dinar/agesawrapper.c @@ -195,11 +195,10 @@ static UINT32 amdinitcpuio(VOID) LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); } Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -248,11 +247,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20F, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -291,11 +289,10 @@ agesawrapper_amdinitreset ( status = AGESA_SUCCESS; #endif
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -323,7 +320,7 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; } /** * OemCustomizeInitEarly @@ -354,8 +351,7 @@ OemCustomizeInitPost ( InitPost->MemConfig.UmaSize = 0xE0-0xC0; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -386,11 +382,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -413,7 +408,7 @@ agesawrapper_amdinitenv ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -444,8 +439,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -474,11 +468,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate(VOID) +AGESA_STATUS agesawrapper_amdinitlate(VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -526,10 +519,10 @@ agesawrapper_amdinitlate(VOID) * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) { AGESA_STATUS Status; AP_EXE_PARAMS AmdLateParams; @@ -550,11 +543,10 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -578,5 +570,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/dinar/agesawrapper.h b/src/mainboard/amd/dinar/agesawrapper.h index b8b8db8..005b2ea 100644 --- a/src/mainboard/amd/dinar/agesawrapper.h +++ b/src/mainboard/amd/dinar/agesawrapper.h @@ -84,16 +84,16 @@ enum {
//void brazos_platform_stage(void); -UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (void); -UINT32 agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif diff --git a/src/mainboard/amd/inagua/agesawrapper.c b/src/mainboard/amd/inagua/agesawrapper.c index a375e84..49b96b5 100644 --- a/src/mainboard/amd/inagua/agesawrapper.c +++ b/src/mainboard/amd/inagua/agesawrapper.c @@ -47,8 +47,7 @@ VOID *AcpiWheaMce = NULL; VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL;
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -93,11 +92,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -143,11 +141,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -172,11 +169,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -201,11 +197,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -229,11 +224,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -327,7 +321,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -355,8 +349,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -381,11 +374,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -431,11 +423,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -459,11 +450,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -484,5 +474,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/inagua/agesawrapper.h b/src/mainboard/amd/inagua/agesawrapper.h index 6e15a25..df8f2b1 100644 --- a/src/mainboard/amd/inagua/agesawrapper.h +++ b/src/mainboard/amd/inagua/agesawrapper.h @@ -39,19 +39,19 @@ enum { PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); - -UINT32 agesawrapper_amdreadeventlog (void); - -UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); + +AGESA_STATUS agesawrapper_amdreadeventlog (void); + +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif diff --git a/src/mainboard/amd/olivehill/agesawrapper.c b/src/mainboard/amd/olivehill/agesawrapper.c index 8e3cb61..f4ea628 100644 --- a/src/mainboard/amd/olivehill/agesawrapper.c +++ b/src/mainboard/amd/olivehill/agesawrapper.c @@ -56,8 +56,7 @@ VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL; VOID *AcpiIvrs = NULL;
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -102,11 +101,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -142,11 +140,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -182,11 +179,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -214,11 +210,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -246,11 +241,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -279,7 +273,7 @@ agesawrapper_amdinitenv ( Modify D1F0x18 */
- return (UINT32)status; + return status; }
VOID * @@ -309,8 +303,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -339,11 +332,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -391,11 +383,10 @@ agesawrapper_amdinitlate ( (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);
/* AmdReleaseStruct (&AmdParamStruct); */ - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -422,11 +413,11 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitresume(VOID) +AGESA_STATUS agesawrapper_amdinitresume(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -460,11 +451,11 @@ UINT32 agesawrapper_amdinitresume(VOID) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
#ifndef __PRE_RAM__ -UINT32 agesawrapper_fchs3earlyrestore (VOID) +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -487,7 +478,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID) } #endif
-UINT32 agesawrapper_amds3laterestore (VOID) +AGESA_STATUS agesawrapper_amds3laterestore (VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -523,14 +514,14 @@ UINT32 agesawrapper_amds3laterestore (VOID) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__
extern UINT8 picr_data[0x54], intr_data[0x54];
-UINT32 agesawrapper_fchs3laterestore (VOID) +AGESA_STATUS agesawrapper_fchs3laterestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -566,7 +557,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)
#ifndef __PRE_RAM__
-UINT32 agesawrapper_amdS3Save(VOID) +AGESA_STATUS agesawrapper_amdS3Save(VOID) { AGESA_STATUS Status; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; @@ -622,13 +613,12 @@ UINT32 agesawrapper_amdS3Save(VOID)
AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; }
#endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( UINT8 HeapStatus ) { @@ -653,5 +643,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/olivehill/agesawrapper.h b/src/mainboard/amd/olivehill/agesawrapper.h index cccb5c9..f826d80 100644 --- a/src/mainboard/amd/olivehill/agesawrapper.h +++ b/src/mainboard/amd/olivehill/agesawrapper.h @@ -40,22 +40,22 @@ enum { PICK_IVRS, /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */ };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitcpuio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); -UINT32 agesawrapper_amdS3Save(VOID); -UINT32 agesawrapper_amdinitresume(VOID); -UINT32 agesawrapper_amds3laterestore (VOID); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); +AGESA_STATUS agesawrapper_amdS3Save(VOID); +AGESA_STATUS agesawrapper_amdinitresume (VOID); +AGESA_STATUS agesawrapper_amds3laterestore (VOID);
-UINT32 agesawrapper_fchs3earlyrestore (VOID); -UINT32 agesawrapper_fchs3laterestore (VOID); +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID); +AGESA_STATUS agesawrapper_fchs3laterestore (VOID);
#endif /* _AGESAWRAPPER_H_ */ diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c index 85c1474..c011242 100644 --- a/src/mainboard/amd/parmer/agesawrapper.c +++ b/src/mainboard/amd/parmer/agesawrapper.c @@ -56,8 +56,7 @@ VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL; VOID *AcpiIvrs = NULL;
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -102,11 +101,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -142,11 +140,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -182,11 +179,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -214,11 +210,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -247,11 +242,10 @@ agesawrapper_amdinitpost ( EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -280,7 +274,7 @@ agesawrapper_amdinitenv ( Modify D1F0x18 */
- return (UINT32)status; + return status; }
VOID * @@ -310,8 +304,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -340,11 +333,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -392,11 +384,10 @@ agesawrapper_amdinitlate ( (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);
/* AmdReleaseStruct (&AmdParamStruct); */ - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -423,11 +414,11 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitresume(VOID) +AGESA_STATUS agesawrapper_amdinitresume(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -461,11 +452,11 @@ UINT32 agesawrapper_amdinitresume(VOID) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
#ifndef __PRE_RAM__ -UINT32 agesawrapper_fchs3earlyrestore (VOID) +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -489,7 +480,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID) } #endif
-UINT32 agesawrapper_amds3laterestore (VOID) +AGESA_STATUS agesawrapper_amds3laterestore (VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -525,14 +516,14 @@ UINT32 agesawrapper_amds3laterestore (VOID) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__
extern UINT8 picr_data[0x54], intr_data[0x54];
-UINT32 agesawrapper_fchs3laterestore (VOID) +AGESA_STATUS agesawrapper_fchs3laterestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -569,7 +560,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)
#ifndef __PRE_RAM__
-UINT32 agesawrapper_amdS3Save(VOID) +AGESA_STATUS agesawrapper_amdS3Save(VOID) { AGESA_STATUS Status; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; @@ -625,13 +616,12 @@ UINT32 agesawrapper_amdS3Save(VOID)
AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; }
#endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( UINT8 HeapStatus ) { @@ -656,5 +646,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/parmer/agesawrapper.h b/src/mainboard/amd/parmer/agesawrapper.h index cccb5c9..f826d80 100644 --- a/src/mainboard/amd/parmer/agesawrapper.h +++ b/src/mainboard/amd/parmer/agesawrapper.h @@ -40,22 +40,22 @@ enum { PICK_IVRS, /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */ };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitcpuio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); -UINT32 agesawrapper_amdS3Save(VOID); -UINT32 agesawrapper_amdinitresume(VOID); -UINT32 agesawrapper_amds3laterestore (VOID); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); +AGESA_STATUS agesawrapper_amdS3Save(VOID); +AGESA_STATUS agesawrapper_amdinitresume (VOID); +AGESA_STATUS agesawrapper_amds3laterestore (VOID);
-UINT32 agesawrapper_fchs3earlyrestore (VOID); -UINT32 agesawrapper_fchs3laterestore (VOID); +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID); +AGESA_STATUS agesawrapper_fchs3laterestore (VOID);
#endif /* _AGESAWRAPPER_H_ */ diff --git a/src/mainboard/amd/persimmon/agesawrapper.c b/src/mainboard/amd/persimmon/agesawrapper.c index cfd0eee..b3a217a 100644 --- a/src/mainboard/amd/persimmon/agesawrapper.c +++ b/src/mainboard/amd/persimmon/agesawrapper.c @@ -46,8 +46,7 @@ VOID *AcpiWheaMce = NULL; VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL;
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -92,11 +91,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -142,11 +140,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -171,11 +168,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -200,11 +196,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -228,11 +223,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -326,7 +320,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -354,8 +348,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -380,11 +373,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -430,11 +422,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitresume ( +AGESA_STATUS agesawrapper_amdinitresume ( VOID ) { @@ -468,11 +459,10 @@ agesawrapper_amdinitresume ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amds3laterestore ( +AGESA_STATUS agesawrapper_amds3laterestore ( VOID ) { @@ -507,12 +497,11 @@ agesawrapper_amds3laterestore ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__ -UINT32 -agesawrapper_amdS3Save ( +AGESA_STATUS agesawrapper_amdS3Save ( VOID ) { @@ -561,12 +550,11 @@ agesawrapper_amdS3Save ( OemAgesaSaveMtrr(); AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; } #endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -590,11 +578,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -615,5 +602,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/persimmon/agesawrapper.h b/src/mainboard/amd/persimmon/agesawrapper.h index c16dab2..965b5d2 100644 --- a/src/mainboard/amd/persimmon/agesawrapper.h +++ b/src/mainboard/amd/persimmon/agesawrapper.h @@ -39,21 +39,21 @@ enum { PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); - -UINT32 agesawrapper_amdreadeventlog (void); - -UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitresume (void); -UINT32 agesawrapper_amdS3Save (void); -UINT32 agesawrapper_amds3laterestore (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); + +AGESA_STATUS agesawrapper_amdreadeventlog (void); + +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitresume (void); +AGESA_STATUS agesawrapper_amdS3Save (void); +AGESA_STATUS agesawrapper_amds3laterestore (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
#endif /* _AGESAWRAPPER_H_ */ diff --git a/src/mainboard/amd/south_station/agesawrapper.c b/src/mainboard/amd/south_station/agesawrapper.c index 7c8aab8..98dd09d 100644 --- a/src/mainboard/amd/south_station/agesawrapper.c +++ b/src/mainboard/amd/south_station/agesawrapper.c @@ -47,8 +47,7 @@ VOID *AcpiWheaMce = NULL; VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL;
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -93,11 +92,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -143,11 +141,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -172,11 +169,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -201,11 +197,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -229,11 +224,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -327,7 +321,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -355,8 +349,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -381,11 +374,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -426,11 +418,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -454,11 +445,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -479,5 +469,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/south_station/agesawrapper.h b/src/mainboard/amd/south_station/agesawrapper.h index 47332c5..ec731ad 100644 --- a/src/mainboard/amd/south_station/agesawrapper.h +++ b/src/mainboard/amd/south_station/agesawrapper.h @@ -39,19 +39,19 @@ enum { PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); - -UINT32 agesawrapper_amdreadeventlog (void); - -UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); + +AGESA_STATUS agesawrapper_amdreadeventlog (void); + +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif /* _AGESAWRAPPER_H_ */ diff --git a/src/mainboard/amd/thatcher/agesawrapper.c b/src/mainboard/amd/thatcher/agesawrapper.c index 7ab9e44..74a2321 100644 --- a/src/mainboard/amd/thatcher/agesawrapper.c +++ b/src/mainboard/amd/thatcher/agesawrapper.c @@ -56,8 +56,7 @@ VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL; VOID *AcpiIvrs = NULL;
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -102,11 +101,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -142,11 +140,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -180,11 +177,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -212,11 +208,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -244,11 +239,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -277,7 +271,7 @@ agesawrapper_amdinitenv ( Modify D1F0x18 */
- return (UINT32)status; + return status; }
VOID * @@ -307,8 +301,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -337,11 +330,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -389,11 +381,10 @@ agesawrapper_amdinitlate ( (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);
/* AmdReleaseStruct (&AmdParamStruct); */ - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -420,11 +411,11 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitresume(VOID) +AGESA_STATUS agesawrapper_amdinitresume(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -460,11 +451,11 @@ UINT32 agesawrapper_amdinitresume(VOID) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
#ifndef __PRE_RAM__ -UINT32 agesawrapper_fchs3earlyrestore (VOID) +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -487,7 +478,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID) } #endif
-UINT32 agesawrapper_amds3laterestore (VOID) +AGESA_STATUS agesawrapper_amds3laterestore (VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -525,14 +516,14 @@ UINT32 agesawrapper_amds3laterestore (VOID) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__
extern UINT8 picr_data[0x54], intr_data[0x54];
-UINT32 agesawrapper_fchs3laterestore (VOID) +AGESA_STATUS agesawrapper_fchs3laterestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -568,7 +559,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)
#ifndef __PRE_RAM__
-UINT32 agesawrapper_amdS3Save(VOID) +AGESA_STATUS agesawrapper_amdS3Save(VOID) { AGESA_STATUS Status; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; @@ -627,13 +618,12 @@ UINT32 agesawrapper_amdS3Save(VOID)
AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; }
#endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( UINT8 HeapStatus ) { @@ -658,5 +648,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/thatcher/agesawrapper.h b/src/mainboard/amd/thatcher/agesawrapper.h index cccb5c9..f826d80 100644 --- a/src/mainboard/amd/thatcher/agesawrapper.h +++ b/src/mainboard/amd/thatcher/agesawrapper.h @@ -40,22 +40,22 @@ enum { PICK_IVRS, /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */ };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitcpuio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); -UINT32 agesawrapper_amdS3Save(VOID); -UINT32 agesawrapper_amdinitresume(VOID); -UINT32 agesawrapper_amds3laterestore (VOID); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); +AGESA_STATUS agesawrapper_amdS3Save(VOID); +AGESA_STATUS agesawrapper_amdinitresume (VOID); +AGESA_STATUS agesawrapper_amds3laterestore (VOID);
-UINT32 agesawrapper_fchs3earlyrestore (VOID); -UINT32 agesawrapper_fchs3laterestore (VOID); +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID); +AGESA_STATUS agesawrapper_fchs3laterestore (VOID);
#endif /* _AGESAWRAPPER_H_ */ diff --git a/src/mainboard/amd/torpedo/agesawrapper.c b/src/mainboard/amd/torpedo/agesawrapper.c index 556c2a8..4088386 100644 --- a/src/mainboard/amd/torpedo/agesawrapper.c +++ b/src/mainboard/amd/torpedo/agesawrapper.c @@ -149,8 +149,7 @@ ClearAllSmiEnableInPmio ( Mmio32 (SmiMmioAddr, 0xC4) = 0x0; }
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -195,11 +194,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000013; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -259,11 +257,10 @@ agesawrapper_amdinitmmio ( //- ClearAllSmiEnableInPmio ();
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -296,11 +293,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -328,11 +324,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -359,11 +354,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -386,7 +380,7 @@ agesawrapper_amdinitenv ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -417,8 +411,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -446,11 +439,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -482,10 +474,10 @@ agesawrapper_amdinitlate ( AcpiWheaCmc = AmdLateParams.AcpiWheaCmc; AcpiAlib = AmdLateParams.AcpiAlib;
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) { AGESA_STATUS Status; AP_EXE_PARAMS ApExeParams; @@ -506,11 +498,10 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -534,5 +525,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/torpedo/agesawrapper.h b/src/mainboard/amd/torpedo/agesawrapper.h index 5947b6b..69f986c 100644 --- a/src/mainboard/amd/torpedo/agesawrapper.h +++ b/src/mainboard/amd/torpedo/agesawrapper.h @@ -82,18 +82,18 @@ enum { };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (void); -UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdreadeventlog (void); +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif diff --git a/src/mainboard/amd/union_station/agesawrapper.c b/src/mainboard/amd/union_station/agesawrapper.c index 7c8aab8..98dd09d 100644 --- a/src/mainboard/amd/union_station/agesawrapper.c +++ b/src/mainboard/amd/union_station/agesawrapper.c @@ -47,8 +47,7 @@ VOID *AcpiWheaMce = NULL; VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL;
-UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -93,11 +92,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -143,11 +141,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -172,11 +169,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -201,11 +197,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -229,11 +224,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -327,7 +321,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -355,8 +349,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -381,11 +374,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -426,11 +418,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -454,11 +445,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -479,5 +469,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/amd/union_station/agesawrapper.h b/src/mainboard/amd/union_station/agesawrapper.h index 47332c5..ec731ad 100644 --- a/src/mainboard/amd/union_station/agesawrapper.h +++ b/src/mainboard/amd/union_station/agesawrapper.h @@ -39,19 +39,19 @@ enum { PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ };
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); - -UINT32 agesawrapper_amdreadeventlog (void); - -UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); + +AGESA_STATUS agesawrapper_amdreadeventlog (void); + +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif /* _AGESAWRAPPER_H_ */ diff --git a/src/mainboard/asrock/e350m1/agesawrapper.c b/src/mainboard/asrock/e350m1/agesawrapper.c index 6e47880..0e1ce0a 100644 --- a/src/mainboard/asrock/e350m1/agesawrapper.c +++ b/src/mainboard/asrock/e350m1/agesawrapper.c @@ -76,8 +76,7 @@ VOID *AcpiAlib = NULL; * L O C A L F U N C T I O N S *------------------------------------------------------------------------------ */ -UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -122,11 +121,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -172,11 +170,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -201,11 +198,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -230,11 +226,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -258,11 +253,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -356,7 +350,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -384,8 +378,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -410,11 +403,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -455,11 +447,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -483,11 +474,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -508,5 +498,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/asrock/e350m1/agesawrapper.h b/src/mainboard/asrock/e350m1/agesawrapper.h index b503559..6d14b67 100644 --- a/src/mainboard/asrock/e350m1/agesawrapper.h +++ b/src/mainboard/asrock/e350m1/agesawrapper.h @@ -72,17 +72,17 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.c b/src/mainboard/asrock/imb-a180/agesawrapper.c index 083de3d..fcb9827 100644 --- a/src/mainboard/asrock/imb-a180/agesawrapper.c +++ b/src/mainboard/asrock/imb-a180/agesawrapper.c @@ -85,8 +85,7 @@ VOID *AcpiIvrs = NULL; * L O C A L F U N C T I O N S *--------------------------------------------------------------------------------------- */ -UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -131,11 +130,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -171,11 +169,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -211,11 +208,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -243,11 +239,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -275,11 +270,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -308,7 +302,7 @@ agesawrapper_amdinitenv ( Modify D1F0x18 */
- return (UINT32)status; + return status; }
VOID * @@ -338,8 +332,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -368,11 +361,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -420,11 +412,10 @@ agesawrapper_amdinitlate ( (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);
/* AmdReleaseStruct (&AmdParamStruct); */ - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -451,11 +442,11 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitresume(VOID) +AGESA_STATUS agesawrapper_amdinitresume(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -489,11 +480,11 @@ UINT32 agesawrapper_amdinitresume(VOID) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
#ifndef __PRE_RAM__ -UINT32 agesawrapper_fchs3earlyrestore (VOID) +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -516,7 +507,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID) } #endif
-UINT32 agesawrapper_amds3laterestore (VOID) +AGESA_STATUS agesawrapper_amds3laterestore (VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -552,14 +543,14 @@ UINT32 agesawrapper_amds3laterestore (VOID) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__
extern UINT8 picr_data[0x54], intr_data[0x54];
-UINT32 agesawrapper_fchs3laterestore (VOID) +AGESA_STATUS agesawrapper_fchs3laterestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -595,7 +586,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)
#ifndef __PRE_RAM__
-UINT32 agesawrapper_amdS3Save(VOID) +AGESA_STATUS agesawrapper_amdS3Save(VOID) { AGESA_STATUS Status; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; @@ -651,13 +642,12 @@ UINT32 agesawrapper_amdS3Save(VOID)
AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; }
#endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( UINT8 HeapStatus ) { @@ -682,5 +672,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.h b/src/mainboard/asrock/imb-a180/agesawrapper.h index 8589db5..60ec551 100644 --- a/src/mainboard/asrock/imb-a180/agesawrapper.h +++ b/src/mainboard/asrock/imb-a180/agesawrapper.h @@ -69,22 +69,22 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitcpuio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); -UINT32 agesawrapper_amdS3Save(VOID); -UINT32 agesawrapper_amdinitresume(VOID); -UINT32 agesawrapper_amds3laterestore (VOID); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); +AGESA_STATUS agesawrapper_amdS3Save(VOID); +AGESA_STATUS agesawrapper_amdinitresume (VOID); +AGESA_STATUS agesawrapper_amds3laterestore (VOID);
-UINT32 agesawrapper_fchs3earlyrestore (VOID); -UINT32 agesawrapper_fchs3laterestore (VOID); +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID); +AGESA_STATUS agesawrapper_fchs3laterestore (VOID);
#endif diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.c b/src/mainboard/asus/f2a85-m/agesawrapper.c index 2a3502a..46d24ad 100644 --- a/src/mainboard/asus/f2a85-m/agesawrapper.c +++ b/src/mainboard/asus/f2a85-m/agesawrapper.c @@ -76,8 +76,7 @@ VOID *AcpiIvrs = NULL; * L O C A L F U N C T I O N S *--------------------------------------------------------------------------------------- */ -UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -122,11 +121,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -155,11 +153,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -195,11 +192,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -227,11 +223,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -259,11 +254,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -292,7 +286,7 @@ agesawrapper_amdinitenv ( Modify D1F0x18 */
- return (UINT32)status; + return status; }
VOID * @@ -322,8 +316,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -352,11 +345,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -404,11 +396,10 @@ agesawrapper_amdinitlate ( (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);
/* AmdReleaseStruct (&AmdParamStruct); */ - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -435,11 +426,11 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitresume(VOID) +AGESA_STATUS agesawrapper_amdinitresume(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -475,11 +466,11 @@ UINT32 agesawrapper_amdinitresume(VOID) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
#ifndef __PRE_RAM__ -UINT32 agesawrapper_fchs3earlyrestore (VOID) +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -502,7 +493,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID) } #endif
-UINT32 agesawrapper_amds3laterestore (VOID) +AGESA_STATUS agesawrapper_amds3laterestore (VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -540,14 +531,14 @@ UINT32 agesawrapper_amds3laterestore (VOID) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__
extern UINT8 picr_data[0x54], intr_data[0x54];
-UINT32 agesawrapper_fchs3laterestore (VOID) +AGESA_STATUS agesawrapper_fchs3laterestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -583,7 +574,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)
#ifndef __PRE_RAM__
-UINT32 agesawrapper_amdS3Save(VOID) +AGESA_STATUS agesawrapper_amdS3Save(VOID) { AGESA_STATUS Status; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; @@ -642,13 +633,12 @@ UINT32 agesawrapper_amdS3Save(VOID)
AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; }
#endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( UINT8 HeapStatus ) { @@ -673,5 +663,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.h b/src/mainboard/asus/f2a85-m/agesawrapper.h index 4ae226d..5294562 100644 --- a/src/mainboard/asus/f2a85-m/agesawrapper.h +++ b/src/mainboard/asus/f2a85-m/agesawrapper.h @@ -68,22 +68,22 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitcpuio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); -UINT32 agesawrapper_amdS3Save(VOID); -UINT32 agesawrapper_amdinitresume(VOID); -UINT32 agesawrapper_amds3laterestore (VOID); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); +AGESA_STATUS agesawrapper_amdS3Save(VOID); +AGESA_STATUS agesawrapper_amdinitresume (VOID); +AGESA_STATUS agesawrapper_amds3laterestore (VOID);
-UINT32 agesawrapper_fchs3earlyrestore (VOID); -UINT32 agesawrapper_fchs3laterestore (VOID); +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID); +AGESA_STATUS agesawrapper_fchs3laterestore (VOID);
#endif diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.c b/src/mainboard/gizmosphere/gizmo/agesawrapper.c index 4b29128..c6ef79f 100755 --- a/src/mainboard/gizmosphere/gizmo/agesawrapper.c +++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.c @@ -66,8 +66,7 @@ VOID *AcpiAlib = NULL; * L O C A L F U N C T I O N S *------------------------------------------------------------------------------ */ -UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -112,11 +111,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -162,11 +160,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -191,11 +188,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -220,11 +216,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -248,11 +243,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -346,7 +340,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -374,8 +368,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -400,11 +393,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -450,11 +442,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitresume ( +AGESA_STATUS agesawrapper_amdinitresume ( VOID ) { @@ -488,11 +479,10 @@ agesawrapper_amdinitresume ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amds3laterestore ( +AGESA_STATUS agesawrapper_amds3laterestore ( VOID ) { @@ -527,12 +517,11 @@ agesawrapper_amds3laterestore ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__ -UINT32 -agesawrapper_amdS3Save ( +AGESA_STATUS agesawrapper_amdS3Save ( VOID ) { @@ -581,12 +570,11 @@ agesawrapper_amdS3Save ( OemAgesaSaveMtrr(); AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; } #endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -610,11 +598,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -635,5 +622,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.h b/src/mainboard/gizmosphere/gizmo/agesawrapper.h index 871982a..0e63e26 100755 --- a/src/mainboard/gizmosphere/gizmo/agesawrapper.h +++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.h @@ -69,21 +69,21 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (void); +AGESA_STATUS agesawrapper_amdreadeventlog (void);
-UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitresume (void); -UINT32 agesawrapper_amdS3Save (void); -UINT32 agesawrapper_amds3laterestore (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitresume (void); +AGESA_STATUS agesawrapper_amdS3Save (void); +AGESA_STATUS agesawrapper_amds3laterestore (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
#endif diff --git a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c index 23cdbfa..1e010d2 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c @@ -116,8 +116,7 @@ uint32_t agesawrapper_amdinitcpuio(void) return AGESA_SUCCESS; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -153,11 +152,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -193,11 +191,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -225,11 +222,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -257,11 +253,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -290,7 +285,7 @@ agesawrapper_amdinitenv ( Modify D1F0x18 */
- return (UINT32)status; + return status; }
VOID * @@ -320,8 +315,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -350,11 +344,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -402,11 +395,10 @@ agesawrapper_amdinitlate ( (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);
/* AmdReleaseStruct (&AmdParamStruct); */ - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -433,11 +425,11 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitresume(VOID) +AGESA_STATUS agesawrapper_amdinitresume(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -471,11 +463,11 @@ UINT32 agesawrapper_amdinitresume(VOID) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
#ifndef __PRE_RAM__ -UINT32 agesawrapper_fchs3earlyrestore (VOID) +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -499,7 +491,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID) } #endif
-UINT32 agesawrapper_amds3laterestore (VOID) +AGESA_STATUS agesawrapper_amds3laterestore (VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -535,14 +527,14 @@ UINT32 agesawrapper_amds3laterestore (VOID) ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__
extern UINT8 picr_data[0x54], intr_data[0x54];
-UINT32 agesawrapper_fchs3laterestore (VOID) +AGESA_STATUS agesawrapper_fchs3laterestore (VOID) { AGESA_STATUS status = AGESA_SUCCESS;
@@ -579,7 +571,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)
#ifndef __PRE_RAM__
-UINT32 agesawrapper_amdS3Save(VOID) +AGESA_STATUS agesawrapper_amdS3Save(VOID) { AGESA_STATUS Status; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; @@ -635,13 +627,12 @@ UINT32 agesawrapper_amdS3Save(VOID)
AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; }
#endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( UINT8 HeapStatus ) { @@ -666,5 +657,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h index 317e5e8..96ed141 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h +++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h @@ -68,22 +68,22 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); uint32_t agesawrapper_amdinitcpuio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); -UINT32 agesawrapper_amdS3Save(VOID); -UINT32 agesawrapper_amdinitresume(VOID); -UINT32 agesawrapper_amds3laterestore (VOID); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr); +AGESA_STATUS agesawrapper_amdS3Save(VOID); +AGESA_STATUS agesawrapper_amdinitresume (VOID); +AGESA_STATUS agesawrapper_amds3laterestore (VOID);
-UINT32 agesawrapper_fchs3earlyrestore (VOID); -UINT32 agesawrapper_fchs3laterestore (VOID); +AGESA_STATUS agesawrapper_fchs3earlyrestore (VOID); +AGESA_STATUS agesawrapper_fchs3laterestore (VOID);
#endif diff --git a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h index 720f3be..7f5b6bf 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h +++ b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h @@ -53,7 +53,7 @@ AGESA_STATUS agesawrapper_amdreadeventlog(void);
AGESA_STATUS agesawrapper_amdinitcpuio(void); AGESA_STATUS agesawrapper_amdinitmmio(void); -AGESA_STATUS agesawrapper_amdinitresume(void); +AGESA_STATUS agesawrapper_amdinitresume (void); AGESA_STATUS agesawrapper_amdS3Save(void); AGESA_STATUS agesawrapper_amds3laterestore(void); AGESA_STATUS agesawrapper_amdlaterunaptask(uint32_t, uint32_t, void *); diff --git a/src/mainboard/lippert/frontrunner-af/agesawrapper.c b/src/mainboard/lippert/frontrunner-af/agesawrapper.c index 99a32f4..4a0348d 100644 --- a/src/mainboard/lippert/frontrunner-af/agesawrapper.c +++ b/src/mainboard/lippert/frontrunner-af/agesawrapper.c @@ -65,8 +65,7 @@ VOID *AcpiAlib = NULL; * L O C A L F U N C T I O N S *------------------------------------------------------------------------------ */ -UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -111,11 +110,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -161,11 +159,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -190,11 +187,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -219,11 +215,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -247,11 +242,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -345,7 +339,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -373,8 +367,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -399,11 +392,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -449,11 +441,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitresume ( +AGESA_STATUS agesawrapper_amdinitresume ( VOID ) { @@ -487,11 +478,10 @@ agesawrapper_amdinitresume ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amds3laterestore ( +AGESA_STATUS agesawrapper_amds3laterestore ( VOID ) { @@ -526,12 +516,11 @@ agesawrapper_amds3laterestore ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__ -UINT32 -agesawrapper_amdS3Save ( +AGESA_STATUS agesawrapper_amdS3Save ( VOID ) { @@ -580,12 +569,11 @@ agesawrapper_amdS3Save ( OemAgesaSaveMtrr(); AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; } #endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -609,11 +597,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -634,5 +621,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/lippert/frontrunner-af/agesawrapper.h b/src/mainboard/lippert/frontrunner-af/agesawrapper.h index 8cdb71e..42cfdd3 100644 --- a/src/mainboard/lippert/frontrunner-af/agesawrapper.h +++ b/src/mainboard/lippert/frontrunner-af/agesawrapper.h @@ -68,21 +68,21 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (void); +AGESA_STATUS agesawrapper_amdreadeventlog (void);
-UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitresume (void); -UINT32 agesawrapper_amdS3Save (void); -UINT32 agesawrapper_amds3laterestore (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitresume (void); +AGESA_STATUS agesawrapper_amdS3Save (void); +AGESA_STATUS agesawrapper_amds3laterestore (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
#endif diff --git a/src/mainboard/lippert/toucan-af/agesawrapper.c b/src/mainboard/lippert/toucan-af/agesawrapper.c index 99a32f4..4a0348d 100644 --- a/src/mainboard/lippert/toucan-af/agesawrapper.c +++ b/src/mainboard/lippert/toucan-af/agesawrapper.c @@ -65,8 +65,7 @@ VOID *AcpiAlib = NULL; * L O C A L F U N C T I O N S *------------------------------------------------------------------------------ */ -UINT32 -agesawrapper_amdinitcpuio ( +AGESA_STATUS agesawrapper_amdinitcpuio ( VOID ) { @@ -111,11 +110,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -161,11 +159,10 @@ agesawrapper_amdinitmmio ( LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitreset ( +AGESA_STATUS agesawrapper_amdinitreset ( VOID ) { @@ -190,11 +187,10 @@ agesawrapper_amdinitreset ( status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitearly ( +AGESA_STATUS agesawrapper_amdinitearly ( VOID ) { @@ -219,11 +215,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitpost ( +AGESA_STATUS agesawrapper_amdinitpost ( VOID ) { @@ -247,11 +242,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap();
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitenv ( +AGESA_STATUS agesawrapper_amdinitenv ( VOID ) { @@ -345,7 +339,7 @@ agesawrapper_amdinitenv ( LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
VOID * @@ -373,8 +367,7 @@ agesawrapper_getlateinitptr ( } }
-UINT32 -agesawrapper_amdinitmid ( +AGESA_STATUS agesawrapper_amdinitmid ( VOID ) { @@ -399,11 +392,10 @@ agesawrapper_amdinitmid ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amdinitlate ( +AGESA_STATUS agesawrapper_amdinitlate ( VOID ) { @@ -449,11 +441,10 @@ agesawrapper_amdinitlate ( * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitresume ( +AGESA_STATUS agesawrapper_amdinitresume ( VOID ) { @@ -487,11 +478,10 @@ agesawrapper_amdinitresume ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 -agesawrapper_amds3laterestore ( +AGESA_STATUS agesawrapper_amds3laterestore ( VOID ) { @@ -526,12 +516,11 @@ agesawrapper_amds3laterestore ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
#ifndef __PRE_RAM__ -UINT32 -agesawrapper_amdS3Save ( +AGESA_STATUS agesawrapper_amdS3Save ( VOID ) { @@ -580,12 +569,11 @@ agesawrapper_amdS3Save ( OemAgesaSaveMtrr(); AmdReleaseStruct (&AmdInterfaceParams);
- return (UINT32)Status; + return Status; } #endif /* #ifndef __PRE_RAM__ */
-UINT32 -agesawrapper_amdlaterunaptask ( +AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func, UINT32 Data, VOID *ConfigPtr @@ -609,11 +597,10 @@ agesawrapper_amdlaterunaptask ( ASSERT(Status == AGESA_SUCCESS); }
- return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdreadeventlog ( +AGESA_STATUS agesawrapper_amdreadeventlog ( VOID ) { @@ -634,5 +621,5 @@ agesawrapper_amdreadeventlog ( Status = AmdReadEventLog (&AmdEventParams); }
- return (UINT32)Status; + return Status; } diff --git a/src/mainboard/lippert/toucan-af/agesawrapper.h b/src/mainboard/lippert/toucan-af/agesawrapper.h index 8cdb71e..42cfdd3 100644 --- a/src/mainboard/lippert/toucan-af/agesawrapper.h +++ b/src/mainboard/lippert/toucan-af/agesawrapper.h @@ -68,21 +68,21 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (void); +AGESA_STATUS agesawrapper_amdreadeventlog (void);
-UINT32 agesawrapper_amdinitcpuio (void); -UINT32 agesawrapper_amdinitmmio (void); -UINT32 agesawrapper_amdinitresume (void); -UINT32 agesawrapper_amdS3Save (void); -UINT32 agesawrapper_amds3laterestore (void); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdinitcpuio (void); +AGESA_STATUS agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitresume (void); +AGESA_STATUS agesawrapper_amdS3Save (void); +AGESA_STATUS agesawrapper_amds3laterestore (void); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); void *agesawrapper_getlateinitptr (int pick);
#endif diff --git a/src/mainboard/supermicro/h8qgi/agesawrapper.c b/src/mainboard/supermicro/h8qgi/agesawrapper.c index 95fcece..24e3ee7 100644 --- a/src/mainboard/supermicro/h8qgi/agesawrapper.c +++ b/src/mainboard/supermicro/h8qgi/agesawrapper.c @@ -78,7 +78,7 @@ VOID *AcpiAlib = NULL; */ extern VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly);
-static UINT32 agesawrapper_amdinitcpuio(VOID) +static AGESA_STATUS agesawrapper_amdinitcpuio(VOID) { AGESA_STATUS Status; UINT32 PciData; @@ -169,10 +169,10 @@ static UINT32 agesawrapper_amdinitcpuio(VOID) }
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitmmio(VOID) +AGESA_STATUS agesawrapper_amdinitmmio(VOID) { AGESA_STATUS Status; UINT64 MsrReg; @@ -199,7 +199,7 @@ UINT32 agesawrapper_amdinitmmio(VOID) LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
UINT32 agesawrapper_amdinitreset(VOID) @@ -228,7 +228,7 @@ UINT32 agesawrapper_amdinitreset(VOID) AmdParamStruct.StdHeader.ImageBasePtr = 0; status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } AmdResetParams.HtConfig.Depth = 0;
@@ -241,10 +241,10 @@ UINT32 agesawrapper_amdinitreset(VOID) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct(&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitearly(VOID) +AGESA_STATUS agesawrapper_amdinitearly(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -265,7 +265,7 @@ UINT32 agesawrapper_amdinitearly(VOID) AmdParamStruct.StdHeader.ImageBasePtr = 0; status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; }
AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr; @@ -280,10 +280,10 @@ UINT32 agesawrapper_amdinitearly(VOID) printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
AmdReleaseStruct(&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitpost(VOID) +AGESA_STATUS agesawrapper_amdinitpost(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -305,7 +305,7 @@ UINT32 agesawrapper_amdinitpost(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr; status = AmdInitPost(PostParams); @@ -321,10 +321,10 @@ UINT32 agesawrapper_amdinitpost(VOID) FamilySpecificServices->GetTscRate (FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader); printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitenv(VOID) +AGESA_STATUS agesawrapper_amdinitenv(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -344,7 +344,7 @@ UINT32 agesawrapper_amdinitenv(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } EnvParams = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr; status = AmdInitEnv(EnvParams); @@ -352,7 +352,7 @@ UINT32 agesawrapper_amdinitenv(VOID) agesawrapper_amdreadeventlog(EnvParams->StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); - return (UINT32)status; + return status; }
VOID * agesawrapper_getlateinitptr(int pick) @@ -382,7 +382,7 @@ VOID * agesawrapper_getlateinitptr(int pick) return NULL; }
-UINT32 agesawrapper_amdinitmid(VOID) +AGESA_STATUS agesawrapper_amdinitmid(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -404,17 +404,17 @@ UINT32 agesawrapper_amdinitmid(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } status = AmdInitMid((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct(&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitlate(VOID) +AGESA_STATUS agesawrapper_amdinitlate(VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -460,14 +460,14 @@ UINT32 agesawrapper_amdinitlate(VOID) * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
/** * @param[in] UINTN ApicIdOfCore, * @param[in] AP_EXE_PARAMS *LaunchApParams */ -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) { AGESA_STATUS Status; AMD_LATE_PARAMS AmdLateParams; @@ -490,7 +490,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) ASSERT(Status <= AGESA_UNSUPPORTED); }
- return (UINT32)Status; + return Status; }
/** @@ -1152,7 +1152,7 @@ static void interpret_agesa_eventlog(EVENT_PARAMS *event) /** * @param HeapStatus -the current HeapStatus */ -UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus) +AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus) { printk(BIOS_DEBUG, "enter in %s\n", __func__); AGESA_STATUS Status; @@ -1185,6 +1185,6 @@ UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus) }
printk(BIOS_DEBUG, "exit %s \n", __func__); - return (UINT32)Status; + return Status; }
diff --git a/src/mainboard/supermicro/h8qgi/agesawrapper.h b/src/mainboard/supermicro/h8qgi/agesawrapper.h index 51e438d..17de116 100644 --- a/src/mainboard/supermicro/h8qgi/agesawrapper.h +++ b/src/mainboard/supermicro/h8qgi/agesawrapper.h @@ -68,16 +68,16 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.c b/src/mainboard/supermicro/h8scm/agesawrapper.c index e26dc75..9679fd9 100644 --- a/src/mainboard/supermicro/h8scm/agesawrapper.c +++ b/src/mainboard/supermicro/h8scm/agesawrapper.c @@ -78,7 +78,7 @@ VOID *AcpiAlib = NULL; */ extern VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly);
-static UINT32 agesawrapper_amdinitcpuio(VOID) +static AGESA_STATUS agesawrapper_amdinitcpuio(VOID) { AGESA_STATUS Status; UINT32 PciData; @@ -169,10 +169,10 @@ static UINT32 agesawrapper_amdinitcpuio(VOID) }
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 agesawrapper_amdinitmmio(VOID) +AGESA_STATUS agesawrapper_amdinitmmio(VOID) { AGESA_STATUS Status; UINT64 MsrReg; @@ -199,7 +199,7 @@ UINT32 agesawrapper_amdinitmmio(VOID) LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
UINT32 agesawrapper_amdinitreset(VOID) @@ -228,7 +228,7 @@ UINT32 agesawrapper_amdinitreset(VOID) AmdParamStruct.StdHeader.ImageBasePtr = 0; status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } AmdResetParams.HtConfig.Depth = 0;
@@ -241,10 +241,10 @@ UINT32 agesawrapper_amdinitreset(VOID) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct(&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitearly(VOID) +AGESA_STATUS agesawrapper_amdinitearly(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -265,7 +265,7 @@ UINT32 agesawrapper_amdinitearly(VOID) AmdParamStruct.StdHeader.ImageBasePtr = 0; status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; }
AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr; @@ -280,10 +280,10 @@ UINT32 agesawrapper_amdinitearly(VOID) printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
AmdReleaseStruct(&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitpost(VOID) +AGESA_STATUS agesawrapper_amdinitpost(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -305,7 +305,7 @@ UINT32 agesawrapper_amdinitpost(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr; status = AmdInitPost(PostParams); @@ -321,10 +321,10 @@ UINT32 agesawrapper_amdinitpost(VOID) FamilySpecificServices->GetTscRate (FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader); printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitenv(VOID) +AGESA_STATUS agesawrapper_amdinitenv(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -344,7 +344,7 @@ UINT32 agesawrapper_amdinitenv(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } EnvParams = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr; status = AmdInitEnv(EnvParams); @@ -352,7 +352,7 @@ UINT32 agesawrapper_amdinitenv(VOID) agesawrapper_amdreadeventlog(EnvParams->StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); - return (UINT32)status; + return status; }
VOID * agesawrapper_getlateinitptr(int pick) @@ -382,7 +382,7 @@ VOID * agesawrapper_getlateinitptr(int pick) return NULL; }
-UINT32 agesawrapper_amdinitmid(VOID) +AGESA_STATUS agesawrapper_amdinitmid(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -404,17 +404,17 @@ UINT32 agesawrapper_amdinitmid(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } status = AmdInitMid((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct(&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitlate(VOID) +AGESA_STATUS agesawrapper_amdinitlate(VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -460,14 +460,14 @@ UINT32 agesawrapper_amdinitlate(VOID) * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
/** * @param[in] UINTN ApicIdOfCore, * @param[in] AP_EXE_PARAMS *LaunchApParams */ -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) { AGESA_STATUS Status; AMD_LATE_PARAMS AmdLateParams; @@ -490,7 +490,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) ASSERT(Status <= AGESA_UNSUPPORTED); }
- return (UINT32)Status; + return Status; }
/** @@ -1152,7 +1152,7 @@ static void interpret_agesa_eventlog(EVENT_PARAMS *event) /** * @param HeapStatus -the current HeapStatus */ -UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus) +AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus) { printk(BIOS_DEBUG, "enter in %s\n", __func__); AGESA_STATUS Status; @@ -1185,6 +1185,6 @@ UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus) }
printk(BIOS_DEBUG, "exit %s \n", __func__); - return (UINT32)Status; + return Status; }
diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.h b/src/mainboard/supermicro/h8scm/agesawrapper.h index 51e438d..17de116 100644 --- a/src/mainboard/supermicro/h8scm/agesawrapper.h +++ b/src/mainboard/supermicro/h8scm/agesawrapper.h @@ -68,16 +68,16 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif diff --git a/src/mainboard/tyan/s8226/agesawrapper.c b/src/mainboard/tyan/s8226/agesawrapper.c index 0a68979..9f622be 100644 --- a/src/mainboard/tyan/s8226/agesawrapper.c +++ b/src/mainboard/tyan/s8226/agesawrapper.c @@ -78,7 +78,7 @@ VOID *AcpiAlib = NULL; */ extern VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly);
-static UINT32 agesawrapper_amdinitcpuio(VOID) +static AGESA_STATUS agesawrapper_amdinitcpuio(VOID) { AGESA_STATUS Status; UINT32 PciData; @@ -169,11 +169,10 @@ static UINT32 agesawrapper_amdinitcpuio(VOID) }
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
-UINT32 -agesawrapper_amdinitmmio ( +AGESA_STATUS agesawrapper_amdinitmmio ( VOID ) { @@ -209,7 +208,7 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; }
UINT32 agesawrapper_amdinitreset(VOID) @@ -238,7 +237,7 @@ UINT32 agesawrapper_amdinitreset(VOID) AmdParamStruct.StdHeader.ImageBasePtr = 0; status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } AmdResetParams.HtConfig.Depth = 0;
@@ -251,10 +250,10 @@ UINT32 agesawrapper_amdinitreset(VOID) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct(&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitearly(VOID) +AGESA_STATUS agesawrapper_amdinitearly(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -275,7 +274,7 @@ UINT32 agesawrapper_amdinitearly(VOID) AmdParamStruct.StdHeader.ImageBasePtr = 0; status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; }
AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr; @@ -290,10 +289,10 @@ UINT32 agesawrapper_amdinitearly(VOID) printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
AmdReleaseStruct(&AmdParamStruct); - return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitpost(VOID) +AGESA_STATUS agesawrapper_amdinitpost(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -315,7 +314,7 @@ UINT32 agesawrapper_amdinitpost(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr; status = AmdInitPost(PostParams); @@ -331,10 +330,10 @@ UINT32 agesawrapper_amdinitpost(VOID) FamilySpecificServices->GetTscRate (FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader); printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitenv(VOID) +AGESA_STATUS agesawrapper_amdinitenv(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -354,7 +353,7 @@ UINT32 agesawrapper_amdinitenv(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } EnvParams = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr; status = AmdInitEnv(EnvParams); @@ -362,7 +361,7 @@ UINT32 agesawrapper_amdinitenv(VOID) agesawrapper_amdreadeventlog(EnvParams->StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); - return (UINT32)status; + return status; }
VOID * agesawrapper_getlateinitptr(int pick) @@ -392,7 +391,7 @@ VOID * agesawrapper_getlateinitptr(int pick) return NULL; }
-UINT32 agesawrapper_amdinitmid(VOID) +AGESA_STATUS agesawrapper_amdinitmid(VOID) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -414,17 +413,17 @@ UINT32 agesawrapper_amdinitmid(VOID)
status = AmdCreateStruct(&AmdParamStruct); if (status != AGESA_SUCCESS) { - return (UINT32)status; + return status; } status = AmdInitMid((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct(&AmdParamStruct);
- return (UINT32)status; + return status; }
-UINT32 agesawrapper_amdinitlate(VOID) +AGESA_STATUS agesawrapper_amdinitlate(VOID) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -470,14 +469,14 @@ UINT32 agesawrapper_amdinitlate(VOID) * AmdReleaseStruct (&AmdLateParams); */
- return (UINT32)Status; + return Status; }
/** * @param[in] UINTN ApicIdOfCore, * @param[in] AP_EXE_PARAMS *LaunchApParams */ -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) { AGESA_STATUS Status; AMD_LATE_PARAMS AmdLateParams; @@ -500,7 +499,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr) ASSERT(Status <= AGESA_UNSUPPORTED); }
- return (UINT32)Status; + return Status; }
/** @@ -1162,7 +1161,7 @@ static void interpret_agesa_eventlog(EVENT_PARAMS *event) /** * @param HeapStatus -the current HeapStatus */ -UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus) +AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus) { printk(BIOS_DEBUG, "enter in %s\n", __func__); AGESA_STATUS Status; @@ -1195,6 +1194,6 @@ UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus) }
printk(BIOS_DEBUG, "exit %s \n", __func__); - return (UINT32)Status; + return Status; }
diff --git a/src/mainboard/tyan/s8226/agesawrapper.h b/src/mainboard/tyan/s8226/agesawrapper.h index 51e438d..17de116 100644 --- a/src/mainboard/tyan/s8226/agesawrapper.h +++ b/src/mainboard/tyan/s8226/agesawrapper.h @@ -68,16 +68,16 @@ enum { *--------------------------------------------------------------------------------------- */
-UINT32 agesawrapper_amdinitreset (void); -UINT32 agesawrapper_amdinitearly (void); -UINT32 agesawrapper_amdinitenv (void); -UINT32 agesawrapper_amdinitlate (void); -UINT32 agesawrapper_amdinitpost (void); -UINT32 agesawrapper_amdinitmid (void); -UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus); -UINT32 agesawrapper_amdinitmmio (void); +AGESA_STATUS agesawrapper_amdinitreset (void); +AGESA_STATUS agesawrapper_amdinitearly (void); +AGESA_STATUS agesawrapper_amdinitenv (void); +AGESA_STATUS agesawrapper_amdinitlate (void); +AGESA_STATUS agesawrapper_amdinitpost (void); +AGESA_STATUS agesawrapper_amdinitmid (void); +AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus); +AGESA_STATUS agesawrapper_amdinitmmio (void); void *agesawrapper_getlateinitptr (int pick); -UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); +AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; } +static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; } #endif
-
Edward O'Callaghan