tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

1. Add the GLOBAL_REMOVE_IF_UNREFERENCED to globe variables which are used only in debug version;

Browse Source 
2. Use ZeroMem to replace gBS->SetMem;
3. Remove marked code;
4. Add IsHub judgement in UsbPortReset function to following EFI1.1 spec;
5. Add brackets for macro definition

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1740 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
dtang2 2006-10-13 06:36:11 +00:00
parent a98f11c5b9
commit 71a62114eb
13 changed files with 86 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.c
View File

@ -22,8 +22,10 @@ Revision History
#include "Ehci.h" #include "Ehci.h"
UINTN gEHCDebugLevel = EFI_D_INFO;
UINTN gEHCErrorLevel = EFI_D_ERROR; GLOBAL_REMOVE_IF_UNREFERENCED UINTN gEHCDebugLevel = EFI_D_INFO;
GLOBAL_REMOVE_IF_UNREFERENCED UINTN gEHCErrorLevel = EFI_D_ERROR;
// //
// Prototypes // Prototypes
@ -886,7 +888,7 @@ EhciReset (
// //
Status = SetFrameListBaseAddr ( Status = SetFrameListBaseAddr (
HcDev, HcDev,
GET_0B_TO_31B (HcDev->PeriodicFrameListBuffer) (UINT32)GET_0B_TO_31B (HcDev->PeriodicFrameListBuffer)
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
Status = EFI_DEVICE_ERROR; Status = EFI_DEVICE_ERROR;

13
EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h
View File

@ -27,8 +27,10 @@ Revision History
// //
#include <IndustryStandard/pci22.h> #include <IndustryStandard/pci22.h>
extern UINTN gEHCDebugLevel;
extern UINTN gEHCErrorLevel; GLOBAL_REMOVE_IF_UNREFERENCED extern UINTN gEHCDebugLevel;
GLOBAL_REMOVE_IF_UNREFERENCED extern UINTN gEHCErrorLevel;
#define STALL_1_MACRO_SECOND 1 #define STALL_1_MACRO_SECOND 1
#define STALL_1_MILLI_SECOND 1000 * STALL_1_MACRO_SECOND #define STALL_1_MILLI_SECOND 1000 * STALL_1_MACRO_SECOND
@ -192,10 +194,11 @@ extern EFI_COMPONENT_NAME_PROTOCOL gEhciComponentName;
#define OUTPUT_PACKET_ID 0xE1 #define OUTPUT_PACKET_ID 0xE1
#define ERROR_PACKET_ID 0x55 #define ERROR_PACKET_ID 0x55
#define bit(a) 1 << (a) #define bit(a) (1 << (a))
#define GET_0B_TO_31B(Addr) (((UINTN) Addr) & (0xffffffff))
#define GET_32B_TO_63B(Addr) ((UINTN)RShiftU64((UINTN) Addr, 32) & (0xffffffff))
#define GET_0B_TO_31B(Addr) (UINT32) (UINTN) (Addr)
#define GET_32B_TO_63B(Addr) (UINT32) (RShiftU64(((UINT64) (UINTN) (Addr)), 32) & 0xffffffff)
// //
// Ehci Data and Ctrl Structures // Ehci Data and Ctrl Structures

59
EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c
View File

@ -340,7 +340,7 @@ Returns:
// //
// Init fields in Qh // Init fields in Qh
// //
gBS->SetMem (*QhPtrPtr, sizeof (EHCI_QH_ENTITY), 0); ZeroMem (*QhPtrPtr, sizeof (EHCI_QH_ENTITY));
// //
// Software field // Software field
@ -699,7 +699,8 @@ Returns:
// //
// Init fields in Qtd // Init fields in Qtd
// //
gBS->SetMem (*QtdPtrPtr, sizeof (EHCI_QTD_ENTITY), 0);
ZeroMem (*QtdPtrPtr, sizeof (EHCI_QTD_ENTITY));
// //
// Software field // Software field
@ -1386,7 +1387,7 @@ Returns:
Value = NULL; Value = NULL;
if (!HwQtdPtr->AltNextQtdTerminate) { if (!HwQtdPtr->AltNextQtdTerminate) {
Value = (EHCI_QTD_HW *) (UINTN) GET_0B_TO_31B (HwQtdPtr->AltNextQtdPointer << 5); Value = (EHCI_QTD_HW *) GET_0B_TO_31B (HwQtdPtr->AltNextQtdPointer << 5);
} }
return Value; return Value;
@ -1417,7 +1418,7 @@ Returns:
Value = NULL; Value = NULL;
if (!HwQtdPtr->NextQtdTerminate) { if (!HwQtdPtr->NextQtdTerminate) {
Value = (EHCI_QTD_HW *) (UINTN) GET_0B_TO_31B (HwQtdPtr->NextQtdPointer << 5); Value = (EHCI_QTD_HW *) GET_0B_TO_31B (HwQtdPtr->NextQtdPointer << 5);
} }
return Value; return Value;
@ -1727,7 +1728,7 @@ Returns:
// //
// Not Null FrameList // Not Null FrameList
// //
FindQhHwPtr = (EHCI_QH_HW *) (UINTN) GET_0B_TO_31B (FrameEntryPtr->LinkPointer << 5); FindQhHwPtr = (EHCI_QH_HW *) GET_0B_TO_31B (FrameEntryPtr->LinkPointer << 5);
FindQhPtr = (EHCI_QH_ENTITY *) GET_QH_ENTITY_ADDR (FindQhHwPtr); FindQhPtr = (EHCI_QH_ENTITY *) GET_QH_ENTITY_ADDR (FindQhHwPtr);
// //
// FindQh is Left/Right to Qh // FindQh is Left/Right to Qh
@ -1742,12 +1743,12 @@ Returns:
// //
if (NULL != FindQhPtr->Next) { if (NULL != FindQhPtr->Next) {
FindQhPtr->Next->Prev = QhPtr; FindQhPtr->Next->Prev = QhPtr;
QhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(FindQhPtr->Next->Qh)) >> 5); QhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (&(FindQhPtr->Next->Qh) >> 5);
QhPtr->Qh.SelectType = QH_SELECT_TYPE; QhPtr->Qh.SelectType = QH_SELECT_TYPE;
QhPtr->Qh.QhTerminate = FALSE; QhPtr->Qh.QhTerminate = FALSE;
} }
FindQhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (((UINTN)&(QhPtr->Qh)) >> 5); FindQhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FindQhPtr->Qh.SelectType = QH_SELECT_TYPE; FindQhPtr->Qh.SelectType = QH_SELECT_TYPE;
FindQhPtr->Qh.QhTerminate = FALSE; FindQhPtr->Qh.QhTerminate = FALSE;
@ -1762,7 +1763,7 @@ Returns:
// //
// Qh is the First one in Frame[0] List // Qh is the First one in Frame[0] List
// //
FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FrameEntryPtr->SelectType = QH_SELECT_TYPE; FrameEntryPtr->SelectType = QH_SELECT_TYPE;
FrameEntryPtr->LinkTerminate = FALSE; FrameEntryPtr->LinkTerminate = FALSE;
} else { } else {
@ -1770,12 +1771,12 @@ Returns:
// Qh is not the First one in Frame[0] List // Qh is not the First one in Frame[0] List
// //
FindQhPtr->Prev->Next = QhPtr; FindQhPtr->Prev->Next = QhPtr;
FindQhPtr->Prev->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FindQhPtr->Prev->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FindQhPtr->Prev->Qh.SelectType = QH_SELECT_TYPE; FindQhPtr->Prev->Qh.SelectType = QH_SELECT_TYPE;
FindQhPtr->Prev->Qh.QhTerminate = FALSE; FindQhPtr->Prev->Qh.QhTerminate = FALSE;
} }
QhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(FindQhPtr->Qh)) >> 5); QhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (&(FindQhPtr->Qh) >> 5);
QhPtr->Qh.SelectType = QH_SELECT_TYPE; QhPtr->Qh.SelectType = QH_SELECT_TYPE;
QhPtr->Qh.QhTerminate = FALSE; QhPtr->Qh.QhTerminate = FALSE;
@ -1786,7 +1787,7 @@ Returns:
// //
// Link Qh after FindQh, Qh is the Last one // Link Qh after FindQh, Qh is the Last one
// //
FindQhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FindQhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FindQhPtr->Prev->Qh.SelectType = QH_SELECT_TYPE; FindQhPtr->Prev->Qh.SelectType = QH_SELECT_TYPE;
FindQhPtr->Qh.QhTerminate = FALSE; FindQhPtr->Qh.QhTerminate = FALSE;
@ -1798,7 +1799,7 @@ Returns:
// //
// Null FrameList // Null FrameList
// //
FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FrameEntryPtr->SelectType = QH_SELECT_TYPE; FrameEntryPtr->SelectType = QH_SELECT_TYPE;
FrameEntryPtr->LinkTerminate = FALSE; FrameEntryPtr->LinkTerminate = FALSE;
} }
@ -1812,7 +1813,7 @@ Returns:
FrameIndex += QhPtr->Interval; FrameIndex += QhPtr->Interval;
while (FrameIndex < HcDev->PeriodicFrameListLength) { while (FrameIndex < HcDev->PeriodicFrameListLength) {
FrameEntryPtr = (FRAME_LIST_ENTRY *) (FrameEntryPtr + QhPtr->Interval); FrameEntryPtr = (FRAME_LIST_ENTRY *) (FrameEntryPtr + QhPtr->Interval);
FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FrameEntryPtr->SelectType = QH_SELECT_TYPE; FrameEntryPtr->SelectType = QH_SELECT_TYPE;
FrameEntryPtr->LinkTerminate = FALSE; FrameEntryPtr->LinkTerminate = FALSE;
FrameIndex += QhPtr->Interval; FrameIndex += QhPtr->Interval;
@ -1825,7 +1826,7 @@ Returns:
while (FrameIndex < HcDev->PeriodicFrameListLength) { while (FrameIndex < HcDev->PeriodicFrameListLength) {
FrameEntryPtr = (FRAME_LIST_ENTRY *) (FrameEntryPtr + QhPtr->Interval); FrameEntryPtr = (FRAME_LIST_ENTRY *) (FrameEntryPtr + QhPtr->Interval);
if ((FrameIndex % QhPtr->Prev->Interval) != 0) { if ((FrameIndex % QhPtr->Prev->Interval) != 0) {
FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FrameEntryPtr->SelectType = QH_SELECT_TYPE; FrameEntryPtr->SelectType = QH_SELECT_TYPE;
FrameEntryPtr->LinkTerminate = FALSE; FrameEntryPtr->LinkTerminate = FALSE;
} }
@ -1843,7 +1844,7 @@ Returns:
// //
// Not Null FrameList // Not Null FrameList
// //
FindQhHwPtr = (EHCI_QH_HW *) (UINTN) GET_0B_TO_31B (FrameEntryPtr->LinkPointer << 5); FindQhHwPtr = (EHCI_QH_HW *) GET_0B_TO_31B (FrameEntryPtr->LinkPointer << 5);
FindQhPtr = (EHCI_QH_ENTITY *) GET_QH_ENTITY_ADDR (FindQhHwPtr); FindQhPtr = (EHCI_QH_ENTITY *) GET_QH_ENTITY_ADDR (FindQhHwPtr);
// //
// FindQh is Last Qh in the Asynchronous List, Link Qh after FindQh // FindQh is Last Qh in the Asynchronous List, Link Qh after FindQh
@ -1852,7 +1853,7 @@ Returns:
FindQhPtr = FindQhPtr->Next; FindQhPtr = FindQhPtr->Next;
} }
FindQhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FindQhPtr->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FindQhPtr->Qh.SelectType = QH_SELECT_TYPE; FindQhPtr->Qh.SelectType = QH_SELECT_TYPE;
FindQhPtr->Qh.QhTerminate = FALSE; FindQhPtr->Qh.QhTerminate = FALSE;
@ -1862,7 +1863,7 @@ Returns:
// //
// Null FrameList // Null FrameList
// //
FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Qh)) >> 5); FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Qh) >> 5);
FrameEntryPtr->SelectType = QH_SELECT_TYPE; FrameEntryPtr->SelectType = QH_SELECT_TYPE;
FrameEntryPtr->LinkTerminate = FALSE; FrameEntryPtr->LinkTerminate = FALSE;
} }
@ -1929,7 +1930,7 @@ Returns:
} }
} else { } else {
while (FrameIndex < HcDev->PeriodicFrameListLength) { while (FrameIndex < HcDev->PeriodicFrameListLength) {
FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Next->Qh)) >> 5); FrameEntryPtr->LinkPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Next->Qh) >> 5);
FrameEntryPtr->SelectType = QH_SELECT_TYPE; FrameEntryPtr->SelectType = QH_SELECT_TYPE;
FrameEntryPtr->LinkTerminate = FALSE; FrameEntryPtr->LinkTerminate = FALSE;
FrameEntryPtr += Interval; FrameEntryPtr += Interval;
@ -1949,7 +1950,7 @@ Returns:
QhPtr->Prev->Qh.SelectType = 0; QhPtr->Prev->Qh.SelectType = 0;
QhPtr->Prev->Qh.QhTerminate = TRUE; QhPtr->Prev->Qh.QhTerminate = TRUE;
} else { } else {
QhPtr->Prev->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (((UINTN) &(QhPtr->Next->Qh)) >> 5); QhPtr->Prev->Qh.QhHorizontalPointer = (UINT32) GET_0B_TO_31B (&(QhPtr->Next->Qh) >> 5);
QhPtr->Prev->Qh.SelectType = QH_SELECT_TYPE; QhPtr->Prev->Qh.SelectType = QH_SELECT_TYPE;
QhPtr->Prev->Qh.QhTerminate = FALSE; QhPtr->Prev->Qh.QhTerminate = FALSE;
} }
@ -2109,6 +2110,12 @@ Returns:
RemainLen = DataLen; RemainLen = DataLen;
ASSERT (QtdHwPtr); ASSERT (QtdHwPtr);
//
// Allow buffer address range across 4G.
// But EFI_USB_MAX_BULK_BUFFER_NUM = 1, so don't allow
// seperate buffer array.
//
// //
// Set BufferPointer0, ExtBufferPointer0 and Offset // Set BufferPointer0, ExtBufferPointer0 and Offset
// //
@ -2125,7 +2132,7 @@ Returns:
} }
QtdHwPtr->BufferPointer1 = QtdHwPtr->BufferPointer0 + 1; QtdHwPtr->BufferPointer1 = QtdHwPtr->BufferPointer0 + 1;
QtdHwPtr->ExtBufferPointer1 = QtdHwPtr->ExtBufferPointer0; QtdHwPtr->ExtBufferPointer1 = (QtdHwPtr->BufferPointer1 == 0) ? (QtdHwPtr->ExtBufferPointer0 + 1) : QtdHwPtr->ExtBufferPointer0;
// //
// Set BufferPointer2 and ExtBufferPointer2 // Set BufferPointer2 and ExtBufferPointer2
@ -2136,7 +2143,7 @@ Returns:
} }
QtdHwPtr->BufferPointer2 = QtdHwPtr->BufferPointer1 + 1; QtdHwPtr->BufferPointer2 = QtdHwPtr->BufferPointer1 + 1;
QtdHwPtr->ExtBufferPointer2 = QtdHwPtr->ExtBufferPointer0; QtdHwPtr->ExtBufferPointer2 = (QtdHwPtr->BufferPointer2 == 0) ? (QtdHwPtr->ExtBufferPointer1 + 1) : QtdHwPtr->ExtBufferPointer1;
// //
// Set BufferPointer3 and ExtBufferPointer3 // Set BufferPointer3 and ExtBufferPointer3
@ -2147,7 +2154,7 @@ Returns:
} }
QtdHwPtr->BufferPointer3 = QtdHwPtr->BufferPointer2 + 1; QtdHwPtr->BufferPointer3 = QtdHwPtr->BufferPointer2 + 1;
QtdHwPtr->ExtBufferPointer3 = QtdHwPtr->ExtBufferPointer0; QtdHwPtr->ExtBufferPointer3 = (QtdHwPtr->BufferPointer2 == 0) ? (QtdHwPtr->ExtBufferPointer2 + 1) : QtdHwPtr->ExtBufferPointer2;
// //
// Set BufferPointer4 and ExtBufferPointer4 // Set BufferPointer4 and ExtBufferPointer4
@ -2158,7 +2165,7 @@ Returns:
} }
QtdHwPtr->BufferPointer4 = QtdHwPtr->BufferPointer3 + 1; QtdHwPtr->BufferPointer4 = QtdHwPtr->BufferPointer3 + 1;
QtdHwPtr->ExtBufferPointer4 = QtdHwPtr->ExtBufferPointer0; QtdHwPtr->ExtBufferPointer4 = (QtdHwPtr->BufferPointer3 == 0) ? (QtdHwPtr->ExtBufferPointer3 + 1) : QtdHwPtr->ExtBufferPointer3;
exit: exit:
return ; return ;
@ -2865,8 +2872,8 @@ Returns:
} }
(*ErrQtdPos)++; (*ErrQtdPos)++;
QtdHwPtr = GetQtdNextPointer (QtdHwPtr); QtdPtr = QtdPtr->Next;
QtdPtr = (EHCI_QTD_ENTITY *) GET_QTD_ENTITY_ADDR (QtdHwPtr); QtdHwPtr = &(QtdPtr->Qtd);
} }
@ -3026,7 +3033,7 @@ Returns:
} }
QtdHwPtr = &(AsyncRequestPtr->QhPtr->FirstQtdPtr->Qtd); QtdHwPtr = &(AsyncRequestPtr->QhPtr->FirstQtdPtr->Qtd);
ReceiveBuffer = (UINT8 *) (UINTN) GET_0B_TO_31B ((QtdHwPtr->BufferPointer0 << 12) | AsyncRequestPtr->QhPtr->FirstQtdPtr->StaticCurrentOffset); ReceiveBuffer = (UINT8 *) GET_0B_TO_31B ((QtdHwPtr->BufferPointer0 << 12) | AsyncRequestPtr->QhPtr->FirstQtdPtr->StaticCurrentOffset);
CopyMem ( CopyMem (
ProcessBuffer, ProcessBuffer,
ReceiveBuffer, ReceiveBuffer,

2
EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.h
View File

@ -59,7 +59,7 @@ Revision History
// //
#define NORMAL_MEMORY_BLOCK_UNIT_IN_PAGES 1 #define NORMAL_MEMORY_BLOCK_UNIT_IN_PAGES 1
#define bit(a) 1 << (a) #define bit(a) (1 << (a))
// //
// //////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////

4
EdkModulePkg/Bus/Usb/UsbBus/Dxe/usb.c
View File

@ -696,7 +696,7 @@ UsbSetConfiguration (
--*/ --*/
{ {
LIST_ENTRY *NextEntry; LIST_ENTRY *NextEntry;
CONFIG_DESC_LIST_ENTRY *ConfigEntry; CONFIG_DESC_LIST_ENTRY *ConfigEntry;
UINT32 Status; UINT32 Status;
EFI_STATUS Result; EFI_STATUS Result;
@ -752,7 +752,7 @@ UsbSetDefaultConfiguration (
{ {
CONFIG_DESC_LIST_ENTRY *ConfigEntry; CONFIG_DESC_LIST_ENTRY *ConfigEntry;
UINT16 ConfigValue; UINT16 ConfigValue;
LIST_ENTRY *NextEntry; LIST_ENTRY *NextEntry;
if (IsListEmpty (&UsbIoDev->ConfigDescListHead)) { if (IsListEmpty (&UsbIoDev->ConfigDescListHead)) {
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;

14
EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
View File

@ -23,8 +23,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "usbbus.h" #include "usbbus.h"
UINTN gUSBDebugLevel = EFI_D_INFO;
UINTN gUSBErrorLevel = EFI_D_ERROR; GLOBAL_REMOVE_IF_UNREFERENCED UINTN gUSBDebugLevel = EFI_D_INFO;
GLOBAL_REMOVE_IF_UNREFERENCED UINTN gUSBErrorLevel = EFI_D_ERROR;
// //
// The UsbBusProtocol is just used to locate USB_BUS_CONTROLLER // The UsbBusProtocol is just used to locate USB_BUS_CONTROLLER
@ -2328,17 +2329,18 @@ UsbPortReset (
--*/ --*/
{ {
USB_IO_CONTROLLER_DEVICE *UsbIoController; USB_IO_CONTROLLER_DEVICE *UsbIoController;
EFI_STATUS Status;
UsbIoController = USB_IO_CONTROLLER_DEVICE_FROM_USB_IO_THIS (This); UsbIoController = USB_IO_CONTROLLER_DEVICE_FROM_USB_IO_THIS (This);
if (IsHub (UsbIoController)) {
return EFI_INVALID_PARAMETER;
}
// //
// Since at this time, this device has already been configured, // Since at this time, this device has already been configured,
// it needs to be re-configured. // it needs to be re-configured.
// //
Status = ParentPortReset (UsbIoController, TRUE, 0); return ParentPortReset (UsbIoController, TRUE, 0);
return Status;
} }
EFI_STATUS EFI_STATUS

6
EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
View File

@ -30,8 +30,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "hub.h" #include "hub.h"
#include "usbutil.h" #include "usbutil.h"
extern UINTN gUSBDebugLevel;
extern UINTN gUSBErrorLevel; GLOBAL_REMOVE_IF_UNREFERENCED extern UINTN gUSBDebugLevel;
GLOBAL_REMOVE_IF_UNREFERENCED extern UINTN gUSBErrorLevel;
#define MICROSECOND 10000 #define MICROSECOND 10000
#define ONESECOND (1000 * MICROSECOND) #define ONESECOND (1000 * MICROSECOND)

16
EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbio.c
View File

@ -181,6 +181,19 @@ VOID
InitializeUsbIoInstance ( InitializeUsbIoInstance (
IN USB_IO_CONTROLLER_DEVICE *UsbIoController IN USB_IO_CONTROLLER_DEVICE *UsbIoController
) )
/*++
Routine Description:
Initialize the instance of UsbIo controller
Arguments:
UsbIoController - A pointer to controller structure of UsbIo
Returns:
--*/
{ {
// //
// Copy EFI_USB_IO protocol instance // Copy EFI_USB_IO protocol instance
@ -349,11 +362,10 @@ UsbBulkTransfer (
UINT8 DataToggle; UINT8 DataToggle;
UINT8 OldToggle; UINT8 OldToggle;
EFI_STATUS RetStatus; EFI_STATUS RetStatus;
USB_IO_CONTROLLER_DEVICE *UsbIoController; USB_IO_CONTROLLER_DEVICE *UsbIoController;
ENDPOINT_DESC_LIST_ENTRY *EndPointListEntry; ENDPOINT_DESC_LIST_ENTRY *EndPointListEntry;
UINT32 TransferResult;
UINT8 DataBuffersNumber; UINT8 DataBuffersNumber;
UINT32 TransferResult;
DataBuffersNumber = 1; DataBuffersNumber = 1;
UsbIoController = USB_IO_CONTROLLER_DEVICE_FROM_USB_IO_THIS (This); UsbIoController = USB_IO_CONTROLLER_DEVICE_FROM_USB_IO_THIS (This);

13
EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
View File

@ -354,21 +354,18 @@ Cbi0DriverBindingStart (
// //
if (EndpointDescriptor.Attributes == 0x02) { if (EndpointDescriptor.Attributes == 0x02) {
if (EndpointDescriptor.EndpointAddress & 0x80) { if (EndpointDescriptor.EndpointAddress & 0x80) {
CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor)); CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
// UsbCbiDev->BulkInEndpointDescriptor = EndpointDescriptor; EndpointExistMask |= bit (0);
EndpointExistMask |= bit (0);
} else { } else {
CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor)); CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
// UsbCbiDev->BulkOutEndpointDescriptor = EndpointDescriptor; EndpointExistMask |= bit (1);
EndpointExistMask |= bit (1);
} }
} }
// //
// We parse interrupt endpoint // We parse interrupt endpoint
// //
if (EndpointDescriptor.Attributes == 0x03) { if (EndpointDescriptor.Attributes == 0x03) {
CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor)); CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
// UsbCbiDev->InterruptEndpointDescriptor = EndpointDescriptor;
EndpointExistMask |= bit (2); EndpointExistMask |= bit (2);
} }

13
EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
View File

@ -309,12 +309,10 @@ CBI1DriverBindingStart (
// //
if (EndpointDescriptor.Attributes == 0x02) { if (EndpointDescriptor.Attributes == 0x02) {
if (EndpointDescriptor.EndpointAddress & 0x80) { if (EndpointDescriptor.EndpointAddress & 0x80) {
CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor)); CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
//UsbCbiDev->BulkInEndpointDescriptor = EndpointDescriptor; } else {
} else { CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor)); }
//UsbCbiDev->BulkOutEndpointDescriptor = EndpointDescriptor;
}
Found = TRUE; Found = TRUE;
} }
@ -322,8 +320,7 @@ CBI1DriverBindingStart (
// We parse interrupt endpoint // We parse interrupt endpoint
// //
if (EndpointDescriptor.Attributes == 0x03) { if (EndpointDescriptor.Attributes == 0x03) {
CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor)); CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
//UsbCbiDev->InterruptEndpointDescriptor = EndpointDescriptor;
Found = TRUE; Found = TRUE;
} }

1
EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c
View File

@ -297,7 +297,6 @@ USBKeyboardDriverBindingStart (
// We only care interrupt endpoint here // We only care interrupt endpoint here
// //
CopyMem (&UsbKeyboardDevice->IntEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor)); CopyMem (&UsbKeyboardDevice->IntEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
//UsbKeyboardDevice->IntEndpointDescriptor = EndpointDescriptor;
Found = TRUE; Found = TRUE;
} }
} }

2
EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageData.h
View File

@ -25,7 +25,7 @@ Revision History
// //
// bit definition // bit definition
// //
#define bit(a) 1 << (a) #define bit(a) (1 << (a))
// //
// timeout unit is in millisecond. // timeout unit is in millisecond.

1
EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorageHelper.c
View File

@ -924,7 +924,6 @@ UsbFloppyDetectMedia (
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
FloppyStatus = EFI_SUCCESS; FloppyStatus = EFI_SUCCESS;
CopyMem (&OldMediaInfo, UsbFloppyDevice->BlkIo.Media, sizeof (OldMediaInfo)); CopyMem (&OldMediaInfo, UsbFloppyDevice->BlkIo.Media, sizeof (OldMediaInfo));
//OldMediaInfo = *UsbFloppyDevice->BlkIo.Media;
*MediaChange = FALSE; *MediaChange = FALSE;
NeedReadCapacity = TRUE; NeedReadCapacity = TRUE;