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

SourceLevelDebugPkg/DebugCommunicationLibUsb: Add endpoint config. 

Currently, DebugCommunicationLibUsb uses the hardcoded endpoints 0x82
and 0x01 to communicate with the EHCI Debug Device. These, however,
are not standardized and may vary across different hardware.
To solve this problem, the endpoints are retrieved from the
USB Device Descriptor directly.

V2:
  - Store endpoint data in the USB Debug Port handle structure.

V3:
  - Remove the static endpoint PCDs as requested.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
This commit is contained in:
Marvin H?user 2018-06-17 00:16:24 +08:00 committed by Hao Wu
parent 87a4624472
commit 73ae70db0f
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
View File

@ -132,6 +132,14 @@ typedef struct _USB_DEBUG_PORT_HANDLE{
//
UINT32 EhciMemoryBase;
//
// The usb debug device In endpoint.
//
UINT8 InEndpoint;
//
// The usb debug device Out endpoint.
//
UINT8 OutEndpoint;
//
// The Bulk In endpoint toggle bit.
//
UINT8 BulkInToggle;
@ -722,6 +730,12 @@ InitializeUsbDebugHardware (
return RETURN_DEVICE_ERROR;
}
//
// Determine the usb debug device endpoints.
//
Handle->InEndpoint = UsbDebugPortDescriptor.DebugInEndpoint;
Handle->OutEndpoint = UsbDebugPortDescriptor.DebugOutEndpoint;
//
// enable the usb debug feature.
//
@ -879,7 +893,7 @@ DebugPortWriteBuffer (
Sent = (UINT8)(NumberOfBytes - Total);
}
Status = UsbDebugPortOut(UsbDebugPortRegister, Buffer + Total, Sent, OUTPUT_PID, 0x7F, 0x01, UsbDebugPortHandle->BulkOutToggle);
Status = UsbDebugPortOut(UsbDebugPortRegister, Buffer + Total, Sent, OUTPUT_PID, 0x7F, UsbDebugPortHandle->OutEndpoint, UsbDebugPortHandle->BulkOutToggle);
if (RETURN_ERROR(Status)) {
return Total;
@ -959,7 +973,7 @@ DebugPortPollBuffer (
UsbDebugPortRegister->SendPid = DATA1_PID;
}
UsbDebugPortRegister->UsbAddress = 0x7F;
UsbDebugPortRegister->UsbEndPoint = 0x82 & 0x0F;
UsbDebugPortRegister->UsbEndPoint = UsbDebugPortHandle->InEndpoint & 0x0F;
//
// Clearing W/R bit to indicate it's a READ operation

2
SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.inf
View File

@ -45,7 +45,7 @@
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbEhciPciAddress ## CONSUMES
# The value of data buffer size used for USB debug port handle.
# It should be equal to sizeof (USB_DEBUG_PORT_HANDLE).
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugPortHandleBufferSize|23 ## SOMETIMES_CONSUMES
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugPortHandleBufferSize|25 ## SOMETIMES_CONSUMES
[LibraryClasses]
TimerLib