diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-19 06:09:25 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-19 06:09:25 +0000 |
| commit | b17e87d1406f8d193ddd2a0700081d24e8bcffcc (patch) | |
| tree | 575d5401a8de41f2d88b45d42718b1a7c96f32be /LUFA/Drivers/USB | |
| parent | 1621158c622e8dbe49deaacf88ea3f5b843b54ac (diff) | |
| download | lufa-b17e87d1406f8d193ddd2a0700081d24e8bcffcc.tar.gz lufa-b17e87d1406f8d193ddd2a0700081d24e8bcffcc.tar.bz2 lufa-b17e87d1406f8d193ddd2a0700081d24e8bcffcc.zip | |
More simplifications to USBController.c, fix errors and warnings when compiled for the series 2 USB AVRs.
Diffstat (limited to 'LUFA/Drivers/USB')
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/USBController.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/USBController.c b/LUFA/Drivers/USB/LowLevel/USBController.c index 7177e2b0e..49bd05b64 100644 --- a/LUFA/Drivers/USB/LowLevel/USBController.c +++ b/LUFA/Drivers/USB/LowLevel/USBController.c @@ -130,32 +130,36 @@ void USB_ResetInterface(void) USB_CLK_Unfreeze(); - #if defined(USB_DEVICE_ONLY) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) - UHWCON |= (1 << UIMOD); - USB_Init_Device(); - #elif defined(USB_HOST_ONLY) - UHWCON &= ~(1 << UIMOD); - USB_Init_Host(); - #elif defined(USB_CAN_BE_BOTH) + #if defined(USB_CAN_BE_BOTH) if (UIDModeSelectEnabled) { UHWCON |= (1 << UIDE); USB_INT_Enable(USB_INT_IDTI); } + #endif if (USB_CurrentMode == USB_MODE_DEVICE) { + #if defined(USB_CAN_BE_DEVICE) + #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) UHWCON |= (1 << UIMOD); + #endif + USB_Init_Device(); + #endif } else { + #if defined(USB_CAN_BE_HOST) UHWCON &= ~(1 << UIMOD); USB_Init_Host(); + #endif } - #endif + #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) USB_OTGPAD_On(); + #endif + USB_Attach(); } |