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/gizmosphere/gizmo/agesawrapper.c | 65 +++++++++++--------------- src/mainboard/gizmosphere/gizmo/agesawrapper.h | 26 +++++------ 2 files changed, 39 insertions(+), 52 deletions(-) (limited to 'src/mainboard/gizmosphere/gizmo') diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.c b/src/mainboard/gizmosphere/gizmo/agesawrapper.c index 4b29128ea8..c6ef79fd62 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 871982a606..8be803035c 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 -- cgit v1.2.3