diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-07-21 13:31:21 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-07-21 13:31:21 +0000 |
| commit | e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7 (patch) | |
| tree | 51ac5c80564fd76c93a357ee4d52a347384ac84b /LUFA/Drivers/USB/LowLevel/Host.h | |
| parent | 44179abcf85acb14fb3aff72ce50ae84281c0f2e (diff) | |
| download | lufa-e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7.tar.gz lufa-e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7.tar.bz2 lufa-e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7.zip | |
Added new USB_DeviceState variable to keep track of the current Device mode USB state.
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.
Diffstat (limited to 'LUFA/Drivers/USB/LowLevel/Host.h')
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Host.h | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h index 88634fdae..a602cee77 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.h +++ b/LUFA/Drivers/USB/LowLevel/Host.h @@ -241,32 +241,32 @@ *
* \note Do not manually change to this state in the user code.
*/
- HOST_STATE_Attached = 3, /**< Internally implemented by the library. This state indicates
+ HOST_STATE_Powered = 3, /**< Internally implemented by the library. This state indicates
* that a device has been attached, and the library's internals
* are being configured to begin the enumeration process.
*
* \note Do not manually change to this state in the user code.
*/
- HOST_STATE_Attached_WaitForDeviceSettle = 4, /**< Internally implemented by the library. This state indicates
+ HOST_STATE_Powered_WaitForDeviceSettle = 4, /**< Internally implemented by the library. This state indicates
* that the stack is waiting for the initial settling period to
* elapse before beginning the enumeration process.
*
* \note Do not manually change to this state in the user code.
*/
- HOST_STATE_Attached_WaitForConnect = 5, /**< Internally implemented by the library. This state indicates
+ HOST_STATE_Powered_WaitForConnect = 5, /**< Internally implemented by the library. This state indicates
* that the stack is waiting for a connection event from the USB
* controller to indicate a valid USB device has been attached to
* the bus and is ready to be enumerated.
*
* \note Do not manually change to this state in the user code.
*/
- HOST_STATE_Attached_DoReset = 6, /**< Internally implemented by the library. This state indicates
+ HOST_STATE_Powered_DoReset = 6, /**< Internally implemented by the library. This state indicates
* that a valid USB device has been attached, and that it is
* will now be reset to ensure it is ready for enumeration.
*
* \note Do not manually change to this state in the user code.
*/
- HOST_STATE_Powered = 7, /**< Internally implemented by the library. This state indicates
+ HOST_STATE_Powered_ConfigPipe = 7, /**< Internally implemented by the library. This state indicates
* that the attached device is currently powered and reset, and
* that the control pipe is now being configured by the stack.
*
@@ -301,20 +301,12 @@ * retrieval and processing of the device descriptor) should also
* be placed in this state.
*/
- HOST_STATE_Configured = 12, /**< May be implemented by the user project. This state should
- * implement any extra device configuration (such as the setting of
- * class-specific parameters) before normal communication is begun
- * in the HOST_STATE_Ready state.
- */
- HOST_STATE_Ready = 13, /**< May be implemented by the user project. This state should
- * contain the main communications with the attached device. From this
- * this state the host state machine should be changed to either
- * HOST_STATE_Suspended (after the bus is manually suspended using the
- * USB_Host_SuspendBus() macro) or HOST_STATE_WaitForDeviceRemoval as
- * needed.
+ HOST_STATE_Configured = 12, /**< May be implemented by the user project. This state should implement the
+ * actual work performed on the attached device and changed to the
+ * HOST_STATE_Suspended or HOST_STATE_WaitForDeviceRemoval states as needed.
*/
HOST_STATE_Suspended = 15, /**< May be implemented by the user project. This state should be maintained
- * while the bus is suspended, and changed to either the HOST_STATE_Ready
+ * while the bus is suspended, and changed to either the HOST_STATE_Configured
* (after resuming the bus with the USB_Host_ResumeBus() macro) or the
* HOST_STATE_WaitForDeviceRemoval states as needed.
*/
|