forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed possible enumeration error if the user application selects the non-Control pipe between the Powered and Default states of the host state machine.

Browse Source
pull/1469/head
Dean Camera 13 years ago
parent 7cbea39c42
commit 8a9e30a0cb
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
LUFA.pnproj
View File

File diff suppressed because one or more lines are too long

13
LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c
Unescape View File

@ -111,11 +111,9 @@ void USB_Host_ProcessNextHostState(void)
HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe); HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe);
break; break;
case HOST_STATE_Powered_ConfigPipe: case HOST_STATE_Powered_ConfigPipe:
Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP, PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE); PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE)))
if (!(Pipe_IsConfigured()))
{ {
ErrorCode = HOST_ENUMERROR_PipeConfigError; ErrorCode = HOST_ENUMERROR_PipeConfigError;
SubErrorCode = 0; SubErrorCode = 0;
@ -136,6 +134,7 @@ void USB_Host_ProcessNextHostState(void)
uint8_t DataBuffer[8]; uint8_t DataBuffer[8];
Pipe_SelectPipe(PIPE_CONTROLPIPE);
if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful) if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)
{ {
ErrorCode = HOST_ENUMERROR_ControlError; ErrorCode = HOST_ENUMERROR_ControlError;
@ -149,11 +148,9 @@ void USB_Host_ProcessNextHostState(void)
HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset); HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);
break; break;
case HOST_STATE_Default_PostReset: case HOST_STATE_Default_PostReset:
Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP, PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
USB_Host_ControlPipeSize, PIPE_BANK_SINGLE); USB_Host_ControlPipeSize, PIPE_BANK_SINGLE)))
if (!(Pipe_IsConfigured()))
{ {
ErrorCode = HOST_ENUMERROR_PipeConfigError; ErrorCode = HOST_ENUMERROR_PipeConfigError;
SubErrorCode = 0; SubErrorCode = 0;

13
LUFA/Drivers/USB/Core/UC3/Host_UC3.c
Unescape View File

@ -111,11 +111,9 @@ void USB_Host_ProcessNextHostState(void)
HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe); HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe);
break; break;
case HOST_STATE_Powered_ConfigPipe: case HOST_STATE_Powered_ConfigPipe:
Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP, PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE); PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE)))
if (!(Pipe_IsConfigured()))
{ {
ErrorCode = HOST_ENUMERROR_PipeConfigError; ErrorCode = HOST_ENUMERROR_PipeConfigError;
SubErrorCode = 0; SubErrorCode = 0;
@ -136,6 +134,7 @@ void USB_Host_ProcessNextHostState(void)
uint8_t DataBuffer[8]; uint8_t DataBuffer[8];
Pipe_SelectPipe(PIPE_CONTROLPIPE);
if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful) if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)
{ {
ErrorCode = HOST_ENUMERROR_ControlError; ErrorCode = HOST_ENUMERROR_ControlError;
@ -149,11 +148,9 @@ void USB_Host_ProcessNextHostState(void)
HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset); HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);
break; break;
case HOST_STATE_Default_PostReset: case HOST_STATE_Default_PostReset:
Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP, PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
USB_Host_ControlPipeSize, PIPE_BANK_SINGLE); USB_Host_ControlPipeSize, PIPE_BANK_SINGLE)))
if (!(Pipe_IsConfigured()))
{ {
ErrorCode = HOST_ENUMERROR_PipeConfigError; ErrorCode = HOST_ENUMERROR_PipeConfigError;
SubErrorCode = 0; SubErrorCode = 0;

Write Preview
Loading…
Cancel
Save