\r
#include "KeyBoard.h"\r
\r
-EFI_GUID mUsbKeyboardLayoutPackageGuid = USB_KEYBOARD_LAYOUT_PACKAGE_GUID;\r
-EFI_GUID mUsbKeyboardLayoutKeyGuid = USB_KEYBOARD_LAYOUT_KEY_GUID;\r
-\r
USB_KEYBOARD_LAYOUT_PACK_BIN mUsbKeyboardLayoutBin = {\r
sizeof (USB_KEYBOARD_LAYOUT_PACK_BIN), // Binary size\r
\r
// Install Keyboard Layout package to HII database\r
//\r
HiiHandle = HiiAddPackages (\r
- &mUsbKeyboardLayoutPackageGuid,\r
+ &gUsbKeyboardLayoutPackageGuid,\r
UsbKeyboardDevice->ControllerHandle,\r
&mUsbKeyboardLayoutBin,\r
NULL\r
//\r
// Set current keyboard layout\r
//\r
- Status = HiiDatabase->SetKeyboardLayout (HiiDatabase, &mUsbKeyboardLayoutKeyGuid);\r
+ Status = HiiDatabase->SetKeyboardLayout (HiiDatabase, &gUsbKeyboardLayoutKeyGuid);\r
\r
return Status;\r
}\r
//\r
// Make sure modifier of Key Descriptor is in the valid range according to UEFI spec.\r
//\r
- if (KeyDescriptor->Modifier > (sizeof (ModifierValueToEfiScanCodeConvertionTable) / sizeof (UINT8))) {\r
+ if (KeyDescriptor->Modifier >= (sizeof (ModifierValueToEfiScanCodeConvertionTable) / sizeof (UINT8))) {\r
return EFI_DEVICE_ERROR;\r
}\r
\r