forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up USBController.c/.h to more clearly seperate out host and device setup and reset paths.

Browse Source 
Make USBInterrupt.c process all pending USB host mode interrupts before resetting the bus, so that no interrupts are lost when in UID auto-selection mode.
pull/1469/head
Dean Camera 14 years ago
parent 01fecac0a7
commit e7e1c21bc5
3 changed files with 111 additions and 135 deletions
Show Stats Download Patch File Download Diff File

220
LUFA/Drivers/USB/LowLevel/USBController.c
Unescape View File

@ -29,10 +29,11 @@
*/ */
#define __INCLUDE_FROM_USB_DRIVER #define __INCLUDE_FROM_USB_DRIVER
#define __INCLUDE_FROM_USB_CONTROLLER_C
#include "USBController.h" #include "USBController.h"
#if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
volatile uint8_t USB_CurrentMode = USB_MODE_NONE; volatile uint8_t USB_CurrentMode = USB_MODE_NONE;
#endif #endif
#if !defined(USE_STATIC_OPTIONS) #if !defined(USE_STATIC_OPTIONS)
@ -55,58 +56,35 @@ void USB_Init(
#endif #endif
) )
{ {
#if defined(USB_CAN_BE_BOTH)
USB_CurrentMode = Mode;
#endif
#if !defined(USE_STATIC_OPTIONS) #if !defined(USE_STATIC_OPTIONS)
USB_Options = Options; USB_Options = Options;
#endif #endif
#if defined(USB_CAN_BE_HOST)
USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
#endif
#if defined(USB_DEVICE_ONLY) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) #if defined(USB_CAN_BE_BOTH)
UHWCON |= (1 << UIMOD); if (Mode == USB_MODE_UID)
#elif defined(USB_HOST_ONLY)
UHWCON &= ~(1 << UIMOD);
#elif defined(USB_CAN_BE_BOTH)
if (Mode == USB_MODE_DEVICE)
{
UHWCON |= (1 << UIMOD);
}
else if (Mode == USB_MODE_HOST)
{ {
UHWCON &= ~(1 << UIMOD); UHWCON |= (1 << UIDE);
USB_INT_Enable(USB_INT_IDTI);
USB_CurrentMode = USB_GetUSBModeFromUID();
} }
else else
{ {
UHWCON |= (1 << UIDE); USB_CurrentMode = Mode;
} }
#endif #endif
USB_ResetInterface();
#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
USB_OTGPAD_On();
#endif
USB_IsInitialized = true; USB_IsInitialized = true;
USB_ResetInterface();
} }
void USB_ShutDown(void) void USB_ShutDown(void)
{ {
USB_ResetInterface();
USB_Detach();
USB_Controller_Disable();
USB_INT_DisableAllInterrupts(); USB_INT_DisableAllInterrupts();
USB_INT_ClearAllInterrupts(); USB_INT_ClearAllInterrupts();
#if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) USB_Detach();
UHWCON &= ~(1 << UIMOD); USB_Controller_Disable();
#endif
if (!(USB_Options & USB_OPT_MANUAL_PLL)) if (!(USB_Options & USB_OPT_MANUAL_PLL))
USB_PLL_Off(); USB_PLL_Off();
@ -118,38 +96,26 @@ void USB_ShutDown(void)
#endif #endif
#if defined(USB_CAN_BE_BOTH) #if defined(USB_CAN_BE_BOTH)
UHWCON &= ~(1 << UIDE); USB_CurrentMode = USB_MODE_NONE;
#endif #endif
USB_IsInitialized = false; USB_IsInitialized = false;
#if defined(USB_CAN_BE_BOTH)
USB_CurrentMode = USB_MODE_NONE;
#endif
} }
void USB_ResetInterface(void) void USB_ResetInterface(void)
{ {
bool UIDModeSelectEnabled = ((UHWCON & (1 << UIDE)) != 0);
USB_INT_DisableAllInterrupts(); USB_INT_DisableAllInterrupts();
USB_INT_ClearAllInterrupts(); USB_INT_ClearAllInterrupts();
#if defined(USB_CAN_BE_HOST) USB_Controller_Reset();
USB_HostState = HOST_STATE_Unattached;
#endif
#if defined(USB_CAN_BE_DEVICE)
USB_DeviceState = DEVICE_STATE_Unattached;
USB_ConfigurationNumber = 0;
#if !defined(NO_DEVICE_REMOTE_WAKEUP) if (!(USB_Options & USB_OPT_REG_DISABLED))
USB_RemoteWakeupEnabled = false; USB_REG_On();
#endif else
USB_REG_Off();
#if !defined(NO_DEVICE_SELF_POWER)
USB_CurrentlySelfPowered = false;
#endif
#endif
if (!(USB_Options & USB_OPT_MANUAL_PLL)) if (!(USB_Options & USB_OPT_MANUAL_PLL))
{ {
#if defined(USB_SERIES_4_AVR) #if defined(USB_SERIES_4_AVR)
@ -158,104 +124,98 @@ void USB_ResetInterface(void)
USB_PLL_On(); USB_PLL_On();
while (!(USB_PLL_IsReady())); while (!(USB_PLL_IsReady()));
} }
USB_Controller_Reset(); USB_CLK_Unfreeze();
#if defined(USB_CAN_BE_BOTH) #if defined(USB_DEVICE_ONLY) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
if (UHWCON & (1 << UIDE)) UHWCON |= (1 << UIMOD);
USB_Init_Device();
#elif defined(USB_HOST_ONLY)
UHWCON &= ~(1 << UIMOD);
USB_Init_Host();
#elif defined(USB_CAN_BE_BOTH)
if (UIDModeSelectEnabled)
{ {
USB_INT_Clear(USB_INT_IDTI); UHWCON |= (1 << UIDE);
USB_INT_Enable(USB_INT_IDTI); USB_INT_Enable(USB_INT_IDTI);
USB_CurrentMode = USB_GetUSBModeFromUID();
} }
#endif
if (!(USB_Options & USB_OPT_REG_DISABLED))
USB_REG_On();
else
USB_REG_Off();
USB_CLK_Unfreeze();
#if (defined(USB_CAN_BE_DEVICE) && (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)))
if (USB_CurrentMode == USB_MODE_DEVICE) if (USB_CurrentMode == USB_MODE_DEVICE)
{ {
if (USB_Options & USB_DEVICE_OPT_LOWSPEED) UHWCON |= (1 << UIMOD);
USB_Device_SetLowSpeed(); USB_Init_Device();
else }
USB_Device_SetFullSpeed(); else
{
UHWCON &= ~(1 << UIMOD);
USB_Init_Host();
} }
#endif #endif
#if (defined(USB_CAN_BE_DEVICE) && !defined(FIXED_CONTROL_ENDPOINT_SIZE)) USB_OTGPAD_On();
if (USB_CurrentMode == USB_MODE_DEVICE) USB_Attach();
{ }
USB_Descriptor_Device_t* DeviceDescriptorPtr;
#if defined(USB_CAN_BE_DEVICE)
static void USB_Init_Device(void)
{
USB_DeviceState = DEVICE_STATE_Unattached;
USB_ConfigurationNumber = 0;
#if !defined(NO_DEVICE_REMOTE_WAKEUP)
USB_RemoteWakeupEnabled = false;
#endif
#if !defined(NO_DEVICE_SELF_POWER)
USB_CurrentlySelfPowered = false;
#endif
if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR) #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
{ USB_Descriptor_Device_t* DeviceDescriptorPtr;
#if defined(USE_RAM_DESCRIPTORS)
USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size; if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
#elif defined(USE_EEPROM_DESCRIPTORS) {
USB_ControlEndpointSize = eeprom_read_byte(&DeviceDescriptorPtr->Endpoint0Size); #if defined(USE_RAM_DESCRIPTORS)
#else USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
USB_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size); #elif defined(USE_EEPROM_DESCRIPTORS)
#endif USB_ControlEndpointSize = eeprom_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
} #else
USB_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
#endif
} }
#endif #endif
USB_Attach(); #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
#if defined(USB_DEVICE_ONLY) USB_Device_SetLowSpeed();
else
USB_Device_SetFullSpeed();
USB_INT_Enable(USB_INT_VBUS);
#endif
USB_INT_Clear(USB_INT_SUSPEND); USB_INT_Clear(USB_INT_SUSPEND);
USB_INT_Enable(USB_INT_SUSPEND); USB_INT_Enable(USB_INT_SUSPEND);
USB_INT_Clear(USB_INT_EORSTI); USB_INT_Clear(USB_INT_EORSTI);
USB_INT_Enable(USB_INT_EORSTI); USB_INT_Enable(USB_INT_EORSTI);
}
#endif
#if defined(USB_CAN_BE_HOST)
static void USB_Init_Host(void)
{
USB_HostState = HOST_STATE_Unattached;
USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
USB_INT_Enable(USB_INT_VBUS);
#endif
#elif defined(USB_HOST_ONLY)
USB_Host_HostMode_On(); USB_Host_HostMode_On();
USB_CLK_Unfreeze();
USB_Host_VBUS_Auto_Off(); USB_Host_VBUS_Auto_Off();
USB_OTGPAD_Off();
USB_Host_VBUS_Manual_Enable(); USB_Host_VBUS_Manual_Enable();
USB_Host_VBUS_Manual_On(); USB_Host_VBUS_Manual_On();
USB_INT_Enable(USB_INT_SRPI); USB_INT_Enable(USB_INT_SRPI);
USB_INT_Enable(USB_INT_BCERRI); USB_INT_Enable(USB_INT_BCERRI);
#else
if (USB_CurrentMode == USB_MODE_DEVICE)
{
USB_INT_Clear(USB_INT_SUSPEND);
USB_INT_Enable(USB_INT_SUSPEND);
USB_INT_Clear(USB_INT_EORSTI);
USB_INT_Enable(USB_INT_EORSTI);
#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
USB_INT_Enable(USB_INT_VBUS);
#endif
Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
ENDPOINT_BANK_SINGLE);
}
else if (USB_CurrentMode == USB_MODE_HOST)
{
USB_Host_HostMode_On();
USB_Host_VBUS_Auto_Off();
USB_OTGPAD_Off();
USB_Host_VBUS_Manual_Enable();
USB_Host_VBUS_Manual_On();
USB_INT_Enable(USB_INT_SRPI);
USB_INT_Enable(USB_INT_BCERRI);
}
#endif
} }
#endif

