MdeModulePkg: add support for ORICO PEUS3-2P card

1) Fix a bug on missing hub context evaluation operation.
2) If the usb keyboard device configuration has been set successfully, then don’t set configuration again.

Signed-off-by: erictian
Reviewed-by: li-elvin


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

1 files changed, 20 insertions, 21 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index 09f1b04c81..ee774ff35f 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 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -833,29 +833,28 @@ InitUSBKeyboard (
              );

   if (EFI_ERROR (Status)) {

     ConfigValue = 0x01;

-  }

-

-  //

-  // Uses default configuration to configure the USB Keyboard device.

-  //

-  Status = UsbSetConfiguration (

-             UsbKeyboardDevice->UsbIo,

-             ConfigValue,

-             &TransferResult

-             );

-  if (EFI_ERROR (Status)) {

     //

-    // If configuration could not be set here, it means

-    // the keyboard interface has some errors and could

-    // not be initialized

+    // Uses default configuration to configure the USB Keyboard device.

     //

-    REPORT_STATUS_CODE_WITH_DEVICE_PATH (

-      EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INTERFACE_ERROR),

-      UsbKeyboardDevice->DevicePath

-      );

+    Status = UsbSetConfiguration (

+               UsbKeyboardDevice->UsbIo,

+               ConfigValue,

+               &TransferResult

+               );

+    if (EFI_ERROR (Status)) {

+      //

+      // If configuration could not be set here, it means

+      // the keyboard interface has some errors and could

+      // not be initialized

+      //

+      REPORT_STATUS_CODE_WITH_DEVICE_PATH (

+        EFI_ERROR_CODE | EFI_ERROR_MINOR,

+        (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INTERFACE_ERROR),

+        UsbKeyboardDevice->DevicePath

+        );

 

-    return EFI_DEVICE_ERROR;

+      return EFI_DEVICE_ERROR;

+    }

   }

 

   UsbGetProtocolRequest (