eqmk/qmk_firmware
1
0
Fork 0
forked from mfulz_github/qmk_firmware
Code Issues Pull Requests Projects Releases Wiki Activity

Minor code style fixes, documentation improvements.

Browse Source
This commit is contained in:
Dean Camera 2014-07-22 19:25:41 +10:00
parent 89df1efcf3
commit 4c06a9c88f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -20,6 +20,7 @@
* - Fixed incorrect XMEGA DFLL reference frequency (thanks to Martin Aakerberg) * - Fixed incorrect XMEGA DFLL reference frequency (thanks to Martin Aakerberg)
* - Fixed possible infinite loop in the control endpoint stream write function (thanks to Clayton Knight) * - Fixed possible infinite loop in the control endpoint stream write function (thanks to Clayton Knight)
* - Fixed missing HID report ID prefix on HID class driver GetReport request responses (thanks to Bert van Hall) * - Fixed missing HID report ID prefix on HID class driver GetReport request responses (thanks to Bert van Hall)
* - Fixed incorrect XMEGA USB controller clock division factory for non-Full Speed operation (thanks to Bert van Hall)
* - Library Applications: * - Library Applications:
* - Fixed spurious 0xFE USART byte sent in the USBtoSerial project when the baud rate is changed (thanks to Carl Kjeldsen) * - Fixed spurious 0xFE USART byte sent in the USBtoSerial project when the baud rate is changed (thanks to Carl Kjeldsen)
* - Fixed blocking USART reads causing low throughput on slow baud rates in the USBtoSerial project (thanks to Nevada Smith) * - Fixed blocking USART reads causing low throughput on slow baud rates in the USBtoSerial project (thanks to Nevada Smith)

9
LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
View File

@ -110,7 +110,6 @@ void USB_Disable(void)
void USB_ResetInterface(void) void USB_ResetInterface(void)
{ {
uint8_t PrescalerNeeded; uint8_t PrescalerNeeded;
uint8_t nbit = 0;
#if defined(USB_DEVICE_OPT_FULLSPEED) #if defined(USB_DEVICE_OPT_FULLSPEED)
if (USB_Options & USB_DEVICE_OPT_LOWSPEED) if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
@ -121,12 +120,14 @@ void USB_ResetInterface(void)
PrescalerNeeded = F_USB / 6000000; PrescalerNeeded = F_USB / 6000000;
#endif #endif
while (PrescalerNeeded && nbit < 7) { uint8_t DividerIndex = 0;
while (PrescalerNeeded > 0)
{
DividerIndex++;
PrescalerNeeded >>= 1; PrescalerNeeded >>= 1;
nbit++;
} }
CLK.USBCTRL = (nbit - 1) << CLK_USBPSDIV_gp; CLK.USBCTRL = (DividerIndex - 1) << CLK_USBPSDIV_gp;
if (USB_Options & USB_OPT_PLLCLKSRC) if (USB_Options & USB_OPT_PLLCLKSRC)
CLK.USBCTRL |= (CLK_USBSRC_PLL_gc | CLK_USBSEN_bm); CLK.USBCTRL |= (CLK_USBSRC_PLL_gc | CLK_USBSEN_bm);