diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-07-14 00:26:11 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-07-14 00:26:11 +0000 |
| commit | 13951ab043c43d0e3ea4ac0ae6a641fd88e7fcb0 (patch) | |
| tree | ea399449fb00a9286c6c15bc9053c552eac0a21d | |
| parent | 01d269879f127dff8db5367f3c341d983db3ab40 (diff) | |
| download | lufa-13951ab043c43d0e3ea4ac0ae6a641fd88e7fcb0.tar.gz lufa-13951ab043c43d0e3ea4ac0ae6a641fd88e7fcb0.tar.bz2 lufa-13951ab043c43d0e3ea4ac0ae6a641fd88e7fcb0.zip | |
Fix compile errors in the UC3 platform support due to a forward reference and an incorrect function prototype.
| -rw-r--r-- | LUFA/Platform/UC3/ClockManagement.h | 12 | ||||
| -rw-r--r-- | LUFA/Platform/UC3/InterruptManagement.h | 7 |
2 files changed, 9 insertions, 10 deletions
diff --git a/LUFA/Platform/UC3/ClockManagement.h b/LUFA/Platform/UC3/ClockManagement.h index deac64f94..60a3d18f4 100644 --- a/LUFA/Platform/UC3/ClockManagement.h +++ b/LUFA/Platform/UC3/ClockManagement.h @@ -127,12 +127,12 @@ *
* \return Boolean \c true if the external oscillator was successfully started, \c false if invalid parameters specified.
*/
- static inline void AVR32CLK_StartExternalOscillator(const uint8_t Channel,
- const uint8_t Type,
- const uint8_t Startup) ATTR_ALWAYS_INLINE;
- static inline void AVR32CLK_StartExternalOscillator(const uint8_t Channel,
- const uint8_t Type,
- const uint8_t Startup)
+ static inline uint8_t AVR32CLK_StartExternalOscillator(const uint8_t Channel,
+ const uint8_t Type,
+ const uint8_t Startup) ATTR_ALWAYS_INLINE;
+ static inline uint8_t AVR32CLK_StartExternalOscillator(const uint8_t Channel,
+ const uint8_t Type,
+ const uint8_t Startup)
{
switch (Channel)
{
diff --git a/LUFA/Platform/UC3/InterruptManagement.h b/LUFA/Platform/UC3/InterruptManagement.h index bcceab7f6..bc27f2207 100644 --- a/LUFA/Platform/UC3/InterruptManagement.h +++ b/LUFA/Platform/UC3/InterruptManagement.h @@ -84,6 +84,9 @@ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
+ /* Type Defines: */
+ typedef void (*InterruptHandlerPtr_t)(void);
+
/* External Variables: */
extern const void EVBA_Table;
extern const uint32_t Autovector_Table[];
@@ -108,10 +111,6 @@ */
#define INTC_IRQ_LINE(IRQIndex) (IRQIndex % 32)
- /* Type Defines: */
- /** Type define for an interrupt handler ISR function. */
- typedef void (*InterruptHandlerPtr_t)(void);
-
/* Function Prototypes: */
/** Initializes the interrupt controller, nulling out all interrupt handlers ready for new registration. This
* function should be called once on startup to ensure the interrupt controller is ready for use.
|