Fix the issue in MdeModulePkg that mismatch between PCD type and the PCD Lib API...

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

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index adf36a5b77a2d4cd22af98bdec95e92fc1bdd2e6..ef0a5a2d398ba0cca5e045feb6b9189450b46856 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -2040,7 +2040,7 @@ CreatePciIoDevice (
                  );\r
     DEBUG ((EFI_D_INFO, "PCI-IOV B%x.D%x.F%x - SupportedPageSize - 0x%x\n", (UINTN)Bus, (UINTN)Device, (UINTN)Func, PciIoDevice->SystemPageSize));\r
 \r
-    PciIoDevice->SystemPageSize = (PcdGet32(PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);\r
+    PciIoDevice->SystemPageSize = (FixedPcdGet32(PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);\r
     ASSERT (PciIoDevice->SystemPageSize != 0);\r
 \r
     PciIo->Pci.Write (\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index b8a665cff57760ba7456f94544499e33fe96a73f..d4b5f38e020662a3889b1786faf54f6e31bb65c8 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -193,7 +193,7 @@ USBKeyboardDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardEnable),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardEnable),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -202,7 +202,7 @@ USBKeyboardDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -473,7 +473,7 @@ USBKeyboardDriverBindingStop (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardDisable),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardDisable),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -658,7 +658,7 @@ USBKeyboardReset (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardReset),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardReset),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -669,7 +669,7 @@ USBKeyboardReset (
   if (!ExtendedVerification) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_PROGRESS_CODE,\r
-      PcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),\r
+      FixedPcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),\r
       UsbKeyboardDevice->DevicePath\r
       );\r
     //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index 9636d4f2bc3a0ecdead3c3d43b4b610dd808de5a..a231bd6e3eff4d80b4bb238266f6eacf20fe7bf1 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -811,7 +811,7 @@ InitUSBKeyboard (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardSelfTest),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardSelfTest),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -846,7 +846,7 @@ InitUSBKeyboard (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueKeyboardInterfaceError),\r
+      FixedPcdGet32 (PcdStatusCodeValueKeyboardInterfaceError),\r
       UsbKeyboardDevice->DevicePath\r
       );\r
 \r
@@ -1012,7 +1012,7 @@ KeyboardHandler (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueKeyboardInputError),\r
+      FixedPcdGet32 (PcdStatusCodeValueKeyboardInputError),\r
       UsbKeyboardDevice->DevicePath\r
       );\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
index 2e22cfcda2433f2964525c57049ee4ca5c6a8bcc..5c39f49dd29607fe3d3d6f433211f710c7e55549 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
@@ -232,7 +232,7 @@ USBMouseAbsolutePointerDriverBindingStart (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueMouseInterfaceError),\r
+      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),\r
       UsbMouseAbsolutePointerDevice->DevicePath\r
       );\r
 \r
@@ -275,7 +275,7 @@ USBMouseAbsolutePointerDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueMouseEnable),\r
+    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),\r
     UsbMouseAbsolutePointerDevice->DevicePath\r
     );\r
 \r
@@ -401,7 +401,7 @@ USBMouseAbsolutePointerDriverBindingStop (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueMouseDisable),\r
+    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),\r
     UsbMouseAbsolutePointerDevice->DevicePath\r
     );\r
 \r
@@ -682,7 +682,7 @@ OnMouseInterruptComplete (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueMouseInputError),\r
+      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),\r
       UsbMouseAbsolutePointerDevice->DevicePath\r
       );\r
 \r
@@ -833,7 +833,7 @@ UsbMouseAbsolutePointerReset (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueMouseReset),\r
+    FixedPcdGet32 (PcdStatusCodeValueMouseReset),\r
     UsbMouseAbsolutePointerDevice->DevicePath\r
     );\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index f1b54084b78ce9e178fa3784777d422ef052efb5..667dd2f902eb7e51e8cbc410220c4e432766013d 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -232,7 +232,7 @@ USBMouseDriverBindingStart (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueMouseInterfaceError),\r
+      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),\r
       UsbMouseDevice->DevicePath\r
       );\r
 \r
@@ -275,7 +275,7 @@ USBMouseDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueMouseEnable),\r
+    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),\r
     UsbMouseDevice->DevicePath\r
     );\r
 \r
@@ -401,7 +401,7 @@ USBMouseDriverBindingStop (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueMouseDisable),\r
+    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),\r
     UsbMouseDevice->DevicePath\r
     );\r
 \r
@@ -688,7 +688,7 @@ OnMouseInterruptComplete (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueMouseInputError),\r
+      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),\r
       UsbMouseDevice->DevicePath\r
       );\r
 \r
@@ -838,7 +838,7 @@ UsbMouseReset (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueMouseReset),\r
+    FixedPcdGet32 (PcdStatusCodeValueMouseReset),\r
     UsbMouseDevice->DevicePath\r
     );\r
 \r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 3c9ed7c23545a194389374f613d1fefdb88a90d0..442e4d6caeb0d4b4ba7d60dea2e0d58cfc09c442 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -271,7 +271,7 @@ DxeLoadCore (
   //\r
   // Report Status Code EFI_SW_PEI_PC_HANDOFF_TO_NEXT\r
   //\r
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdStatusCodeValuePeiHandoffToDxe));\r
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValuePeiHandoffToDxe));\r
 \r
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DXE CORE at 0x%11p EntryPoint=0x%11p\n", (VOID *)(UINTN)DxeCoreAddress, FUNCTION_ENTRY_POINT (DxeCoreEntryPoint)));\r
 \r

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index b746221af4577d7b33cda1c8efcceea115c44b60..2f2a3a760290ff7c694ac3be7be2fc8d57eb8329 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
@@ -277,7 +277,7 @@ RuntimeDriverSetVirtualAddressMap (
   //\r
   // ReporstStatusCodeLib will check and make sure this service can be called in runtime mode.\r
   //\r
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdStatusCodeValueSetVirtualAddressMap));\r
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValueSetVirtualAddressMap));\r
 \r
   //\r
   // Signal all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE events.\r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index ca6d3445f8e229a0043b5c7c3ee9f8831193285a..e43acbf221cec9e0b114a27ee7e071598574d01a 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
@@ -66,7 +66,7 @@ WatchdogTimerDriverExpires (
   IN VOID         *Context\r
   )\r
 {\r
-  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, PcdGet32 (PcdStatusCodeValueEfiWatchDogTimerExpired));\r
+  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, FixedPcdGet32 (PcdStatusCodeValueEfiWatchDogTimerExpired));\r
 \r
   //\r
   // If a notification function has been registered, then call it\r