diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-02-13 19:50:30 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-02-13 19:50:30 +0000 |
| commit | 4bd36a9775ab60ef8d63cfe3454b1cbf24b19759 (patch) | |
| tree | f7f5aa8e18e844995f291707103837b89d60a3d5 /LUFA/Drivers/USB/Core | |
| parent | 300a05d6c6b578713c4b73509d0961d39d695bcd (diff) | |
| download | lufa-4bd36a9775ab60ef8d63cfe3454b1cbf24b19759.tar.gz lufa-4bd36a9775ab60ef8d63cfe3454b1cbf24b19759.tar.bz2 lufa-4bd36a9775ab60ef8d63cfe3454b1cbf24b19759.zip | |
Reset XMEGA NVM read command to the symbolic NO_OPERATION constant rather than a hard-coded zero.
Diffstat (limited to 'LUFA/Drivers/USB/Core')
| -rw-r--r-- | LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c index 764560789..979f09582 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c +++ b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c @@ -72,7 +72,7 @@ void USB_Init( NVM.CMD = NVM_CMD_READ_CALIB_ROW_gc; USB.CAL0 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL0)); USB.CAL1 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL1)); - NVM.CMD = 0; + NVM.CMD = NVM_CMD_NO_OPERATION_gc; /* Ugly workaround to ensure an aligned table, since __BIGGEST_ALIGNMENT__ == 1 for the 8-bit AVR-GCC toolchain */ USB.EPPTR = ((intptr_t)&USB_EndpointTable[1] & ~(1 << 0)); @@ -90,9 +90,9 @@ void USB_Init( #if defined(USB_CAN_BE_BOTH) USB_CurrentMode = Mode; #endif - + USB_IsInitialized = true; - + USB_ResetInterface(); } @@ -117,7 +117,7 @@ void USB_ResetInterface(void) #else CLK.USBCTRL = (((F_USB / 6000000) - 1) << CLK_USBPSDIV_gp); #endif - + if (USB_Options & USB_OPT_PLLCLKSRC) CLK.USBCTRL |= (CLK_USBSRC_PLL_gc | CLK_USBSEN_bm); else |