mfulz_github/qmk_firmware
1
0
Fork 1
mirror of https://github.com/mfulz/qmk_firmware.git synced 2025-10-30 21:02:32 +01:00
Code Issues Projects Releases Wiki Activity

Update LUFA core to be compatible with the AVR-GCC -Wswitch-default warning switch.

Browse Source
This commit is contained in:
Dean Camera 2012-09-09 14:00:03 +00:00
parent 0284385b4e
commit 7a51e97c3b
9 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildTests/ModuleTest/makefile.test
View File

@ -45,6 +45,7 @@ CC_FLAGS += -Wmissing-declarations
CC_FLAGS += -Wmissing-field-initializers
CC_FLAGS += -Wmissing-format-attribute
CC_FLAGS += -Woverlength-strings
CC_FLAGS += -Wswitch-default
# Only enable rendundant declaration warnings for AVR8 target (FIXME)
ifeq ($(ARCH), AVR8)
@ -56,7 +57,6 @@ C_FLAGS += -Wmissing-parameter-type
C_FLAGS += -Wnested-externs
# Potential additional warnings to enable in the future (FIXME)
#CC_FLAGS += -Wswitch-default
#CC_FLAGS += -Wc++-compat
#CC_FLAGS += -Wcast-qual
#CC_FLAGS += -Wconversion

11
LUFA/Drivers/USB/Class/Common/HIDParser.c
View File

@ -53,7 +53,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
while (ReportSize)
{
uint8_t HIDReportItem = *ReportData;
uint32_t ReportItemData = 0;
uint32_t ReportItemData;
ReportData++;
ReportSize--;
@ -66,16 +66,22 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
ReportSize -= 4;
ReportData += 4;
break;
case HID_RI_DATA_BITS_16:
ReportItemData = (((uint16_t)ReportData[1] << 8) | (ReportData[0]));
ReportSize -= 2;
ReportData += 2;
break;
case HID_RI_DATA_BITS_8:
ReportItemData = ReportData[0];
ReportSize -= 1;
ReportData += 1;
break;
default:
ReportItemData = 0;
break;
}
switch (HIDReportItem & (HID_RI_TYPE_MASK | HID_RI_TAG_MASK))
@ -269,6 +275,9 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
}
break;
default:
break;
}
if ((HIDReportItem & HID_RI_TYPE_MASK) == HID_RI_TYPE_MAIN)

3
LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c
View File

@ -180,6 +180,9 @@ void USB_Host_ProcessNextHostState(void)
EVENT_USB_Host_DeviceEnumerationComplete();
break;
default:
break;
}
if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))

14
LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h
View File

@ -139,6 +139,8 @@
OTGIEN |= (1 << SRPE);
break;
#endif
default:
break;
}
}
@ -197,6 +199,8 @@
OTGIEN &= ~(1 << SRPE);
break;
#endif
default:
break;
}
}
@ -255,6 +259,8 @@
OTGINT &= ~(1 << SRPI);
break;
#endif
default:
break;
}
}
@ -299,10 +305,10 @@
case USB_INT_SRPI:
return (OTGIEN & (1 << SRPE));
#endif
}
default:
return false;
}
}
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
@ -345,10 +351,10 @@
case USB_INT_SRPI:
return (OTGINT & (1 << SRPI));
#endif
}
default:
return false;
}
}
/* Includes: */
#include "../USBMode.h"

3
LUFA/Drivers/USB/Core/DeviceStandardReq.c
View File

@ -109,6 +109,9 @@ void USB_Device_ProcessControlRequest(void)
USB_Device_SetConfiguration();
break;
default:
break;
}
}

3
LUFA/Drivers/USB/Core/UC3/Host_UC3.c
View File

@ -180,6 +180,9 @@ void USB_Host_ProcessNextHostState(void)
EVENT_USB_Host_DeviceEnumerationComplete();
break;
default:
break;
}
if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))

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

@ -134,6 +134,8 @@
AVR32_USBB.USBCON.vberre = true;
break;
#endif
default:
break;
}
}
@ -187,6 +189,8 @@
AVR32_USBB.USBCON.vberre = false;
break;
#endif
default:
break;
}
}
@ -252,6 +256,8 @@
(void)AVR32_USBB.USBSTACLR;
break;
#endif
default:
break;
}
}
@ -292,10 +298,10 @@
case USB_INT_VBERRI:
return AVR32_USBB.USBCON.vberre;
#endif
}
default:
return false;
}
}
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
@ -334,10 +340,10 @@
case USB_INT_VBERRI:
return AVR32_USBB.USBSTA.vberri;
#endif
}
default:
return false;
}
}
/* Includes: */
#include "../USBMode.h"

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

@ -74,10 +74,12 @@
{
case USB_INT_BUSEVENTI:
USB.INTCTRLA |= USB_BUSEVIE_bm;
return;
break;
case USB_INT_SOFI:
USB.INTCTRLA |= USB_SOFIE_bm;
return;
break;
default:
break;
}
}
@ -88,10 +90,12 @@
{
case USB_INT_BUSEVENTI:
USB.INTCTRLA &= ~USB_BUSEVIE_bm;
return;
break;
case USB_INT_SOFI:
USB.INTCTRLA &= ~USB_SOFIE_bm;
return;
break;
default:
break;
}
}
@ -102,16 +106,18 @@
{
case USB_INT_BUSEVENTI_Suspend:
USB.INTFLAGSACLR = USB_SUSPENDIF_bm;
return;
break;
case USB_INT_BUSEVENTI_Resume:
USB.INTFLAGSACLR = USB_RESUMEIF_bm;
return;
break;
case USB_INT_BUSEVENTI_Reset:
USB.INTFLAGSACLR = USB_RSTIF_bm;
return;
break;
case USB_INT_SOFI:
USB.INTFLAGSACLR = USB_SOFIF_bm;
return;
break;
default:
break;
}
}
@ -124,10 +130,10 @@
return ((USB.INTCTRLA & USB_BUSEVIE_bm) ? true : false);
case USB_INT_SOFI:
return ((USB.INTCTRLA & USB_SOFIE_bm) ? true : false);
}
default:
return false;
}
}
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
@ -142,10 +148,10 @@
return ((USB.INTFLAGSACLR & USB_RSTIF_bm) ? true : false);
case USB_INT_SOFI:
return ((USB.INTFLAGSACLR & USB_SOFIF_bm) ? true : false);
}
default:
return false;
}
}
/* Includes: */
#include "../USBMode.h"

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

@ -188,10 +188,10 @@
OSC.CTRL |= OSC_RC32KEN_bm;
while (!(OSC.STATUS & OSC_RC32KRDY_bm));
return true;
}
default:
return false;
}
}
/** Stops the given internal oscillator of the XMEGA microcontroller.
*
@ -213,10 +213,10 @@
case CLOCK_SRC_INT_RC32KHZ:
OSC.CTRL &= ~OSC_RC32KEN_bm;
return true;
}
default:
return false;
}
}
/** Starts the PLL of the XMEGA microcontroller, with the given options. This routine blocks until the PLL is ready for use.
*