13
LUFA/Drivers/USB/LowLevel/USBController.h
Unescape View File

@ -346,6 +346,17 @@
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Function Prototypes: */
#if defined(__INCLUDE_FROM_USB_CONTROLLER_C)
#if defined(USB_CAN_BE_DEVICE)
static void USB_Init_Device(void);
#endif
#if defined(USB_CAN_BE_HOST)
static void USB_Init_Host(void);
#endif
#endif
/* Inline Functions: */ /* Inline Functions: */
static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE; static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE;
static inline void USB_PLL_On(void) static inline void USB_PLL_On(void)
@ -443,7 +454,7 @@
return USB_MODE_HOST; return USB_MODE_HOST;
} }
#endif #endif
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

13
LUFA/Drivers/USB/LowLevel/USBInterrupt.c
Unescape View File

@ -168,6 +168,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
bool MustResetInterface = false;
if (USB_INT_HasOccurred(USB_INT_DDISCI) && USB_INT_IsEnabled(USB_INT_DDISCI)) if (USB_INT_HasOccurred(USB_INT_DDISCI) && USB_INT_IsEnabled(USB_INT_DDISCI))
{ {
USB_INT_Clear(USB_INT_DDISCI); USB_INT_Clear(USB_INT_DDISCI);
@ -175,8 +177,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
USB_INT_Disable(USB_INT_DDISCI); USB_INT_Disable(USB_INT_DDISCI);
EVENT_USB_Host_DeviceUnattached(); EVENT_USB_Host_DeviceUnattached();
USB_ResetInterface(); MustResetInterface = true;
} }
if (USB_INT_HasOccurred(USB_INT_VBERRI) && USB_INT_IsEnabled(USB_INT_VBERRI)) if (USB_INT_HasOccurred(USB_INT_VBERRI) && USB_INT_IsEnabled(USB_INT_VBERRI))
@ -211,7 +213,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0); EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);
EVENT_USB_Host_DeviceUnattached(); EVENT_USB_Host_DeviceUnattached();
USB_ResetInterface(); MustResetInterface = true;
} }
if (USB_INT_HasOccurred(USB_INT_HSOFI) && USB_INT_IsEnabled(USB_INT_HSOFI)) if (USB_INT_HasOccurred(USB_INT_HSOFI) && USB_INT_IsEnabled(USB_INT_HSOFI))
@ -236,8 +238,11 @@ ISR(USB_GEN_vect, ISR_BLOCK)
USB_CurrentMode = USB_GetUSBModeFromUID(); USB_CurrentMode = USB_GetUSBModeFromUID();
EVENT_USB_UIDChange(); EVENT_USB_UIDChange();
USB_ResetInterface(); MustResetInterface = true;
} }
if (MustResetInterface)
USB_ResetInterface();
#endif #endif
} }

Write Preview
Loading…
Cancel
Save