Skip to content

Commit 06e08c8

Browse files
cmagliecmaglie
committed
Fixed a lot of warnings in USBHost
1 parent acd8897 commit 06e08c8

16 files changed

+71
-60
lines changed

‎cores/arduino/USB/CDC.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,14 @@ bool CDC_Setup(Setup& setup)
135135
}
136136

137137
uint32_t _serialPeek = -1;
138-
void Serial_::begin(uint32_t baud_count)
138+
void Serial_::begin(uint32_t /* baud_count */)
139139
{
140+
// uart config is ignored in USB-CDC
140141
}
141142

142-
void Serial_::begin(uint32_t baud_count, uint8_t config)
143+
void Serial_::begin(uint32_t /* baud_count */, uint8_t /* config */)
143144
{
145+
// uart config is ignored in USB-CDC
144146
}
145147

146148
void Serial_::end(void)

‎cores/arduino/USB/samd21_host.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ uhd_vbus_state_t UHD_GetVBUSState(void)
298298
* \retval 0 success.
299299
* \retval 1 error.
300300
*/
301-
uint32_t UHD_Pipe0_Alloc(uint32_t ul_add, uint32_t ul_ep_size)
301+
uint32_t UHD_Pipe0_Alloc(uint32_t /* ul_add */, uint32_t ul_ep_size)
302302
{
303303
if( USB->HOST.STATUS.reg & USB_HOST_STATUS_SPEED(1) )
304304
ul_ep_size = USB_PCKSIZE_SIZE_8_BYTES; // Low Speed

‎libraries/USBHost/src/MouseController.cpp

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
/*
2-
Copyright (c) 2012 Arduino. All right reserved.
3-
4-
This library is free software; you can redistribute it and/or
5-
modify it under the terms of the GNU Lesser General Public
6-
License as published by the Free Software Foundation; either
7-
version 2.1 of the License, or (at your option) any later version.
8-
9-
This library is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
See the GNU Lesser General Public License for more details.
13-
14-
You should have received a copy of the GNU Lesser General Public
15-
License along with this library; if not, write to the Free Software
16-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2+
* Copyright (c) 2015 Arduino LLC. All right reserved.
3+
*
4+
* This library is free software; you can redistribute it and/or
5+
* modify it under the terms of the GNU Lesser General Public
6+
* License as published by the Free Software Foundation; either
7+
* version 2.1 of the License, or (at your option) any later version.
8+
*
9+
* This library is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12+
* See the GNU Lesser General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU Lesser General Public
15+
* License along with this library; if not, write to the Free Software
16+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

1919
#include <MouseController.h>
@@ -49,35 +49,35 @@ void MouseController::OnMouseMove(MOUSEINFO *mi) {
4949
mouseMoved();
5050
}
5151

52-
void MouseController::OnLeftButtonUp(MOUSEINFO *mi) {
52+
void MouseController::OnLeftButtonUp(MOUSEINFO * /* mi */) {
5353
buttons &= ~LEFT_BUTTON;
5454
mouseReleased();
5555
mouseClicked();
5656
}
5757

