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

Added new USB_DeviceState variable to keep track of the current Device mode USB state.

Browse source 
Added new Endpoint_ClearStatusStage() convenience function to assist with the status stages of control transfers.

Removed vague USB_IsConnected global - test USB_DeviceState or USB_HostState explicitly to gain previous functionality.

Removed USB_IsSuspended global - test USB_DeviceState against DEVICE_STATE_Suspended instead.

Fixed possible enumeration errors from spinloops which may fail to exit if the USB connection is severed before the exit condition becomes true.
This commit is contained in:
Dean Camera 2009-07-21 13:31:21 +00:00
parent 44179abcf8
commit e071f3897a
58 changed files with 666 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
View file

@ -171,14 +171,11 @@ void MassStorage_Task(void)
break;
}
puts_P(PSTR("Mass Storage Disk Enumerated.\r\n"));
USB_HostState = HOST_STATE_Configured;
break;
case HOST_STATE_Configured:
puts_P(PSTR("Mass Storage Disk Enumerated.\r\n"));
USB_HostState = HOST_STATE_Ready;
break;
case HOST_STATE_Ready:
/* Indicate device busy via the status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
@ -241,7 +238,11 @@ void MassStorage_Task(void)
{
Serial_TxByte('.');
if ((ErrorCode = MassStore_TestUnitReady(0)) != 0)
/* Abort if device removed */
if (USB_HostState == HOST_STATE_Unattached)
break;
if ((ErrorCode = MassStore_TestUnitReady(0)) != PIPE_RWSTREAM_NoError)
{
ShowDiskReadError(PSTR("Test Unit Ready"), false, ErrorCode);
@ -249,11 +250,7 @@ void MassStorage_Task(void)
break;
}
}
while ((SCSICommandStatus.Status != Command_Pass) && USB_IsConnected);
/* Abort if device removed */
if (!(USB_IsConnected))
break;
while (SCSICommandStatus.Status != Command_Pass);
puts_P(PSTR("\r\nRetrieving Capacity... "));
@ -320,7 +317,7 @@ void MassStorage_Task(void)
while (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
{
/* Abort if device removed */
if (!(USB_IsConnected))
if (USB_HostState == HOST_STATE_Unattached)
break;
}
@ -346,7 +343,7 @@ void MassStorage_Task(void)
}
/* Abort if device removed */
if (!(USB_IsConnected))
if (USB_HostState == HOST_STATE_Unattached)
break;
}