ArmPkg/ArmGic: Moved ArmGicDisableDistributor() to ArmGicLib.c

The implementation is the same when we run in Secure or Non-Secure world.
This change makes this function available for ArmGicSec.inf and ArmGicNonSec.inf.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15625 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
index 0fe62f2f536a35da3c1beea4c610d41db199c3f1..c0f3bfb4c2ff13dc1a0e1047650c093115145527 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
@@ -12,10 +12,9 @@
 *\r
 **/\r
 \r
-#include <Uefi.h>\r
-#include <Library/IoLib.h>\r
+#include <Base.h>\r
 #include <Library/ArmGicLib.h>\r
-#include <Library/PcdLib.h>\r
+#include <Library/IoLib.h>\r
 \r
 UINTN\r
 EFIAPI\r
@@ -120,3 +119,13 @@ ArmGicIsInterruptEnabled (
 \r
   return ((MmioRead32 (GicDistributorBase + ARM_GIC_ICDISER + (4 * RegOffset)) & (1 << RegShift)) != 0);\r
 }\r
+\r
+VOID\r
+EFIAPI\r
+ArmGicDisableDistributor (\r
+  IN  INTN          GicDistributorBase\r
+  )\r
+{\r
+  // Disable Gic Distributor\r
+  MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x0);\r
+}\r

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c b/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c
index 0bbc509550caef3a812b547e1a24d1dd604512bb..3ff9b4888c71b200ecd8c2edb6e91ad56980fabe 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 *\r
-*  Copyright (c) 2014, ARM Limited. All rights reserved.\r
+*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 *\r
 *  This program and the accompanying materials\r
 *  are licensed and made available under the terms and conditions of the BSD License\r
@@ -53,13 +53,3 @@ ArmGicEnableDistributor (
    */\r
   MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x1);\r
 }\r
-\r
-VOID\r
-EFIAPI\r
-ArmGicDisableDistributor (\r
-  IN  INTN          GicDistributorBase\r
-  )\r
-{\r
-  // Disable Gic Distributor\r
-  MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x0);\r
-}\r