diff options
author | Dean Camera <[email protected]> | 2010-10-12 12:22:11 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2010-10-12 12:22:11 +0000 |
commit | 7aaced1e8bc81ebbf0a1f06fc443ea4707edd1dd (patch) | |
tree | 22251cc704e7d6c209e529727910838f0705145e /LUFA/Drivers/USB/LowLevel/USBController.c | |
parent | c1cfffd8eb92aedde76439afa30d8584c4c60043 (diff) | |
download | qmk_firmware-7aaced1e8bc81ebbf0a1f06fc443ea4707edd1dd.tar.gz qmk_firmware-7aaced1e8bc81ebbf0a1f06fc443ea4707edd1dd.zip |
Remove USB_MODE_* macros, replace with a semantically linked USB_Modes_t enum.
Moved the USB device selection logic for ENDPOINT_TOTAL_ENDPOINTS further up in Endpoint.h to where the endpoint bank capabilities are determined, to reduce the total number of device-specific logic.
Change USB_Host_WaitMS() to test and disable the HSOFI interrupt before resuming the bus, so that it does not fire before the delay loop has run.
Add missing const qualifier to the parameter of USB_Host_ClearPipeStall().
Diffstat (limited to 'LUFA/Drivers/USB/LowLevel/USBController.c')
-rw-r--r-- | LUFA/Drivers/USB/LowLevel/USBController.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/USBController.c b/LUFA/Drivers/USB/LowLevel/USBController.c index f6b1b125b3..6d4a89dd06 100644 --- a/LUFA/Drivers/USB/LowLevel/USBController.c +++ b/LUFA/Drivers/USB/LowLevel/USBController.c @@ -33,7 +33,7 @@ #include "USBController.h" #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 #if !defined(USE_STATIC_OPTIONS) @@ -101,7 +101,7 @@ void USB_ShutDown(void) #endif #if defined(USB_CAN_BE_BOTH) - USB_CurrentMode = USB_MODE_NONE; + USB_CurrentMode = USB_MODE_None; #endif USB_IsInitialized = false; @@ -138,7 +138,7 @@ void USB_ResetInterface(void) USB_CLK_Unfreeze(); - if (USB_CurrentMode == USB_MODE_DEVICE) + if (USB_CurrentMode == USB_MODE_Device) { #if defined(USB_CAN_BE_DEVICE) #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) @@ -148,7 +148,7 @@ void USB_ResetInterface(void) USB_Init_Device(); #endif } - else + else if (USB_CurrentMode == USB_MODE_Host) { #if defined(USB_CAN_BE_HOST) UHWCON &= ~(1 << UIMOD); |