From 66482341573c035e4c90cee32b89fb7f59068e40 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 13 Dec 2009 14:43:34 +0000 Subject: [PATCH] Test with -Wextra, fix library warnings due to unused function parameters. --- Demos/Host/ClassDriver/MassStorageHost/makefile | 2 +- LUFA/Drivers/Peripheral/SerialStream.c | 5 ++++- LUFA/Drivers/USB/Class/Device/Audio.c | 2 +- LUFA/Drivers/USB/Class/Device/Audio.h | 6 ++++++ LUFA/Drivers/USB/Class/Device/MIDI.c | 2 +- LUFA/Drivers/USB/Class/Device/RNDIS.c | 9 +++++++-- LUFA/Drivers/USB/Class/Host/HID.c | 2 +- LUFA/Drivers/USB/Class/Host/MIDI.c | 4 ++-- LUFA/Drivers/USB/Class/Host/MassStorage.c | 2 +- LUFA/Drivers/USB/Class/Host/Printer.c | 2 +- LUFA/Drivers/USB/Class/Host/RNDIS.c | 2 +- LUFA/Drivers/USB/Class/Host/StillImage.c | 2 +- LUFA/ManPages/ChangeLog.txt | 2 ++ 13 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile index 88d5cf27d6..af3f577793 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/makefile +++ b/Demos/Host/ClassDriver/MassStorageHost/makefile @@ -116,7 +116,7 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = -D USB_HOST_ONLY +LUFA_OPTS = -D USB_HOST_ONLY -Wextra LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=5000 diff --git a/LUFA/Drivers/Peripheral/SerialStream.c b/LUFA/Drivers/Peripheral/SerialStream.c index f8839c9b49..0e7b24c538 100644 --- a/LUFA/Drivers/Peripheral/SerialStream.c +++ b/LUFA/Drivers/Peripheral/SerialStream.c @@ -35,12 +35,15 @@ FILE USARTStream = FDEV_SETUP_STREAM(SerialStream_TxByte, SerialStream_RxByte, _ static int SerialStream_TxByte(char DataByte, FILE *Stream) { + (void)Stream; + Serial_TxByte(DataByte); - return 0; } static int SerialStream_RxByte(FILE *Stream) { + (void)Stream; + return Serial_RxByte(); } diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c index abc7546067..8f59980ee2 100644 --- a/LUFA/Drivers/USB/Class/Device/Audio.c +++ b/LUFA/Drivers/USB/Class/Device/Audio.c @@ -86,7 +86,7 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfac void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) { - + (void)AudioInterfaceInfo; } bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h index 25ac6efd83..cf79e15eb0 100644 --- a/LUFA/Drivers/USB/Class/Device/Audio.h +++ b/LUFA/Drivers/USB/Class/Device/Audio.h @@ -152,6 +152,8 @@ static inline int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) { int8_t Sample; + + (void)AudioInterfaceInfo; Sample = Endpoint_Read_Byte(); @@ -175,6 +177,8 @@ { int16_t Sample; + (void)AudioInterfaceInfo; + Sample = (int16_t)Endpoint_Read_Word_LE(); if (!(Endpoint_BytesInEndpoint())) @@ -196,6 +200,8 @@ { int32_t Sample; + (void)AudioInterfaceInfo; + Sample = (((uint32_t)Endpoint_Read_Byte() << 16) | Endpoint_Read_Word_LE()); if (!(Endpoint_BytesInEndpoint())) diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c index b49bb7341d..60119d2563 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDI.c +++ b/LUFA/Drivers/USB/Class/Device/MIDI.c @@ -67,7 +67,7 @@ bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInter void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) { - + (void)MIDIInterfaceInfo; } uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event) diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDIS.c index 2b75641766..44a895d963 100644 --- a/LUFA/Drivers/USB/Class/Device/RNDIS.c +++ b/LUFA/Drivers/USB/Class/Device/RNDIS.c @@ -335,6 +335,9 @@ static bool RNDIS_Device_ProcessNDISQuery(USB_ClassInfo_RNDIS_Device_t* const RN const uint32_t OId, void* const QueryData, const uint16_t QuerySize, void* ResponseData, uint16_t* const ResponseSize) { + (void)QueryData; + (void)QuerySize; + switch (OId) { case OID_GEN_SUPPORTED_LIST: @@ -443,9 +446,11 @@ static bool RNDIS_Device_ProcessNDISQuery(USB_ClassInfo_RNDIS_Device_t* const RN } } -static bool RNDIS_Device_ProcessNDISSet(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo, const uint32_t OId, void* SetData, - const uint16_t SetSize) +static bool RNDIS_Device_ProcessNDISSet(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo, const uint32_t OId, + void* SetData, const uint16_t SetSize) { + (void)SetSize; + switch (OId) { case OID_GEN_CURRENT_PACKET_FILTER: diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c index 9c02b697e7..75b37b0c6f 100644 --- a/LUFA/Drivers/USB/Class/Host/HID.c +++ b/LUFA/Drivers/USB/Class/Host/HID.c @@ -152,7 +152,7 @@ static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescri void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) { - + (void)HIDInterfaceInfo; } #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY) diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c index 104c738585..f5bf4ac5d4 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDI.c +++ b/LUFA/Drivers/USB/Class/Host/MIDI.c @@ -124,7 +124,7 @@ static uint8_t DComp_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const Current void MIDI_Host_USBTask(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo) { - + (void)MIDIInterfaceInfo; } uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event) @@ -134,7 +134,7 @@ uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipeNumber); - if (Pipe_IsReadWriteAllowed()); + if (Pipe_IsReadWriteAllowed()) { uint8_t ErrorCode; diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c index ca071752d4..59057ed76d 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorage.c +++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c @@ -129,7 +129,7 @@ static uint8_t DComp_NextMSInterfaceEndpoint(void* const CurrentDescriptor) void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo) { - + (void)MSInterfaceInfo; } static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, MS_CommandBlockWrapper_t* const SCSICommandBlock, diff --git a/LUFA/Drivers/USB/Class/Host/Printer.c b/LUFA/Drivers/USB/Class/Host/Printer.c index cb9bd6ec91..788c0b53c4 100644 --- a/LUFA/Drivers/USB/Class/Host/Printer.c +++ b/LUFA/Drivers/USB/Class/Host/Printer.c @@ -124,7 +124,7 @@ static uint8_t DComp_NextPRNTInterfaceEndpoint(void* CurrentDescriptor) void PRNT_Host_USBTask(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) { - + (void)PRNTInterfaceInfo; } uint8_t PRNT_Host_SetBidirectionalMode(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.c b/LUFA/Drivers/USB/Class/Host/RNDIS.c index b22674855a..1e85bd07cb 100644 --- a/LUFA/Drivers/USB/Class/Host/RNDIS.c +++ b/LUFA/Drivers/USB/Class/Host/RNDIS.c @@ -207,7 +207,7 @@ static uint8_t DComp_RNDIS_Host_NextRNDISInterfaceEndpoint(void* const CurrentDe void RNDIS_Host_USBTask(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo) { - + (void)RNDISInterfaceInfo; } static uint8_t RNDIS_SendEncapsulatedCommand(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c index 5a958cf443..67d5cdee28 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.c +++ b/LUFA/Drivers/USB/Class/Host/StillImage.c @@ -144,7 +144,7 @@ uint8_t DComp_SI_Host_NextSIInterfaceEndpoint(void* const CurrentDescriptor) void SImage_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) { - + (void)SIInterfaceInfo; } static uint8_t SImage_Host_SendBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, SI_PIMA_Container_t* const PIMAHeader) diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index 99cb773af9..791a170603 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -59,6 +59,8 @@ * - Fixed MassStorageHost Class driver demo not having USB_STREAM_TIMEOUT_MS compile time option set properly to prevent slow * devices from timing out the data pipes * - Fixed the definition of the Endpoint_BytesInEndpoint() macro for the U4 series AVR parts + * - Fixed MIDI host Class driver MIDI_Host_SendEventPacket() routine not properly checking for Pipe ready before writing + * - Fixed use of deprecated struct initializers, removed library unused parameter warnings when compiled with -Wextra enabled * * \section Sec_ChangeLog091122 Version 091122 *