From 06ff7268f67d1345fd115fda0879d781eac2d6b1 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sat, 5 Jul 2014 15:24:50 +1000 Subject: AGESA: Fix error status code return type to enum from UINT32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AGESA correctly uses the enum AGESA_STATUS type whereas boards use a mess of UINT32 typecasts. Also no need to shout VOID. We are not that careful on changing all cases of VOID->void or whitespace issues as these files will get merged with follow-ups. Change-Id: I16ccfcc73cda6b917c7ff5fd42ee2cd04e7dc0dd Signed-off-by: Edward O'Callaghan Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6182 Tested-by: build bot (Jenkins) --- src/mainboard/amd/olivehill/agesawrapper.c | 82 ++++++++++-------------------- src/mainboard/amd/olivehill/agesawrapper.h | 30 +++++------ 2 files changed, 43 insertions(+), 69 deletions(-) (limited to 'src/mainboard/amd/olivehill') diff --git a/src/mainboard/amd/olivehill/agesawrapper.c b/src/mainboard/amd/olivehill/agesawrapper.c index 8e3cb611d7..b7b56ac187 100644 --- a/src/mainboard/amd/olivehill/agesawrapper.c +++ b/src/mainboard/amd/olivehill/agesawrapper.c @@ -56,10 +56,7 @@ VOID *AcpiWheaCmc = NULL; VOID *AcpiAlib = NULL; VOID *AcpiIvrs = NULL; -UINT32 -agesawrapper_amdinitcpuio ( - VOID - ) +AGESA_STATUS agesawrapper_amdinitcpuio(void) { AGESA_STATUS Status; UINT64 MsrReg; @@ -102,13 +99,10 @@ agesawrapper_amdinitcpuio ( PciData = 0x00000003; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; } -UINT32 -agesawrapper_amdinitmmio ( - VOID - ) +AGESA_STATUS agesawrapper_amdinitmmio(void) { AGESA_STATUS Status; UINT64 MsrReg; @@ -142,13 +136,10 @@ agesawrapper_amdinitmmio ( LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader); Status = AGESA_SUCCESS; - return (UINT32)Status; + return Status; } -UINT32 -agesawrapper_amdinitreset ( - VOID - ) +AGESA_STATUS agesawrapper_amdinitreset(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -182,13 +173,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 ( - VOID - ) +AGESA_STATUS agesawrapper_amdinitearly(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -214,13 +202,10 @@ agesawrapper_amdinitearly ( if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - return (UINT32)status; + return status; } -UINT32 -agesawrapper_amdinitpost ( - VOID - ) +AGESA_STATUS agesawrapper_amdinitpost(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -246,13 +231,10 @@ agesawrapper_amdinitpost ( /* Initialize heap space */ EmptyHeap(); - return (UINT32)status; + return status; } -UINT32 -agesawrapper_amdinitenv ( - VOID - ) +AGESA_STATUS agesawrapper_amdinitenv(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -279,7 +261,7 @@ agesawrapper_amdinitenv ( Modify D1F0x18 */ - return (UINT32)status; + return status; } VOID * @@ -309,10 +291,7 @@ agesawrapper_getlateinitptr ( } } -UINT32 -agesawrapper_amdinitmid ( - VOID - ) +AGESA_STATUS agesawrapper_amdinitmid(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -339,13 +318,10 @@ agesawrapper_amdinitmid ( 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; @@ -391,11 +367,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 +397,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 +435,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 +462,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID) } #endif -UINT32 agesawrapper_amds3laterestore (VOID) +AGESA_STATUS agesawrapper_amds3laterestore(void) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -523,14 +498,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 +541,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 +597,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 +627,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 cccb5c9e4b..9e4617dfab 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_ */ -- cgit v1.2.3