aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB/HighLevel
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-07-31 00:35:19 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-07-31 00:35:19 +0000
commita789619fbe2cd07347816cc5c168e8f904acca86 (patch)
tree67f2649b7e8e099c5536d9c0a1e458aef075929b /LUFA/Drivers/USB/HighLevel
parent7df6b9563c7aed504b34f42bc46d01e051051bdd (diff)
downloadlufa-a789619fbe2cd07347816cc5c168e8f904acca86.tar.gz
lufa-a789619fbe2cd07347816cc5c168e8f904acca86.tar.bz2
lufa-a789619fbe2cd07347816cc5c168e8f904acca86.zip
Renamed USB_Device_SetHighSpeed() to USB_Device_SetFullSpeed() so that the correct terminology is used (thanks to Brian Dickman).
Fix USB_PLL_Off() call in the series 4, 6 and 7 microcontroller disconnect interrupt handler code, which wasn't guarded by a test of USB_Options to check if the user has specified manual PLL control (thanks to Brian Dickman).
Diffstat (limited to 'LUFA/Drivers/USB/HighLevel')
-rw-r--r--LUFA/Drivers/USB/HighLevel/USBInterrupt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index 20545a40e..f0a59edb7 100644
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -93,7 +93,10 @@ ISR(USB_GEN_vect, ISR_BLOCK)
USB_Detach();
USB_CLK_Freeze();
- USB_PLL_Off();
+
+ if (!(USB_Options & USB_OPT_MANUAL_PLL))
+ USB_PLL_Off();
+
USB_REG_Off();
EVENT_USB_VBUSDisconnect();