diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-19 08:42:30 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-19 08:42:30 +0000 |
| commit | ed7067e89f4adc1c5b9317caa0253d866ad2bf56 (patch) | |
| tree | f6668af0a7e123670e0e16d253bbf0dc6d071457 /LUFA | |
| parent | d66a925786e4e57713a2c902cdffe7269db43226 (diff) | |
| download | lufa-ed7067e89f4adc1c5b9317caa0253d866ad2bf56.tar.gz lufa-ed7067e89f4adc1c5b9317caa0253d866ad2bf56.tar.bz2 lufa-ed7067e89f4adc1c5b9317caa0253d866ad2bf56.zip | |
Rename internal suspend and wake up USB interrupt macros so that they follow the same naming scheme as the other USB ISR macros.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/USBController.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/USBInterrupt.c | 22 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/USBInterrupt.h | 4 |
4 files changed, 14 insertions, 16 deletions
diff --git a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c index 8d26874fa..83c85ded5 100644 --- a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c +++ b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c @@ -139,8 +139,6 @@ static void USB_Device_SetAddress(void) USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default; USB_Device_SetDeviceAddress(DeviceAddress); - - return; } static void USB_Device_SetConfiguration(void) diff --git a/LUFA/Drivers/USB/LowLevel/USBController.c b/LUFA/Drivers/USB/LowLevel/USBController.c index f7207778c..a7dbdca2f 100644 --- a/LUFA/Drivers/USB/LowLevel/USBController.c +++ b/LUFA/Drivers/USB/LowLevel/USBController.c @@ -203,7 +203,7 @@ static void USB_Init_Device(void) ENDPOINT_DIR_OUT, USB_ControlEndpointSize, ENDPOINT_BANK_SINGLE); - USB_INT_Enable(USB_INT_SUSPEND); + USB_INT_Enable(USB_INT_SUSPI); USB_INT_Enable(USB_INT_EORSTI); USB_Attach(); diff --git a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c index 311a7be4e..66a86a1b2 100644 --- a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c +++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c @@ -92,12 +92,12 @@ ISR(USB_GEN_vect, ISR_BLOCK) } #endif - if (USB_INT_HasOccurred(USB_INT_SUSPEND) && USB_INT_IsEnabled(USB_INT_SUSPEND)) + if (USB_INT_HasOccurred(USB_INT_SUSPI) && USB_INT_IsEnabled(USB_INT_SUSPI)) { - USB_INT_Clear(USB_INT_SUSPEND); + USB_INT_Clear(USB_INT_SUSPI); - USB_INT_Disable(USB_INT_SUSPEND); - USB_INT_Enable(USB_INT_WAKEUP); + USB_INT_Disable(USB_INT_SUSPI); + USB_INT_Enable(USB_INT_WAKEUPI); USB_CLK_Freeze(); @@ -113,7 +113,7 @@ ISR(USB_GEN_vect, ISR_BLOCK) #endif } - if (USB_INT_HasOccurred(USB_INT_WAKEUP) && USB_INT_IsEnabled(USB_INT_WAKEUP)) + if (USB_INT_HasOccurred(USB_INT_WAKEUPI) && USB_INT_IsEnabled(USB_INT_WAKEUPI)) { if (!(USB_Options & USB_OPT_MANUAL_PLL)) { @@ -123,10 +123,10 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_CLK_Unfreeze(); - USB_INT_Clear(USB_INT_WAKEUP); + USB_INT_Clear(USB_INT_WAKEUPI); - USB_INT_Disable(USB_INT_WAKEUP); - USB_INT_Enable(USB_INT_SUSPEND); + USB_INT_Disable(USB_INT_WAKEUPI); + USB_INT_Enable(USB_INT_SUSPI); #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT) USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered; @@ -144,9 +144,9 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_DeviceState = DEVICE_STATE_Default; USB_ConfigurationNumber = 0; - USB_INT_Clear(USB_INT_SUSPEND); - USB_INT_Disable(USB_INT_SUSPEND); - USB_INT_Enable(USB_INT_WAKEUP); + USB_INT_Clear(USB_INT_SUSPI); + USB_INT_Disable(USB_INT_SUSPI); + USB_INT_Enable(USB_INT_WAKEUPI); Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL, ENDPOINT_DIR_OUT, USB_ControlEndpointSize, diff --git a/LUFA/Drivers/USB/LowLevel/USBInterrupt.h b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h index 6e62beccf..8c9b2db1d 100644 --- a/LUFA/Drivers/USB/LowLevel/USBInterrupt.h +++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h @@ -73,8 +73,8 @@ #define USB_INT_VBUS USBCON, (1 << VBUSTE) , USBINT, (1 << VBUSTI) #define USB_INT_IDTI USBCON, (1 << IDTE) , USBINT, (1 << IDTI) - #define USB_INT_WAKEUP UDIEN , (1 << WAKEUPE), UDINT , (1 << WAKEUPI) - #define USB_INT_SUSPEND UDIEN , (1 << SUSPE) , UDINT , (1 << SUSPI) + #define USB_INT_WAKEUPI UDIEN , (1 << WAKEUPE), UDINT , (1 << WAKEUPI) + #define USB_INT_SUSPI UDIEN , (1 << SUSPE) , UDINT , (1 << SUSPI) #define USB_INT_EORSTI UDIEN , (1 << EORSTE) , UDINT , (1 << EORSTI) #define USB_INT_DCONNI UHIEN , (1 << DCONNE) , UHINT , (1 << DCONNI) #define USB_INT_DDISCI UHIEN , (1 << DDISCE) , UHINT , (1 << DDISCI) |