diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-10-30 12:06:02 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-10-30 12:06:02 +0000 |
| commit | b714ffbfa097f2ac737f4210e818297503c3fe7e (patch) | |
| tree | 26b4b405c59b79adca83ded0e5d7544e910707bd /LUFA/Platform/XMEGA/ClockManagement.h | |
| parent | c73997429271e8566080ac8fdf21e5944c3b4c8e (diff) | |
| download | lufa-b714ffbfa097f2ac737f4210e818297503c3fe7e.tar.gz lufa-b714ffbfa097f2ac737f4210e818297503c3fe7e.tar.bz2 lufa-b714ffbfa097f2ac737f4210e818297503c3fe7e.zip | |
Update XMEGA clock management so that the correct 16-bit calibration is used when requested. Fix endpoint descriptor table so that the frame number is stored into the correct location. Add compile time option to source the USB clock from the PLL rather than the internal 32MHz RC oscillator.
Diffstat (limited to 'LUFA/Platform/XMEGA/ClockManagement.h')
| -rw-r--r-- | LUFA/Platform/XMEGA/ClockManagement.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/LUFA/Platform/XMEGA/ClockManagement.h b/LUFA/Platform/XMEGA/ClockManagement.h index 07ba0e73c..357ed7b32 100644 --- a/LUFA/Platform/XMEGA/ClockManagement.h +++ b/LUFA/Platform/XMEGA/ClockManagement.h @@ -263,14 +263,7 @@ const uint8_t Reference, const uint32_t Frequency) { - uint16_t DFLLCompare = (Frequency / 1024); - uint16_t DFFLCal = 0; - - if (Reference == DFLL_REF_INT_USBSOF) - { - NVM.CMD = NVM_CMD_READ_CALIB_ROW_gc; - DFFLCal = ((0x00 << 8) | pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBRCOSC))); - } + uint16_t DFLLCompare = (Frequency / 1000); switch (Source) { @@ -278,16 +271,21 @@ OSC.DFLLCTRL |= (Reference << OSC_RC2MCREF_bp); DFLLRC2M.COMP1 = (DFLLCompare & 0xFF); DFLLRC2M.COMP2 = (DFLLCompare >> 8); - DFLLRC2M.CALA = (DFFLCal & 0xFF); - DFLLRC2M.CALB = (DFFLCal >> 8); DFLLRC2M.CTRL = DFLL_ENABLE_bm; break; case CLOCK_SRC_INT_RC32MHZ: OSC.DFLLCTRL |= (Reference << OSC_RC32MCREF_gp); DFLLRC32M.COMP1 = (DFLLCompare & 0xFF); DFLLRC32M.COMP2 = (DFLLCompare >> 8); - DFLLRC32M.CALA = (DFFLCal & 0xFF); - DFLLRC32M.CALB = (DFFLCal >> 8); + + if (Reference == DFLL_REF_INT_USBSOF) + { + NVM.CMD = NVM_CMD_READ_CALIB_ROW_gc; + DFLLRC32M.CALA = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBRCOSCA)); + NVM.CMD = NVM_CMD_READ_CALIB_ROW_gc; + DFLLRC32M.CALB = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBRCOSC)); + } + DFLLRC32M.CTRL = DFLL_ENABLE_bm; break; default: |