58-
void MouseController::OnLeftButtonDown(MOUSEINFO *mi) {
58+
void MouseController::OnLeftButtonDown(MOUSEINFO * /* mi */) {
5959
buttons |= LEFT_BUTTON;
6060
mousePressed();
6161
}
6262

63-
void MouseController::OnMiddleButtonUp(MOUSEINFO *mi) {
63+
void MouseController::OnMiddleButtonUp(MOUSEINFO * /* mi */) {
6464
buttons &= ~MIDDLE_BUTTON;
6565
mouseReleased();
6666
mouseClicked();
6767
}
6868

69-
void MouseController::OnMiddleButtonDown(MOUSEINFO *mi) {
69+
void MouseController::OnMiddleButtonDown(MOUSEINFO * /* mi */) {
7070
buttons |= MIDDLE_BUTTON;
7171
mousePressed();
7272
}
7373

74-
void MouseController::OnRightButtonUp(MOUSEINFO *mi) {
74+
void MouseController::OnRightButtonUp(MOUSEINFO * /* mi */) {
7575
buttons &= ~RIGHT_BUTTON;
7676
mouseReleased();
7777
mouseClicked();
7878
}
7979

80-
void MouseController::OnRightButtonDown(MOUSEINFO *mi) {
80+
void MouseController::OnRightButtonDown(MOUSEINFO * /* mi */) {
8181
buttons |= RIGHT_BUTTON;
8282
mousePressed();
8383
}

‎libraries/USBHost/src/Usb.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ uint32_t USBHost::OutTransfer(EpInfo *pep, uint32_t nak_limit, uint32_t nbytes,
340340
for( i=0; i<nbytes; i++) {
341341
buf[i] = data[i];
342342
}
343-
unsigned long timeout = millis() + USB_XFER_TIMEOUT;
343+
//unsigned long timeout = millis() + USB_XFER_TIMEOUT;
344344

345345
//set toggle value
346346
if(pep->bmSndToggle)

‎libraries/USBHost/src/Usb.h

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ e-mail : [email protected]
2222

2323
#include <stdint.h>
2424

25-
#define ARDUINO 101
26-
2725
//#include "Arduino.h"
2826
#include "macros.h"
2927
// None of these should ever be included by a driver, or a user's sketch.

‎libraries/USBHost/src/UsbCore.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ typedef MAX3421e<P20, P19> MAX3421E; // Balanduino
119119
class USBDeviceConfig {
120120
public:
121121

122-
virtual uint32_t Init(uint32_t parent, uint32_t port, uint32_t lowspeed) {
122+
virtual uint32_t Init(uint32_t /* parent */, uint32_t /* port */, uint32_t /* lowspeed */) {
123123
return 0;
124124
}
125125

126-
virtual uint32_t ConfigureDevice(uint32_t parent, uint32_t port, uint32_t lowspeed) {
126+
virtual uint32_t ConfigureDevice(uint32_t /* parent */, uint32_t /* port */, uint32_t /* lowspeed */) {
127127
return 0;
128128
}
129129

@@ -139,15 +139,15 @@ class USBDeviceConfig {
139139
return 0;
140140
}
141141

142-
virtual void ResetHubPort(uint32_t port) {
142+
virtual void ResetHubPort(uint32_t /* port */) {
143143
return;
144144
} // Note used for hubs only!
145145

146-
virtual uint32_t VIDPIDOK(uint32_t vid, uint32_t pid) {
146+
virtual uint32_t VIDPIDOK(uint32_t /* vid */, uint32_t /* pid */) {
147147
return false;
148148
}
149149

150-
virtual uint32_t DEVCLASSOK(uint32_t klass) {
150+
virtual uint32_t DEVCLASSOK(uint32_t /* klass */) {
151151
return false;
152152
}
153153
};

‎libraries/USBHost/src/adk.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ uint32_t ADK::Init(uint32_t parent, uint32_t port, uint32_t lowspeed) {
347347
}
348348

349349
/* Extracts bulk-IN and bulk-OUT endpoint information from config descriptor */
350-
void ADK::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t alt, uint32_t proto, const USB_ENDPOINT_DESCRIPTOR *pep) {
350+
void ADK::EndpointXtract(uint32_t conf, uint32_t /* iface */, uint32_t /* alt */, uint32_t /* proto */, const USB_ENDPOINT_DESCRIPTOR *pep) {
351351
//ErrorMessage<uint8_t>(PSTR("Conf.Val"), conf);
352352
//ErrorMessage<uint8_t>(PSTR("Iface Num"), iface);
353353
//ErrorMessage<uint8_t>(PSTR("Alt.Set"), alt);

‎libraries/USBHost/src/confdescparser.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ UseOr(false) {
8585
};
8686

8787
template <const uint8_t CLASS_ID, const uint8_t SUBCLASS_ID, const uint8_t PROTOCOL_ID, const uint8_t MASK>
88-
void ConfigDescParser<CLASS_ID, SUBCLASS_ID, PROTOCOL_ID, MASK>::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t &offset) {
88+
void ConfigDescParser<CLASS_ID, SUBCLASS_ID, PROTOCOL_ID, MASK>::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t & /* offset */) {
8989
uint32_t cntdn = len;
9090
uint8_t *p = (uint8_t*)pbuf;
9191

‎libraries/USBHost/src/hidboot.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ e-mail : [email protected]
1616
*/
1717
#include "hidboot.h"
1818

19-
void MouseReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_t *buf) {
19+
void MouseReportParser::Parse(HID * /* hid */, uint32_t /* is_rpt_id */, uint32_t /* len */, uint8_t *buf) {
2020
MOUSEINFO *pmi = (MOUSEINFO*)buf;
2121
// Future:
2222
// bool event;
@@ -124,7 +124,7 @@ void MouseReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_
124124

125125
};
126126

127-
void KeyboardReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_t *buf) {
127+
void KeyboardReportParser::Parse(HID *hid, uint32_t /* is_rpt_id */, uint32_t /* len */, uint8_t *buf) {
128128
// On error - return
129129
if (buf[2] == 1)
130130
return;

‎libraries/USBHost/src/hidboot.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,25 @@ class MouseReportParser : public HIDReportParser {
6464

6565
protected:
6666

67-
virtual void OnMouseMove(MOUSEINFO *mi) {
67+
virtual void OnMouseMove(MOUSEINFO *) {
6868
};
6969

70-
virtual void OnLeftButtonUp(MOUSEINFO *mi) {
70+
virtual void OnLeftButtonUp(MOUSEINFO *) {
7171
};
7272

73-
virtual void OnLeftButtonDown(MOUSEINFO *mi) {
73+
virtual void OnLeftButtonDown(MOUSEINFO *) {
7474
};
7575

76-
virtual void OnRightButtonUp(MOUSEINFO *mi) {
76+
virtual void OnRightButtonUp(MOUSEINFO *) {
7777
};
7878

79-
virtual void OnRightButtonDown(MOUSEINFO *mi) {
79+
virtual void OnRightButtonDown(MOUSEINFO *) {
8080
};
8181

82-
virtual void OnMiddleButtonUp(MOUSEINFO *mi) {
82+
virtual void OnMiddleButtonUp(MOUSEINFO *) {
8383
};
8484

85-
virtual void OnMiddleButtonDown(MOUSEINFO *mi) {
85+
virtual void OnMiddleButtonDown(MOUSEINFO *) {
8686
};
8787
};
8888

@@ -153,13 +153,13 @@ class KeyboardReportParser : public HIDReportParser {
153153
protected:
154154
virtual uint8_t HandleLockingKeys(HID* hid, uint8_t key);
155155

156-
virtual void OnControlKeysChanged(uint8_t before, uint8_t after) {
156+
virtual void OnControlKeysChanged(uint8_t /* before */, uint8_t /* after */) {
157157
};
158158

159-
virtual void OnKeyDown(uint8_t mod, uint8_t key) {
159+
virtual void OnKeyDown(uint8_t /* mod */, uint8_t /* key */) {
160160
};
161161

162-
virtual void OnKeyUp(uint8_t mod, uint8_t key) {
162+
virtual void OnKeyUp(uint8_t /* mod */, uint8_t /* key */) {
163163
};
164164

165165
virtual const uint8_t *getNumKeys() {
@@ -520,7 +520,7 @@ uint32_t HIDBoot<BOOT_PROTOCOL>::Init(uint32_t parent, uint32_t port, uint32_t l
520520
}
521521

522522
template <const uint8_t BOOT_PROTOCOL>
523-
void HIDBoot<BOOT_PROTOCOL>::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t alt, uint32_t proto, const USB_ENDPOINT_DESCRIPTOR *pep) {
523+
void HIDBoot<BOOT_PROTOCOL>::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t /* alt */, uint32_t /* proto */, const USB_ENDPOINT_DESCRIPTOR *pep) {
524524
// If the first configuration satisfies, the others are not considered.
525525
//if(bNumEP > 1 && conf != bConfNum)
526526
if(bNumEP == totalEndpoints(BOOT_PROTOCOL))

‎libraries/USBHost/src/hidescriptorparser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ const char * const ReportDescParserBase::medInstrTitles4[] PROGMEM = {
990990
pstrUsageSoftControlAdjust
991991
};
992992

993-
void ReportDescParserBase::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t &offset) {
993+
void ReportDescParserBase::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t & /* offset */) {
994994
uint32_t cntdn = (uint32_t)len;
995995
uint8_t *p = (uint8_t*)pbuf;
996996

@@ -1589,7 +1589,7 @@ void ReportDescParser2::OnInputItem(uint8_t itm) {
15891589
E_Notify(PSTR("\r\n"), 0x80);
15901590
}
15911591

1592-
void UniversalReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_t *buf) {
1592+
void UniversalReportParser::Parse(HID *hid, uint32_t /* is_rpt_id */, uint32_t len, uint8_t *buf) {
15931593
ReportDescParser2 prs(len, buf);
15941594

15951595
uint8_t ret = hid->GetReportDescr(0, &prs);

‎libraries/USBHost/src/hiduniversal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class HIDUniversal : public HID {
7575
return 0;
7676
};
7777

78-
virtual void ParseHIDData(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) {
78+
virtual void ParseHIDData(HID * /* hid */, bool /* is_rpt_id */, uint8_t /* len */, uint8_t * /* buf */) {
7979
return;
8080
};
8181

‎libraries/USBHost/src/message.h

+10-4
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,30 @@ void NotifyFail(uint8_t rcode);
5555
#define NotifyFail(...) ((void)0)
5656
#endif
5757

58+
#ifdef DEBUG_USB_HOST
5859
template <class ERROR_TYPE>
5960
void ErrorMessage(uint8_t level, char const * msg, ERROR_TYPE rcode = 0) {
60-
#ifdef DEBUG_USB_HOST
6161
Notify(msg, level);
6262
Notify(PSTR(": "), level);
6363
D_PrintHex<ERROR_TYPE > (rcode, level);
6464
Notify(PSTR("\r\n"), level);
65-
#endif
6665
}
6766

6867
template <class ERROR_TYPE>
6968
void ErrorMessage(char const * msg, ERROR_TYPE rcode = 0) {
70-
#ifdef DEBUG_USB_HOST
7169
Notify(msg, 0x80);
7270
Notify(PSTR(": "), 0x80);
7371
D_PrintHex<ERROR_TYPE > (rcode, 0x80);
7472
Notify(PSTR("\r\n"), 0x80);
75-
#endif
7673
}
74+
#else
75+
template <class ERROR_TYPE>
76+
void ErrorMessage(uint8_t, char const *, ERROR_TYPE = 0) {
77+
}
78+
79+
template <class ERROR_TYPE>
80+
void ErrorMessage(char const *, ERROR_TYPE = 0) {
81+
}
82+
#endif
7783

7884
#endif // __MESSAGE_H__

‎libraries/USBHost/src/printhex.h

+9-4
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,23 @@ void PrintHex2(Print *prn, T val) {
6666
prn->print((T)val, HEX);
6767
}
6868

69-
template <class T> void D_PrintHex(T val, int lvl) {
7069
#ifdef DEBUG_USB_HOST
70+
template <class T> void D_PrintHex(T val, int lvl) {
7171
PrintHex<T > (val, lvl);
72-
#endif
7372
}
7473

7574
template <class T>
7675
void D_PrintBin(T val, int lvl) {
77-
#ifdef DEBUG_USB_HOST
7876
PrintBin<T > (val, lvl);
79-
#endif
8077
}
78+
#else
79+
template <class T> void D_PrintHex(T, int) {
80+
}
81+
82+
template <class T>
83+
void D_PrintBin(T, int) {
84+
}
85+
#endif
8186

8287

8388

‎libraries/USBHost/src/sink_parser.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SinkParser : public BASE_CLASS {
3333
void Initialize() {
3434
};
3535

36-
void Parse(const LEN_TYPE len, const uint8_t *pbuf, const OFFSET_TYPE &offset) {
36+
void Parse(const LEN_TYPE /* len */, const uint8_t * /* pbuf */, const OFFSET_TYPE & /* offset */) {
3737
};
3838
};
3939

‎libraries/USBHost/src/usbhub.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ uint32_t USBHub::PortStatusChange(uint32_t port, HubEvent &evt) {
374374
return 0;
375375
}
376376

377-
void PrintHubPortStatus(USBHub *hubptr, uint32_t addr, uint32_t port, uint32_t print_changes) {
377+
void PrintHubPortStatus(USBHub *hubptr, uint32_t /* addr */, uint32_t port, uint32_t print_changes) {
378378
uint8_t rcode = 0;
379379
HubEvent evt;
380380

0 commit comments

Comments
 (0)