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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13072 6f19259b-4bc3-4df7-8a09-765794883524

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

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf
index 7ce5a3838a10b2192565a71e7467da12494c52f4..b45c20b5b02364f4ca5b21bfbe6ffcd15a5bd832 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf
@@ -3,6 +3,7 @@
 #  Component description file for SysConfigArmRealViewEbLib module
 #  
 #  Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
+#
 #  This program and the accompanying materials
 #  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
@@ -17,7 +18,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SysConfigArmRealViewEbLib
   FILE_GUID                      = 46eddfa0-8de0-11e0-944b-0002a5d5c51b
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmPlatformSysConfigLib
   

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

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
index 05cb1cf932e5a9997ec75e74f6562d2c89469126..3dfa756ddb74014baad6d635700987877c42250a 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
@@ -3,6 +3,7 @@
 #  Component description file for ArmVExpressSysConfigLib module
 #  
 #  Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
+#
 #  This program and the accompanying materials
 #  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
@@ -17,7 +18,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ArmVExpressSysConfigLib
   FILE_GUID                      = a05b5cc0-82d2-11e0-82cb-0002a5d5c51b
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmPlatformSysConfigLib
   

diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformSysConfigLib.h b/ArmPlatformPkg/Include/Library/ArmPlatformSysConfigLib.h
index 626b9c912e04bbf5da2fd600480f2c1ec9938094..3c59bcc39017bbdff5755f4ec18e7f16351737f8 100644 (file)
--- a/ArmPlatformPkg/Include/Library/ArmPlatformSysConfigLib.h
+++ b/ArmPlatformPkg/Include/Library/ArmPlatformSysConfigLib.h
@@ -29,31 +29,31 @@ typedef UINT32  SYS_CONFIG_FUNCTION;
 //
 // Functions
 //
-EFI_STATUS
+RETURN_STATUS
 ArmPlatformSysConfigInitialize (
   VOID
   );
 
-EFI_STATUS
+RETURN_STATUS
 ArmPlatformSysConfigGet (
   IN  SYS_CONFIG_FUNCTION   Function,
   OUT UINT32*               Value
   );
 
-EFI_STATUS
+RETURN_STATUS
 ArmPlatformSysConfigGetValues (
   IN  SYS_CONFIG_FUNCTION   Function,
   IN  UINTN                 Size,
   OUT UINT32*               Values
   );
 
-EFI_STATUS
+RETURN_STATUS
 ArmPlatformSysConfigSet (
   IN  SYS_CONFIG_FUNCTION   Function,
   IN  UINT32                Value
   );
 
-EFI_STATUS
+RETURN_STATUS
 ArmPlatformSysConfigSetDevice (
   IN  SYS_CONFIG_FUNCTION   Function,
   IN  UINT32                Device,