/*\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
void USB_INT_DisableAllInterrupts(void)\r
{\r
- #if defined(USB_FULL_CONTROLLER)\r
+ #if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
USBCON &= ~((1 << VBUSTE) | (1 << IDTE)); \r
- #elif defined(USB_MODIFIED_FULL_CONTROLLER)\r
+ #elif defined(USB_SERIES_4_AVR)\r
USBCON &= ~(1 << VBUSTE); \r
#endif\r
\r
\r
void USB_INT_ClearAllInterrupts(void)\r
{\r
- #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+ #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
USBINT = 0;\r
#endif\r
\r
ISR(USB_GEN_vect, ISR_BLOCK)\r
{\r
#if defined(USB_CAN_BE_DEVICE)\r
- #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+ #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))\r
{\r
USB_INT_Clear(USB_INT_VBUS);\r
\r
- EVENT_USB_VBUSChange();\r
-\r
if (USB_VBUS_GetStatus())\r
{\r
- EVENT_USB_VBUSConnect();\r
- \r
- if (USB_IsConnected)\r
- EVENT_USB_Disconnect();\r
- \r
- USB_ResetInterface();\r
- \r
- USB_IsConnected = true;\r
-\r
- EVENT_USB_Connect();\r
+ USB_DeviceState = DEVICE_STATE_Powered;\r
+ EVENT_USB_Device_Connect();\r
}\r
else\r
{\r
- USB_IsConnected = false;\r
-\r
- EVENT_USB_Disconnect();\r
- \r
- USB_Detach();\r
- USB_CLK_Freeze();\r
- USB_PLL_Off();\r
- USB_REG_Off();\r
-\r
- EVENT_USB_VBUSDisconnect();\r
- \r
- USB_INT_Clear(USB_INT_VBUS);\r
+ USB_DeviceState = DEVICE_STATE_Unattached; \r
+ EVENT_USB_Device_Disconnect();\r
}\r
}\r
#endif\r
if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
USB_PLL_Off();\r
\r
- USB_IsSuspended = true;\r
-\r
- EVENT_USB_Suspend();\r
-\r
- #if defined(USB_LIMITED_CONTROLLER) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
- if (USB_IsConnected)\r
- {\r
- USB_IsConnected = false;\r
- EVENT_USB_Disconnect();\r
- }\r
+ #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
+ USB_DeviceState = DEVICE_STATE_Unattached;\r
+ EVENT_USB_Device_Disconnect();\r
+ #else\r
+ USB_DeviceState = DEVICE_STATE_Suspended;\r
+ EVENT_USB_Device_Suspend();\r
#endif\r
}\r
\r
USB_INT_Disable(USB_INT_WAKEUP);\r
USB_INT_Enable(USB_INT_SUSPEND);\r
\r
- #if defined(USB_LIMITED_CONTROLLER) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
- if (!(USB_IsConnected))\r
- {\r
- USB_IsConnected = true;\r
- EVENT_USB_Connect();\r
- }\r
+ #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
+ USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;\r
+ EVENT_USB_Device_Connect();\r
+ #else\r
+ USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r
+ EVENT_USB_Device_WakeUp(); \r
#endif\r
-\r
- USB_IsSuspended = false;\r
-\r
- EVENT_USB_WakeUp();\r
}\r
\r
if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI))\r
{\r
USB_INT_Clear(USB_INT_EORSTI);\r
\r
+ USB_DeviceState = DEVICE_STATE_Default;\r
USB_ConfigurationNumber = 0;\r
\r
USB_INT_Clear(USB_INT_SUSPEND);\r
ENDPOINT_BANK_SINGLE);\r
\r
#if defined(INTERRUPT_CONTROL_ENDPOINT)\r
- USB_INT_Enable(USB_INT_ENDPOINT_SETUP);\r
+ USB_INT_Enable(USB_INT_RXSTPI);\r
#endif\r
\r
- EVENT_USB_Reset();\r
+ EVENT_USB_Device_Reset();\r
+ }\r
+ \r
+ if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))\r
+ {\r
+ USB_INT_Clear(USB_INT_SOFI);\r
+ \r
+ EVENT_USB_Device_StartOfFrame();\r
}\r
#endif\r
\r
USB_INT_Clear(USB_INT_DCONNI);\r
USB_INT_Disable(USB_INT_DDISCI);\r
\r
- EVENT_USB_DeviceUnattached();\r
- EVENT_USB_Disconnect();\r
+ EVENT_USB_Host_DeviceUnattached();\r
\r
USB_ResetInterface();\r
}\r
USB_Host_VBUS_Manual_Off();\r
USB_Host_VBUS_Auto_Off();\r
\r
- EVENT_USB_HostError(HOST_ERROR_VBusVoltageDip);\r
- EVENT_USB_DeviceUnattached();\r
+ EVENT_USB_Host_HostError(HOST_ERROR_VBusVoltageDip);\r
+ EVENT_USB_Host_DeviceUnattached();\r
\r
USB_HostState = HOST_STATE_Unattached;\r
}\r
USB_INT_Clear(USB_INT_SRPI);\r
USB_INT_Disable(USB_INT_SRPI);\r
\r
- EVENT_USB_DeviceAttached();\r
+ EVENT_USB_Host_DeviceAttached();\r
\r
USB_INT_Enable(USB_INT_DDISCI);\r
\r
- USB_HostState = HOST_STATE_Attached;\r
+ USB_HostState = HOST_STATE_Powered;\r
}\r
\r
if (USB_INT_HasOccurred(USB_INT_BCERRI) && USB_INT_IsEnabled(USB_INT_BCERRI))\r
{\r
USB_INT_Clear(USB_INT_BCERRI);\r
\r
- EVENT_USB_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);\r
- EVENT_USB_DeviceUnattached();\r
- \r
- if (USB_IsConnected)\r
- EVENT_USB_Disconnect();\r
+ EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);\r
+ EVENT_USB_Host_DeviceUnattached();\r
\r
USB_ResetInterface();\r
}\r
{ \r
USB_INT_Clear(USB_INT_IDTI);\r
\r
- if (USB_IsConnected)\r
- {\r
- if (USB_CurrentMode == USB_MODE_HOST)\r
- EVENT_USB_DeviceUnattached();\r
- else\r
- EVENT_USB_Disconnect();\r
- }\r
+ if (USB_DeviceState != DEVICE_STATE_Unattached)\r
+ EVENT_USB_Device_Disconnect();\r
\r
- EVENT_USB_UIDChange();\r
+ if (USB_HostState != HOST_STATE_Unattached)\r
+ EVENT_USB_Host_DeviceUnattached();\r
\r
+ USB_CurrentMode = USB_GetUSBModeFromUID();\r
+ EVENT_USB_UIDChange();\r
+\r
USB_ResetInterface();\r
}\r
#endif\r
}\r
\r
-#if defined(INTERRUPT_CONTROL_ENDPOINT)\r
+#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)\r
ISR(USB_COM_vect, ISR_BLOCK)\r
{\r
uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
\r
USB_USBTask();\r
\r
- USB_INT_Clear(USB_INT_ENDPOINT_SETUP);\r
+ USB_INT_Clear(USB_INT_RXSTPI);\r
\r
- Endpoint_SelectEndpoint(PrevSelectedEndpoint); \r
+ Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r
}\r
#endif\r
projects / pub / USBasp.git / blobdiff