gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-07 17:02:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional sanity checks to the inputs of several AVR32 platform clock management driver functions.

Browse Source
This commit is contained in:
Dean Camera 2012-06-21 20:21:06 +00:00
parent 8ccc2b2272
commit 532b3a18f1
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
LUFA/Platform/UC3/ClockManagement.h
View File

@ -231,6 +231,12 @@
const uint32_t SourceFreq, const uint32_t SourceFreq,
const uint32_t Frequency) const uint32_t Frequency)
{ {
if (Channel >= AVR32_PM_GCLK_NUM)
return false;
if (SourceFreq < Frequency)
return false;
switch (Source) switch (Source)
{ {
case CLOCK_SRC_OSC0: case CLOCK_SRC_OSC0:
@ -253,9 +259,6 @@
return false; return false;
} }
if (SourceFreq < Frequency)
return false;
AVR32_PM.GCCTRL[Channel].diven = (SourceFreq > Frequency) ? true : false; AVR32_PM.GCCTRL[Channel].diven = (SourceFreq > Frequency) ? true : false;
AVR32_PM.GCCTRL[Channel].div = (((SourceFreq / Frequency) - 1) / 2); AVR32_PM.GCCTRL[Channel].div = (((SourceFreq / Frequency) - 1) / 2);
AVR32_PM.GCCTRL[Channel].cen = true; AVR32_PM.GCCTRL[Channel].cen = true;
@ -266,11 +269,18 @@
/** Stops the given generic clock of the UC3 microcontroller. /** Stops the given generic clock of the UC3 microcontroller.
* *
* \param[in] Channel Index of the generic clock to stop. * \param[in] Channel Index of the generic clock to stop.
*
* \return Boolean \c true if the generic clock was sucessfully stopped, \c false if invalid parameters specified.
*/ */
static inline void AVR32CLK_StopGenericClock(const uint8_t Channel) ATTR_ALWAYS_INLINE; static inline bool AVR32CLK_StopGenericClock(const uint8_t Channel) ATTR_ALWAYS_INLINE;
static inline void AVR32CLK_StopGenericClock(const uint8_t Channel) static inline bool AVR32CLK_StopGenericClock(const uint8_t Channel)
{ {
if (Channel >= AVR32_PM_GCLK_NUM)
return false;
AVR32_PM.GCCTRL[Channel].cen = false; AVR32_PM.GCCTRL[Channel].cen = false;
return true;
} }
/** Sets the clock source for the main microcontroller core. The given clock source should be configured /** Sets the clock source for the main microcontroller core. The given clock source should be configured
@ -288,7 +298,10 @@
static inline bool AVR32CLK_SetCPUClockSource(const uint8_t Source, static inline bool AVR32CLK_SetCPUClockSource(const uint8_t Source,
const uint32_t SourceFreq) const uint32_t SourceFreq)
{ {
AVR32_FLASHC.FCR.fws = (SourceFreq > 30000000) ? true : false; if (SourceFreq > AVR32_PM_CPU_MAX_FREQ)
return false;
AVR32_FLASHC.FCR.fws = (SourceFreq > AVR32_FLASHC_FWS_0_MAX_FREQ) ? true : false;
switch (Source) switch (Source)
{ {