From 20bcb757d2d85f59c749e004e580bc2e52a96459 Mon Sep 17 00:00:00 2001 From: erictian Date: Fri, 29 Mar 2013 06:53:57 +0000 Subject: =?UTF-8?q?MdeMdeModulePkg/Usb:=20Fixed=20two=20usb=20issues=201.F?= =?UTF-8?q?ix=20the=20bug=20in=20interface=20parser=20logic=20for=20usb=20?= =?UTF-8?q?camera=20device.=20Reserve=20device=20address=20if=20the=20devi?= =?UTF-8?q?ce=20doesn=E2=80=99t=20get=20disconnected.=202.Some=20usb=201.1?= =?UTF-8?q?=20devices=20require=20the=20context=20evaluation=20immediately?= =?UTF-8?q?=20with=20actual=20max=20packet=20size=20after=20detecting=20th?= =?UTF-8?q?e=20device=20max=20packet=20size.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Feng Tian Reviewed-by: Elvin Li git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14226 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MdeModulePkg/Bus/Pci') diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c index b8a1d78a7e..5809a0f914 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c @@ -1,7 +1,7 @@ /** @file The XHCI controller driver. -Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.
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 @@ -916,7 +916,7 @@ XhcControlTransfer ( ((Request->RequestType == USB_REQUEST_TYPE (EfiUsbDataIn, USB_REQ_TYPE_STANDARD, USB_TARGET_DEVICE)) || ((Request->RequestType == USB_REQUEST_TYPE (EfiUsbDataIn, USB_REQ_TYPE_CLASS, USB_TARGET_DEVICE))))) { DescriptorType = (UINT8)(Request->Value >> 8); - if ((DescriptorType == USB_DESC_TYPE_DEVICE) && (*DataLength == sizeof (EFI_USB_DEVICE_DESCRIPTOR))) { + if ((DescriptorType == USB_DESC_TYPE_DEVICE) && ((*DataLength == sizeof (EFI_USB_DEVICE_DESCRIPTOR)) || ((DeviceSpeed == EFI_USB_SPEED_FULL) && (*DataLength == 8)))) { ASSERT (Data != NULL); // // Store a copy of device scriptor as hub device need this info to configure endpoint. -- cgit v1.2.3