ArmPlatformPkg/ArmPlatformSysConfigLib: Removed dependency on Uefi.h since it is a Base Library

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13072 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin 2012-02-29 17:21:17 +00:00
parent 051e63bb55
commit af0283b82b
5 changed files with 46 additions and 43 deletions

View File

@ -1,6 +1,6 @@
/** @file SysCfgArmPlatform.c /** @file SysConfigArmRealViewEb.c
Copyright (c) 2011, ARM Ltd. All rights reserved.<BR> Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -11,7 +11,7 @@
**/ **/
#include <PiDxe.h> #include <Base.h>
#include <Library/IoLib.h> #include <Library/IoLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
@ -25,70 +25,70 @@
* *
****************************************************************************/ ****************************************************************************/
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigInitialize ( ArmPlatformSysConfigInitialize (
VOID VOID
) )
{ {
return EFI_SUCCESS; return RETURN_SUCCESS;
} }
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigGet ( ArmPlatformSysConfigGet (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
OUT UINT32* Value OUT UINT32* Value
) )
{ {
EFI_STATUS Status; RETURN_STATUS Status;
Status = EFI_SUCCESS; Status = RETURN_SUCCESS;
// Intercept some functions // Intercept some functions
switch(Function) { switch(Function) {
default: default:
Status = EFI_UNSUPPORTED; Status = RETURN_UNSUPPORTED;
} }
return Status; return Status;
} }
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigSet ( ArmPlatformSysConfigSet (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINT32 Value IN UINT32 Value
) )
{ {
EFI_STATUS Status; RETURN_STATUS Status;
Status = EFI_SUCCESS; Status = RETURN_SUCCESS;
// Intercept some functions // Intercept some functions
switch(Function) { switch(Function) {
default: default:
Status = EFI_UNSUPPORTED; Status = RETURN_UNSUPPORTED;
} }
return Status; return Status;
} }
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigSetDevice ( ArmPlatformSysConfigSetDevice (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINT32 Device, IN UINT32 Device,
IN UINT32 Value IN UINT32 Value
) )
{ {
EFI_STATUS Status; RETURN_STATUS Status;
Status = EFI_SUCCESS; Status = RETURN_SUCCESS;
// Intercept some functions // Intercept some functions
switch(Function) { switch(Function) {
default: default:
Status = EFI_UNSUPPORTED; Status = RETURN_UNSUPPORTED;
} }
return Status; return Status;

View File

@ -3,6 +3,7 @@
# Component description file for SysConfigArmRealViewEbLib module # Component description file for SysConfigArmRealViewEbLib module
# #
# Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR> # Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
#
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
@ -17,7 +18,7 @@
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = SysConfigArmRealViewEbLib BASE_NAME = SysConfigArmRealViewEbLib
FILE_GUID = 46eddfa0-8de0-11e0-944b-0002a5d5c51b FILE_GUID = 46eddfa0-8de0-11e0-944b-0002a5d5c51b
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = ArmPlatformSysConfigLib LIBRARY_CLASS = ArmPlatformSysConfigLib

View File

@ -1,6 +1,7 @@
/** @file SysCfgArmVExpress.c /** @file ArmVExpressSysConfig.c
Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -11,7 +12,7 @@
**/ **/
#include <PiDxe.h> #include <Base.h>
#include <Library/IoLib.h> #include <Library/IoLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
@ -42,12 +43,12 @@
* *
****************************************************************************/ ****************************************************************************/
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigInitialize ( ArmPlatformSysConfigInitialize (
VOID VOID
) )
{ {
return EFI_SUCCESS; return RETURN_SUCCESS;
} }
/*************************************** /***************************************
@ -59,7 +60,7 @@ ArmPlatformSysConfigInitialize (
* for setting and for reading out values * for setting and for reading out values
***************************************/ ***************************************/
EFI_STATUS RETURN_STATUS
AccessSysCfgRegister ( AccessSysCfgRegister (
IN UINT32 ReadWrite, IN UINT32 ReadWrite,
IN UINT32 Function, IN UINT32 Function,
@ -89,7 +90,7 @@ AccessSysCfgRegister (
// Check for errors // Check for errors
if(MmioRead32(ARM_VE_SYS_CFGSTAT_REG) & SYS_CFGSTAT_ERROR) { if(MmioRead32(ARM_VE_SYS_CFGSTAT_REG) & SYS_CFGSTAT_ERROR) {
return EFI_DEVICE_ERROR; return RETURN_DEVICE_ERROR;
} }
// If reading then get the data value // If reading then get the data value
@ -97,10 +98,10 @@ AccessSysCfgRegister (
*Data = MmioRead32(ARM_VE_SYS_CFGDATA_REG); *Data = MmioRead32(ARM_VE_SYS_CFGDATA_REG);
} }
return EFI_SUCCESS; return RETURN_SUCCESS;
} }
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigGet ( ArmPlatformSysConfigGet (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
OUT UINT32* Value OUT UINT32* Value
@ -145,23 +146,23 @@ ArmPlatformSysConfigGet (
case SYS_CFG_REBOOT: case SYS_CFG_REBOOT:
case SYS_CFG_RTC: case SYS_CFG_RTC:
default: default:
return EFI_UNSUPPORTED; return RETURN_UNSUPPORTED;
} }
return AccessSysCfgRegister (SYS_CFGCTRL_READ, Function, Site, Position, Device, Value); return AccessSysCfgRegister (SYS_CFGCTRL_READ, Function, Site, Position, Device, Value);
} }
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigGetValues ( ArmPlatformSysConfigGetValues (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINTN Size, IN UINTN Size,
OUT UINT32* Values OUT UINT32* Values
) )
{ {
return EFI_UNSUPPORTED; return RETURN_UNSUPPORTED;
} }
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigSet ( ArmPlatformSysConfigSet (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINT32 Value IN UINT32 Value
@ -206,13 +207,13 @@ ArmPlatformSysConfigSet (
case SYS_CFG_TEMP: case SYS_CFG_TEMP:
case SYS_CFG_RTC: case SYS_CFG_RTC:
default: default:
return(EFI_UNSUPPORTED); return RETURN_UNSUPPORTED;
} }
return AccessSysCfgRegister (SYS_CFGCTRL_WRITE, Function, Site, Position, Device, &Value); return AccessSysCfgRegister (SYS_CFGCTRL_WRITE, Function, Site, Position, Device, &Value);
} }
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigSetDevice ( ArmPlatformSysConfigSetDevice (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINT32 Device, IN UINT32 Device,
@ -229,10 +230,10 @@ ArmPlatformSysConfigSetDevice (
case SYS_CFG_SCC: case SYS_CFG_SCC:
#ifdef ARM_VE_SCC_BASE #ifdef ARM_VE_SCC_BASE
MmioWrite32 ((ARM_VE_SCC_BASE + (Device * 4)),Value); MmioWrite32 ((ARM_VE_SCC_BASE + (Device * 4)),Value);
return EFI_SUCCESS; return RETURN_SUCCESS;
#else #else
// There is no System Configuration Controller on the Model // There is no System Configuration Controller on the Model
return EFI_UNSUPPORTED; return RETURN_UNSUPPORTED;
#endif #endif
case SYS_CFG_OSC_SITE1: case SYS_CFG_OSC_SITE1:
@ -250,7 +251,7 @@ ArmPlatformSysConfigSetDevice (
break; break;
case SYS_CFG_RTC: case SYS_CFG_RTC:
return(EFI_UNSUPPORTED); return RETURN_UNSUPPORTED;
//break; //break;
case SYS_CFG_OSC: case SYS_CFG_OSC:
@ -265,7 +266,7 @@ ArmPlatformSysConfigSetDevice (
Site = ARM_VE_MOTHERBOARD_SITE; Site = ARM_VE_MOTHERBOARD_SITE;
break; break;
default: default:
return EFI_UNSUPPORTED; return RETURN_UNSUPPORTED;
} }
return AccessSysCfgRegister (SYS_CFGCTRL_WRITE, Function, Site, Position, Device, &Value); return AccessSysCfgRegister (SYS_CFGCTRL_WRITE, Function, Site, Position, Device, &Value);

View File

@ -3,6 +3,7 @@
# Component description file for ArmVExpressSysConfigLib module # Component description file for ArmVExpressSysConfigLib module
# #
# Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR> # Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
#
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
@ -17,7 +18,7 @@
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = ArmVExpressSysConfigLib BASE_NAME = ArmVExpressSysConfigLib
FILE_GUID = a05b5cc0-82d2-11e0-82cb-0002a5d5c51b FILE_GUID = a05b5cc0-82d2-11e0-82cb-0002a5d5c51b
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = ArmPlatformSysConfigLib LIBRARY_CLASS = ArmPlatformSysConfigLib

View File

@ -29,31 +29,31 @@ typedef UINT32 SYS_CONFIG_FUNCTION;
// //
// Functions // Functions
// //
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigInitialize ( ArmPlatformSysConfigInitialize (
VOID VOID
); );
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigGet ( ArmPlatformSysConfigGet (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
OUT UINT32* Value OUT UINT32* Value
); );
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigGetValues ( ArmPlatformSysConfigGetValues (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINTN Size, IN UINTN Size,
OUT UINT32* Values OUT UINT32* Values
); );
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigSet ( ArmPlatformSysConfigSet (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINT32 Value IN UINT32 Value
); );
EFI_STATUS RETURN_STATUS
ArmPlatformSysConfigSetDevice ( ArmPlatformSysConfigSetDevice (
IN SYS_CONFIG_FUNCTION Function, IN SYS_CONFIG_FUNCTION Function,
IN UINT32 Device, IN UINT32 Device,