ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB_HostRequest renamed to USB_ControlRequest, entire control request header is now read into USB_ControlRequest in Device mode rather than having the library pass only partially read header data to the application.

Browse source 
The USB_UnhandledControlPacket event has had its parameters removed, in favour of accessing the new USB_ControlRequest structure.

The Endpoint control stream functions now correctly send a ZLP to the host when less data than requested is sent.
This commit is contained in:
Dean Camera 2009-04-22 13:03:11 +00:00
parent e5e7eaee7a
commit d860e9e842
43 changed files with 209 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

18
LUFA/Drivers/USB/LowLevel/Endpoint.c
View file

@ -292,8 +292,9 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
{
uint8_t* DataStream = (uint8_t*)Buffer;
bool SendZLP = true;
uint8_t* DataStream = (uint8_t*)Buffer;
bool LastPacketFull = false;
bool ShortTransfer = (Length < USB_ControlRequest.wLength);
while (Length && !(Endpoint_IsOUTReceived()))
{
@ -306,14 +307,14 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
Length--;
}
SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
Endpoint_ClearIN();
}
if (Endpoint_IsOUTReceived())
return ENDPOINT_RWCSTREAM_ERROR_HostAborted;
if (SendZLP)
if (LastPacketFull || ShortTransfer)
{
while (!(Endpoint_IsINReady()));
Endpoint_ClearIN();
@ -326,8 +327,9 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
{
uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);
bool SendZLP = true;
uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);
bool LastPacketFull = false;
bool ShortTransfer = (Length < USB_ControlRequest.wLength);
while (Length && !(Endpoint_IsOUTReceived()))
{
@ -340,14 +342,14 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
Length--;
}
SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
Endpoint_ClearIN();
}
if (Endpoint_IsOUTReceived())
return ENDPOINT_RWCSTREAM_ERROR_HostAborted;
if (SendZLP)
if (LastPacketFull || ShortTransfer)
{
while (!(Endpoint_IsINReady()));
Endpoint_ClearIN();