sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Roll back r12434.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12436 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff 2011-09-23 06:45:16 +00:00
parent 29e22e2bd6
commit 2256f1f757
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The module to produce Usb Bus PPI. The module to produce Usb Bus PPI.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions are licensed and made available under the terms and conditions
@ -307,13 +307,13 @@ PeiHubEnumeration (
NewPeiUsbDevice->DeviceSpeed = (UINT8)IsPortLowSpeedDeviceAttached (PortStatus.PortStatus); NewPeiUsbDevice->DeviceSpeed = (UINT8)IsPortLowSpeedDeviceAttached (PortStatus.PortStatus);
if(NewPeiUsbDevice->DeviceSpeed != EFI_USB_SPEED_HIGH) { if(NewPeiUsbDevice->DeviceSpeed != EFI_USB_SPEED_HIGH) {
if (PeiUsbDevice->DeviceSpeed == EFI_USB_SPEED_HIGH) { if (PeiUsbDevice->DeviceSpeed == EFI_USB_SPEED_HIGH) {
NewPeiUsbDevice->Translator.TranslatorPortNumber = (UINT8)Index; NewPeiUsbDevice->Translator.TranslatorPortNumber = (UINT8)Index;
NewPeiUsbDevice->Translator.TranslatorHubAddress = *CurrentAddress; NewPeiUsbDevice->Translator.TranslatorHubAddress = *CurrentAddress;
} else { } else {
CopyMem(&(NewPeiUsbDevice->Translator), &(PeiUsbDevice->Translator), sizeof(EFI_USB2_HC_TRANSACTION_TRANSLATOR)); CopyMem(&(NewPeiUsbDevice->Translator), &(PeiUsbDevice->Translator), sizeof(EFI_USB2_HC_TRANSACTION_TRANSLATOR));
} }
} }
// //
// Configure that Usb Device // Configure that Usb Device
@ -380,21 +380,18 @@ PeiUsbEnumeration (
CurrentAddress = 0; CurrentAddress = 0;
if (Usb2HcPpi != NULL) { if (Usb2HcPpi != NULL){
Usb2HcPpi->GetRootHubPortNumber ( Usb2HcPpi->GetRootHubPortNumber (
PeiServices, PeiServices,
Usb2HcPpi, Usb2HcPpi,
(UINT8 *) &NumOfRootPort (UINT8 *) &NumOfRootPort
); );
} else if (UsbHcPpi != NULL) { } else {
UsbHcPpi->GetRootHubPortNumber ( UsbHcPpi->GetRootHubPortNumber (
PeiServices, PeiServices,
UsbHcPpi, UsbHcPpi,
(UINT8 *) &NumOfRootPort (UINT8 *) &NumOfRootPort
); );
} else {
ASSERT (FALSE);
return EFI_INVALID_PARAMETER;
} }
for (Index = 0; Index < NumOfRootPort; Index++) { for (Index = 0; Index < NumOfRootPort; Index++) {

7
MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
View File

@ -627,18 +627,13 @@ SetKeyboardLayoutEvent (
// //
KeyCode = EfiKeyToUsbKeyCodeConvertionTable [(UINT8) (TempKey.Key)]; KeyCode = EfiKeyToUsbKeyCodeConvertionTable [(UINT8) (TempKey.Key)];
TableEntry = GetKeyDescriptor (UsbKeyboardDevice, KeyCode); TableEntry = GetKeyDescriptor (UsbKeyboardDevice, KeyCode);
if (TableEntry == NULL) {
ReleaseKeyboardLayoutResources (UsbKeyboardDevice);
FreePool (KeyboardLayout);
return;
}
CopyMem (TableEntry, KeyDescriptor, sizeof (EFI_KEY_DESCRIPTOR)); CopyMem (TableEntry, KeyDescriptor, sizeof (EFI_KEY_DESCRIPTOR));
// //
// For non-spacing key, create the list with a non-spacing key followed by physical keys. // For non-spacing key, create the list with a non-spacing key followed by physical keys.
// //
if (TempKey.Modifier == EFI_NS_KEY_MODIFIER) { if (TempKey.Modifier == EFI_NS_KEY_MODIFIER) {
UsbNsKey = AllocateZeroPool (sizeof (USB_NS_KEY)); UsbNsKey = AllocatePool (sizeof (USB_NS_KEY));
ASSERT (UsbNsKey != NULL); ASSERT (UsbNsKey != NULL);
// //