tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

To fix 

USB Keyboard driver should add F11, F12 support
DxeIpl should not hardcode 36bit address

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2543 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
xgu3 2007-04-05 09:04:12 +00:00
parent 8d8daecb54
commit 5d10269c06
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c
View File

@ -93,8 +93,8 @@ UINT8 KeyConvertionTable[USB_KEYCODE_MAX_MAKE][3] = {
{ SCAN_F8, 0x00, 0x00 }, // 0x41 { SCAN_F8, 0x00, 0x00 }, // 0x41
{ SCAN_F9, 0x00, 0x00 }, // 0x42 { SCAN_F9, 0x00, 0x00 }, // 0x42
{ SCAN_F10, 0x00, 0x00 }, // 0x43 { SCAN_F10, 0x00, 0x00 }, // 0x43
{ SCAN_NULL, 0x00, 0x00 }, // 0x44 F11 { SCAN_F11, 0x00, 0x00 }, // 0x44 F11
{ SCAN_NULL, 0x00, 0x00 }, // 0x45 F12 { SCAN_F12, 0x00, 0x00 }, // 0x45 F12
{ SCAN_NULL, 0x00, 0x00 }, // 0x46 PrintScreen { SCAN_NULL, 0x00, 0x00 }, // 0x46 PrintScreen
{ SCAN_NULL, 0x00, 0x00 }, // 0x47 Scroll Lock { SCAN_NULL, 0x00, 0x00 }, // 0x47 Scroll Lock
{ SCAN_NULL, 0x00, 0x00 }, // 0x48 Pause { SCAN_NULL, 0x00, 0x00 }, // 0x48 Pause
@ -289,6 +289,7 @@ InitUSBKeyboard (
UsbKeyboardDevice->ShiftOn = 0; UsbKeyboardDevice->ShiftOn = 0;
UsbKeyboardDevice->NumLockOn = 0; UsbKeyboardDevice->NumLockOn = 0;
UsbKeyboardDevice->CapsOn = 0; UsbKeyboardDevice->CapsOn = 0;
UsbKeyboardDevice->ScrollOn = 0;
ZeroMem (UsbKeyboardDevice->LastKeyCodeArray, sizeof (UINT8) * 8); ZeroMem (UsbKeyboardDevice->LastKeyCodeArray, sizeof (UINT8) * 8);
// //

15
EdkModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c
View File

@ -57,7 +57,6 @@ Returns:
--*/ --*/
{ {
UINT32 RegEax;
UINT8 PhysicalAddressBits; UINT8 PhysicalAddressBits;
EFI_PHYSICAL_ADDRESS PageAddress; EFI_PHYSICAL_ADDRESS PageAddress;
UINTN IndexOfPml4Entries; UINTN IndexOfPml4Entries;
@ -71,16 +70,16 @@ Returns:
PAGE_TABLE_ENTRY *PageDirectoryEntry; PAGE_TABLE_ENTRY *PageDirectoryEntry;
UINTN TotalPagesNum; UINTN TotalPagesNum;
UINTN BigPageAddress; UINTN BigPageAddress;
VOID *Hob;
// //
// Get physical address bits supported. // Get physical address bits supported from CPU HOB.
// //
AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL); PhysicalAddressBits = 36;
if (RegEax >= 0x80000008) {
AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL); Hob = GetFirstHob (EFI_HOB_TYPE_CPU);
PhysicalAddressBits = (UINT8) RegEax; if (Hob != NULL) {
} else { PhysicalAddressBits = ((EFI_HOB_CPU *) Hob)->SizeOfMemorySpace;
PhysicalAddressBits = 36;
} }
// //