From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 22 Jul 2014 09:08:25 +0000 (+1000)
Subject: Merge pull request #32 from The-42/fix-xmega-usb-prescaler
X-Git-Tag: LUFA-140928~28
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/89df1efcf3ecb625c172a47def21e18912fc46f3?hp=526091fba4e1b86d14c8fcff5d32953c15ed0802

Merge pull request #32 from The-42/fix-xmega-usb-prescaler

Fix XMEGA USB prescaler calculation (thanks to Bert van Hall).
---

diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
index f8b0fc6af..b5de862f1 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
+++ b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
@@ -109,15 +109,25 @@ void USB_Disable(void)
 
 void USB_ResetInterface(void)
 {
+	uint8_t PrescalerNeeded;
+	uint8_t nbit = 0;
+
 	#if defined(USB_DEVICE_OPT_FULLSPEED)
 	if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
-	  CLK.USBCTRL = (((F_USB / 6000000) - 1) << CLK_USBPSDIV_gp);
+	  PrescalerNeeded = F_USB / 6000000;
 	else
-	  CLK.USBCTRL = (((F_USB / 48000000) - 1) << CLK_USBPSDIV_gp);
+	  PrescalerNeeded = F_USB / 48000000;
 	#else
-	CLK.USBCTRL = (((F_USB / 6000000) - 1) << CLK_USBPSDIV_gp);
+	PrescalerNeeded = F_USB / 6000000;
 	#endif
 
+	while (PrescalerNeeded && nbit < 7) {
+		PrescalerNeeded >>= 1;
+		nbit++;
+	}
+
+	CLK.USBCTRL = (nbit - 1) << CLK_USBPSDIV_gp;
+
 	if (USB_Options & USB_OPT_PLLCLKSRC)
 	  CLK.USBCTRL |= (CLK_USBSRC_PLL_gc   | CLK_USBSEN_bm);
 	else