eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix errors uncovered by the new build test compile warnings; fix UC3 pipe configuration function broken, redundant function prototypes and unused parameters.

This commit is contained in:
Dean Camera 2012-02-19 15:26:42 +00:00
parent 50ff97f378
commit 84ff878fd7
8 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -62,6 +62,7 @@
* - Fixed broken compilation of LUFA under C++ compilers when the Serial peripheral module header file is included in a C++ source file * - Fixed broken compilation of LUFA under C++ compilers when the Serial peripheral module header file is included in a C++ source file
* - Fixed missing semicolon in the UC3 architecture host pipe functions * - Fixed missing semicolon in the UC3 architecture host pipe functions
* - Fixed failed compilation for the XMEGA architecture if USB_DEVICE_ONLY us not specified * - Fixed failed compilation for the XMEGA architecture if USB_DEVICE_ONLY us not specified
* - Fixed UC3 architecture ignoring the pipe size when Pipe_ConfigurePipe() is called
* - Library Applications: * - Library Applications:
* - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair) * - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair)
* - Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled * - Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled

2
LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h
View File

@ -254,8 +254,6 @@
*/ */
bool TWI_ReceiveByte(uint8_t* const Byte, bool TWI_ReceiveByte(uint8_t* const Byte,
const bool LastByte) ATTR_NON_NULL_PTR_ARG(1); const bool LastByte) ATTR_NON_NULL_PTR_ARG(1);
bool TWI_ReceiveByte(uint8_t* const Byte,
const bool LastByte);
/** High level function to perform a complete packet transfer over the TWI bus to the specified /** High level function to perform a complete packet transfer over the TWI bus to the specified
* device. * device.

2
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
View File

@ -58,6 +58,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
((uint32_t)Type << AVR32_USBB_PTYPE_OFFSET) | ((uint32_t)Type << AVR32_USBB_PTYPE_OFFSET) |
((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) | ((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) |
((uint32_t)Banks << AVR32_USBB_PBK_OFFSET) | ((uint32_t)Banks << AVR32_USBB_PBK_OFFSET) |
Pipe_BytesToEPSizeMask(Size) |
((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET)); ((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET));
Pipe_SetInfiniteINRequests(); Pipe_SetInfiniteINRequests();
@ -76,6 +77,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
((uint32_t)Type << AVR32_USBB_PTYPE_OFFSET) | ((uint32_t)Type << AVR32_USBB_PTYPE_OFFSET) |
((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) | ((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) |
((uint32_t)Banks << AVR32_USBB_PBK_OFFSET) | ((uint32_t)Banks << AVR32_USBB_PBK_OFFSET) |
Pipe_BytesToEPSizeMask(Size) |
((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET)); ((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET));
} }
else else

2
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
View File

@ -389,7 +389,7 @@
static inline bool Pipe_HasPipeInterrupted(const uint8_t PipeNumber) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; static inline bool Pipe_HasPipeInterrupted(const uint8_t PipeNumber) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
static inline bool Pipe_HasPipeInterrupted(const uint8_t PipeNumber) static inline bool Pipe_HasPipeInterrupted(const uint8_t PipeNumber)
{ {
return ((AVR32_USBB.uhint & (AVR32_USBB_P0INTES_MASK << USB_Pipe_SelectedPipe)) ? true : false); return ((AVR32_USBB.uhint & (AVR32_USBB_P0INTES_MASK << PipeNumber)) ? true : false);
} }
/** Unfreezes the selected pipe, allowing it to communicate with an attached device. */ /** Unfreezes the selected pipe, allowing it to communicate with an attached device. */

4
LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
View File

@ -350,15 +350,13 @@
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* ISR Prototypes: */ /* Function Prototypes: */
#if defined(__DOXYGEN__) #if defined(__DOXYGEN__)
/** Interrupt service routine handler for the USB controller ISR group. This interrupt routine <b>must</b> be /** Interrupt service routine handler for the USB controller ISR group. This interrupt routine <b>must</b> be
* linked to the entire USB controller ISR vector group inside the AVR32's interrupt controller peripheral, * linked to the entire USB controller ISR vector group inside the AVR32's interrupt controller peripheral,
* using the user application's preferred USB controller driver. * using the user application's preferred USB controller driver.
*/ */
void USB_GEN_vect(void); void USB_GEN_vect(void);
#else
ISR(USB_GEN_vect);
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

1
LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
View File

@ -429,6 +429,7 @@
static inline bool Endpoint_HasEndpointInterrupted(const uint8_t EndpointNumber) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; static inline bool Endpoint_HasEndpointInterrupted(const uint8_t EndpointNumber) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
static inline bool Endpoint_HasEndpointInterrupted(const uint8_t EndpointNumber) static inline bool Endpoint_HasEndpointInterrupted(const uint8_t EndpointNumber)
{ {
(void)EndpointNumber;
return 0; // TODO return 0; // TODO
} }

4
LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h
View File

@ -73,10 +73,10 @@
switch (Interrupt) switch (Interrupt)
{ {
case USB_INT_BUSEVENTI: case USB_INT_BUSEVENTI:
USB.INTCTRLA |= USB_BUSEVIE_bm; USB.INTCTRLA |= USB_BUSEVIE_bm;
return; return;
case USB_INT_SOFI: case USB_INT_SOFI:
USB.INTCTRLA |= USB_SOFIE_bm; USB.INTCTRLA |= USB_SOFIE_bm;
return; return;
} }
} }

7
LUFA/Platform/XMEGA/ClockManagement.h
View File

@ -323,14 +323,11 @@
* and ready for use before this function is called. * and ready for use before this function is called.
* *
* \param[in] Source Clock source for the CPU core, a value from \ref XMEGA_System_ClockSource_t. * \param[in] Source Clock source for the CPU core, a value from \ref XMEGA_System_ClockSource_t.
* \param[in] SourceFreq Frequency of the CPU core's clock source, in Hz.
* *
* \return Boolean \c true if the CPU core clock was sucessfully altered, \c false if invalid parameters specified. * \return Boolean \c true if the CPU core clock was sucessfully altered, \c false if invalid parameters specified.
*/ */
static inline bool XMEGACLK_SetCPUClockSource(const uint8_t Source, static inline bool XMEGACLK_SetCPUClockSource(const uint8_t Source) ATTR_ALWAYS_INLINE;
const uint32_t SourceFreq) ATTR_ALWAYS_INLINE; static inline bool XMEGACLK_SetCPUClockSource(const uint8_t Source)
static inline bool XMEGACLK_SetCPUClockSource(const uint8_t Source,
const uint32_t SourceFreq)
{ {
uint8_t ClockSourceMask = 0; uint8_t ClockSourceMask = 0;