/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
}\r
\r
break;\r
- case HOST_STATE_Attached:\r
+ case HOST_STATE_Powered:\r
WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;\r
\r
- USB_HostState = HOST_STATE_Attached_WaitForDeviceSettle;\r
+ USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;\r
break;\r
- case HOST_STATE_Attached_WaitForDeviceSettle:\r
- _delay_ms(1);\r
-\r
- if (!(WaitMSRemaining--))\r
+ case HOST_STATE_Powered_WaitForDeviceSettle:\r
+ if (WaitMSRemaining--)\r
+ {\r
+ _delay_ms(1);\r
+ break;\r
+ }\r
+ else\r
{\r
USB_Host_VBUS_Manual_Off();\r
\r
USB_Host_VBUS_Auto_Enable();\r
USB_Host_VBUS_Auto_On();\r
\r
- USB_HostState = HOST_STATE_Attached_WaitForConnect;\r
+ USB_HostState = HOST_STATE_Powered_WaitForConnect;\r
}\r
\r
break;\r
- case HOST_STATE_Attached_WaitForConnect: \r
+ case HOST_STATE_Powered_WaitForConnect: \r
if (USB_INT_HasOccurred(USB_INT_DCONNI))\r
{ \r
USB_INT_Clear(USB_INT_DCONNI);\r
\r
USB_INT_Clear(USB_INT_VBERRI);\r
USB_INT_Enable(USB_INT_VBERRI);\r
-\r
- USB_IsConnected = true;\r
- EVENT_USB_Connect();\r
\r
USB_Host_ResumeBus();\r
Pipe_ClearPipes();\r
\r
- HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Attached_DoReset);\r
+ HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Powered_DoReset);\r
}\r
\r
break;\r
- case HOST_STATE_Attached_DoReset:\r
+ case HOST_STATE_Powered_DoReset:\r
USB_Host_ResetDevice();\r
\r
- HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered);\r
+ HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe);\r
break;\r
- case HOST_STATE_Powered:\r
+ case HOST_STATE_Powered_ConfigPipe:\r
Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE); \r
break;\r
}\r
\r
- #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\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
break;\r
}\r
\r
- Pipe_SetInfiniteINRequests();\r
- \r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
case HOST_STATE_Default_PostAddressSet:\r
USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
\r
- EVENT_USB_DeviceEnumerationComplete();\r
+ EVENT_USB_Host_DeviceEnumerationComplete();\r
USB_HostState = HOST_STATE_Addressed;\r
-\r
break;\r
}\r
\r
if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
{\r
- EVENT_USB_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r
+ EVENT_USB_Host_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r
\r
USB_Host_VBUS_Auto_Off();\r
\r
- EVENT_USB_DeviceUnattached();\r
- \r
- if (USB_IsConnected)\r
- EVENT_USB_Disconnect();\r
+ EVENT_USB_Host_DeviceUnattached();\r
\r
USB_ResetInterface();\r
}\r
MS--;\r
}\r
\r
- if ((USB_IsConnected == false) || (USB_CurrentMode == USB_MODE_DEVICE))\r
+ if ((USB_HostState == HOST_STATE_Unattached) || (USB_CurrentMode == USB_MODE_DEVICE))\r
{\r
ErrorCode = HOST_WAITERROR_DeviceDisconnect;\r
\r
USB_INT_Enable(USB_INT_DDISCI);\r
}\r
\r
-uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber)\r
+uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber)\r
{\r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
return USB_Host_SendControlRequest(NULL);\r
}\r
\r
-uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr)\r
+uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)\r
{\r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
- bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
- bRequest: REQ_GetDescriptor,\r
- wValue: (DTYPE_Device << 8),\r
- wIndex: 0,\r
- wLength: sizeof(USB_Descriptor_Device_t),\r
+ .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+ .bRequest = REQ_GetDescriptor,\r
+ .wValue = (DTYPE_Device << 8),\r
+ .wIndex = 0,\r
+ .wLength = sizeof(USB_Descriptor_Device_t),\r
};\r
\r
Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
return USB_Host_SendControlRequest(DeviceDescriptorPtr);\r
}\r
\r
+uint8_t USB_Host_GetDeviceStringDescriptor(uint8_t Index, void* const Buffer, uint8_t BufferLength)\r
+{\r
+ USB_ControlRequest = (USB_Request_Header_t)\r
+ {\r
+ .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+ .bRequest = REQ_GetDescriptor,\r
+ .wValue = (DTYPE_String << 8) | Index,\r
+ .wIndex = 0,\r
+ .wLength = BufferLength,\r
+ };\r
+\r
+ Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+ \r
+ return USB_Host_SendControlRequest(Buffer);\r
+}\r
+\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
projects / pub / USBasp.git / blobdiff