projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename the AT90USBXXX67 internal driver directory to AVRU4U6U7.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
LowLevel
/
Host.c
diff --git
a/LUFA/Drivers/USB/LowLevel/Host.c
b/LUFA/Drivers/USB/LowLevel/Host.c
index
8a51ae5
..
9186f1c
100644
(file)
--- a/
LUFA/Drivers/USB/LowLevel/Host.c
+++ b/
LUFA/Drivers/USB/LowLevel/Host.c
@@
-137,11
+137,7
@@
void USB_Host_ProcessNextHostState(void)
break;
\r
}
\r
\r
break;
\r
}
\r
\r
- #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
\r
USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];
\r
USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];
\r
- #else
\r
- USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, bMaxPacketSize0)];
\r
- #endif
\r
\r
USB_Host_ResetDevice();
\r
\r
\r
USB_Host_ResetDevice();
\r
\r
@@
-316,7
+312,7
@@
uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)
uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)
\r
{
\r
if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)
\r
uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)
\r
{
\r
if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)
\r
- EndpointNum |=
(1 << 7)
;
\r
+ EndpointNum |=
ENDPOINT_DESCRIPTOR_DIR_IN
;
\r
\r
USB_ControlRequest = (USB_Request_Header_t)
\r
{
\r
\r
USB_ControlRequest = (USB_Request_Header_t)
\r
{
\r