X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/44179abcf85acb14fb3aff72ce50ae84281c0f2e..e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7:/LUFA/Drivers/USB/LowLevel/Host.h 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. */