1 files changed, 14 insertions, 27 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index b1da4b7786..8995653544 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -1,6 +1,5 @@
 ## @file
-# USB Keyboard Driver that manages USB keyboard and produces Simple Text Input
-# Protocol and Simple Text Input Ex Protocol.
+# USB Keyboard Driver that manages USB keyboard and produces Simple Text Input(Ex) Protocol.
 #
 # USB Keyboard Driver consumes USB I/O Protocol and Device Path Protocol, and produces
 # Simple Text Input Protocol and Simple Text Input Ex Protocol on USB keyboard devices.
@@ -13,7 +12,7 @@
 # 2. Universal Serial Bus HID Usage Tables, ver 1.12
 # 3. UEFI Specification, v2.1
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, 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
@@ -29,6 +28,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = UsbKbDxe
+  MODULE_UNI_FILE                = UsbKbDxe.uni
   FILE_GUID                      = 2D2E62CF-9ECF-43b7-8219-94E7FC713DFE
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -69,44 +69,31 @@
   HiiLib
 
 [Guids]
-  ##
+  #
   # Event registered to EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group,
   # which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().
   #
-  gEfiHiiKeyBoardLayoutGuid                     ## SOMETIME_CONSUMES  ## Event
-  gUsbKeyboardLayoutPackageGuid
-  gUsbKeyboardLayoutKeyGuid
+  gEfiHiiKeyBoardLayoutGuid                     ## SOMETIMES_CONSUMES ## Event
+  gUsbKeyboardLayoutPackageGuid                 ## SOMETIMES_CONSUMES ## HII
+  gUsbKeyboardLayoutKeyGuid                     ## SOMETIMES_PRODUCES ## UNDEFINED
 
 [Protocols]
   gEfiUsbIoProtocolGuid                         ## TO_START
   gEfiDevicePathProtocolGuid                    ## TO_START
   gEfiSimpleTextInProtocolGuid                  ## BY_START
   gEfiSimpleTextInputExProtocolGuid             ## BY_START
-  ##
+  #
   # If HII Database Protocol exists, then keyboard layout from HII database is used.
   # Otherwise, USB keyboard module tries to use its carried default layout.
   #
-  gEfiHiiDatabaseProtocolGuid                   ## SOMETIMES_CONSUMES (Default value is used if it's absent.)
+  gEfiHiiDatabaseProtocolGuid                   ## SOMETIMES_CONSUMES
   
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## SOMETIME_CONSUMES (Checked when no layout is provided by HII.) 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## CONSUMES
 
 # [Event]
-#   ##
-#   # Periodic timer event for generation of repeat key
-#   #
-#   EVENT_TYPE_PERIODIC_TIMER                   ## PRODUCES
-#   ##
-#   # Periodic timer event for delayed recovery, which deals with device error.
-#   #
-#   EVENT_TYPE_PERIODIC_TIMER                   ## PRODUCES
-#   ##
-#   # Event for EFI_SIMPLE_TEXT_INPUT_PROTOCOL.WaitForKey
-#   #
-#   EVENT_TYPE_NOTIFY_WAIT                      ## PRODUCES
-#   ##
-#   # Event for EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL.WaitForKeyEx
-#   #
-#   EVENT_TYPE_NOTIFY_WAIT                      ## PRODUCES
-#
+# EVENT_TYPE_RELATIVE_TIMER        ## CONSUMES
 #
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  UsbKbDxeExtra.uni