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

3 files changed, 7 insertions, 16 deletions

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.