Remove reference to PCDs of status code value. Use macros introduced in PI1.2 instead.

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

9 files changed, 26 insertions, 55 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index d4b5f38e02..0716830989 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -2,7 +2,7 @@
   USB Keyboard Driver that manages USB keyboard and produces Simple Text Input

   Protocol and Simple Text Input Ex Protocol.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 2010, Intel Corporation

 All rights reserved. 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

@@ -193,7 +193,7 @@ USBKeyboardDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardEnable),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_ENABLE),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -202,7 +202,7 @@ USBKeyboardDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -473,7 +473,7 @@ USBKeyboardDriverBindingStop (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardDisable),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_DISABLE),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -658,7 +658,7 @@ USBKeyboardReset (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardReset),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_RESET),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -669,7 +669,7 @@ USBKeyboardReset (
   if (!ExtendedVerification) {

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_PROGRESS_CODE,

-      FixedPcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),

+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_CLEAR_BUFFER),

       UsbKeyboardDevice->DevicePath

       );

     //

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index a231bd6e3e..c7b48b2a87 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -1,7 +1,7 @@
 /** @file

   Helper functions for USB Keyboard Driver.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 2010, Intel Corporation

 All rights reserved. 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

@@ -811,7 +811,7 @@ InitUSBKeyboard (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardSelfTest),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -846,7 +846,7 @@ InitUSBKeyboard (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueKeyboardInterfaceError),

+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INTERFACE_ERROR),

       UsbKeyboardDevice->DevicePath

       );

 

@@ -1012,7 +1012,7 @@ KeyboardHandler (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueKeyboardInputError),

+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INPUT_ERROR),

       UsbKeyboardDevice->DevicePath

       );

 

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 25c457dec2..c583eac7b5 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -13,7 +13,7 @@
 # 2. Universal Serial Bus HID Usage Tables, ver 1.12

 # 3. UEFI Specification, v2.1

 #

-# Copyright (c) 2006 - 2008, Intel Corporation. 

+# Copyright (c) 2006 - 2010, Intel Corporation. 

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -87,18 +87,7 @@
   gEfiHiiDatabaseProtocolGuid                   ## SOMETIMES_CONSUMES (Default value is used if it's absent.)

   

 [FeaturePcd.common]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## SOMETIME_CONSUMES (Checked when no layout is provided by HII.)

-  

-[FixedPcd]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardEnable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardPresenceDetect

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardDisable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardReset

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardClearBuffer

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardSelfTest

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInterfaceError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInputError

-  

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## SOMETIME_CONSUMES (Checked when no layout is provided by HII.) 

 

 # [Event]

 #   ##

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
index 5c39f49dd2..8c1cf772c8 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
@@ -1,7 +1,7 @@
 /** @file

   USB Mouse Driver that manages USB mouse and produces Absolute Pointer Protocol.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 2010, Intel Corporation

 All rights reserved. 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

@@ -232,7 +232,7 @@ USBMouseAbsolutePointerDriverBindingStart (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR),

       UsbMouseAbsolutePointerDevice->DevicePath

       );

 

@@ -275,7 +275,7 @@ USBMouseAbsolutePointerDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE),

     UsbMouseAbsolutePointerDevice->DevicePath

     );

 

@@ -401,7 +401,7 @@ USBMouseAbsolutePointerDriverBindingStop (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE),

     UsbMouseAbsolutePointerDevice->DevicePath

     );

 

@@ -682,7 +682,7 @@ OnMouseInterruptComplete (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR),

       UsbMouseAbsolutePointerDevice->DevicePath

       );

 

@@ -833,7 +833,7 @@ UsbMouseAbsolutePointerReset (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseReset),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET),

     UsbMouseAbsolutePointerDevice->DevicePath

     );

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 2fa0864b40..2faddd73d9 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
@@ -28,7 +28,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiLib.h>

 #include <Library/MemoryAllocationLib.h>

-#include <Library/PcdLib.h>

 #include <Library/UefiUsbLib.h>

 #include <Library/DebugLib.h>

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
index 343f9a4482..56b93d2452 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
@@ -9,7 +9,7 @@
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11

 # 2. UEFI Specification, v2.1

 #

-# Copyright (c) 2006 - 2008, Intel Corporation. 

+# Copyright (c) 2006 - 2010, Intel Corporation. 

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -56,7 +56,6 @@
   UefiDriverEntryPoint

   BaseMemoryLib

   ReportStatusCodeLib

-  PcdLib

   UefiUsbLib

 

 [Protocols]

@@ -64,13 +63,6 @@
   gEfiDevicePathProtocolGuid                    ## TO_START

   gEfiAbsolutePointerProtocolGuid               ## BY_START

 

-[FixedPcd]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset

-

 # [Event]

 #   ##

 #   # Periodic timer event for delayed recovery, which deals with device error.

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index 667dd2f902..8713a9540a 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -1,7 +1,7 @@
 /** @file

   USB Mouse Driver that manages USB mouse and produces Simple Pointer Protocol.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 2010, Intel Corporation

 All rights reserved. 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

@@ -232,7 +232,7 @@ USBMouseDriverBindingStart (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR),

       UsbMouseDevice->DevicePath

       );

 

@@ -275,7 +275,7 @@ USBMouseDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE),

     UsbMouseDevice->DevicePath

     );

 

@@ -401,7 +401,7 @@ USBMouseDriverBindingStop (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE),

     UsbMouseDevice->DevicePath

     );

 

@@ -688,7 +688,7 @@ OnMouseInterruptComplete (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR),

       UsbMouseDevice->DevicePath

       );

 

@@ -838,7 +838,7 @@ UsbMouseReset (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseReset),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET),

     UsbMouseDevice->DevicePath

     );

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 36d337eccd..3af139d25c 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
@@ -28,7 +28,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiLib.h>

 #include <Library/MemoryAllocationLib.h>

-#include <Library/PcdLib.h>

 #include <Library/UefiUsbLib.h>

 #include <Library/DebugLib.h>

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
index 3466435e5c..7097520e81 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
@@ -9,7 +9,7 @@
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11

 # 2. UEFI Specification, v2.1

 #

-# Copyright (c) 2006 - 2008, Intel Corporation. 

+# Copyright (c) 2006 - 2010, Intel Corporation. 

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -56,7 +56,6 @@
   UefiDriverEntryPoint

   BaseMemoryLib

   ReportStatusCodeLib

-  PcdLib

   UefiUsbLib

 

 [Protocols]

@@ -64,13 +63,6 @@
   gEfiDevicePathProtocolGuid                    ## TO_START

   gEfiSimplePointerProtocolGuid                 ## BY_START

 

-[FixedPcd]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset

-

 # [Event]

 #   ##

 #   # Periodic timer event for delayed recovery, which deals with device error.