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

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
       );
     //

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
       );
 

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]
 #   ##