diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2018-06-17 16:06:07 +1000 |
---|---|---|
committer | skullydazed <skullydazed@users.noreply.github.com> | 2018-09-11 12:52:57 -0700 |
commit | df8e417032bace12d69b5d75aebf257ea5dadb86 (patch) | |
tree | 52ab88e56f9b905e2df3485bb79e6031872c28b9 /lib | |
parent | c7e1b53913707487b0218b984367d32fb4466aaa (diff) | |
download | qmk_firmware-df8e417032bace12d69b5d75aebf257ea5dadb86.tar.gz qmk_firmware-df8e417032bace12d69b5d75aebf257ea5dadb86.zip |
Fix mismatched aliased event and event stub function prototypes.
Diffstat (limited to 'lib')
14 files changed, 38 insertions, 13 deletions
diff --git a/lib/lufa/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c b/lib/lufa/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c index 9a7ff4725..0210ff55c 100644 --- a/lib/lufa/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c +++ b/lib/lufa/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c | |||
@@ -231,12 +231,14 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C | |||
231 | */ | 231 | */ |
232 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; | 232 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; |
233 | 233 | ||
234 | (void)HostReady; | ||
235 | |||
234 | if (CDCInterfaceInfo == &VirtualSerial1_CDC_Interface) | 236 | if (CDCInterfaceInfo == &VirtualSerial1_CDC_Interface) |
235 | { | 237 | { |
236 | // CDC interface 1's host is ready to send/receive data | 238 | // CDC interface 1's host is ready to send/receive data if HostReady is true |
237 | } | 239 | } |
238 | else | 240 | else |
239 | { | 241 | { |
240 | // CDC interface 2's host is ready to send/receive data | 242 | // CDC interface 2's host is ready to send/receive data if HostReady is true |
241 | } | 243 | } |
242 | } | 244 | } |
diff --git a/lib/lufa/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c b/lib/lufa/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c index a3d419ae5..3a943e8c1 100644 --- a/lib/lufa/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c +++ b/lib/lufa/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c | |||
@@ -199,4 +199,6 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C | |||
199 | in the pending data from the USB endpoints. | 199 | in the pending data from the USB endpoints. |
200 | */ | 200 | */ |
201 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; | 201 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; |
202 | |||
203 | (void)HostReady; | ||
202 | } | 204 | } |
diff --git a/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c b/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c index f298e39cb..c8b1dfd2d 100644 --- a/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c +++ b/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c | |||
@@ -238,6 +238,8 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C | |||
238 | in the pending data from the USB endpoints. | 238 | in the pending data from the USB endpoints. |
239 | */ | 239 | */ |
240 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; | 240 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; |
241 | |||
242 | (void)HostReady; | ||
241 | } | 243 | } |
242 | 244 | ||
243 | /** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed. | 245 | /** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed. |
diff --git a/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c b/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c index 134958060..c299723bb 100644 --- a/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c +++ b/lib/lufa/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c | |||
@@ -279,4 +279,6 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C | |||
279 | in the pending data from the USB endpoints. | 279 | in the pending data from the USB endpoints. |
280 | */ | 280 | */ |
281 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; | 281 | bool HostReady = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) != 0; |
282 | |||
283 | (void)HostReady; | ||
282 | } | 284 | } |
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c index 08cbeb706..eb3aa5710 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c +++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c | |||
@@ -188,7 +188,7 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioIn | |||
188 | return true; | 188 | return true; |
189 | } | 189 | } |
190 | 190 | ||
191 | void Audio_Device_Event_Stub(void) | 191 | void Audio_Device_Event_Stub(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) |
192 | { | 192 | { |
193 | 193 | ||
194 | } | 194 | } |
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h index 920281be5..91938af8c 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h +++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h | |||
@@ -377,7 +377,7 @@ | |||
377 | #if !defined(__DOXYGEN__) | 377 | #if !defined(__DOXYGEN__) |
378 | /* Function Prototypes: */ | 378 | /* Function Prototypes: */ |
379 | #if defined(__INCLUDE_FROM_AUDIO_DEVICE_C) | 379 | #if defined(__INCLUDE_FROM_AUDIO_DEVICE_C) |
380 | void Audio_Device_Event_Stub(void); | 380 | void Audio_Device_Event_Stub(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo); |
381 | 381 | ||
382 | void EVENT_Audio_Device_StreamStartStop(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) | 382 | void EVENT_Audio_Device_StreamStartStop(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) |
383 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(Audio_Device_Event_Stub); | 383 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(Audio_Device_Event_Stub); |
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c index 867548c00..93930bc99 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c +++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c | |||
@@ -353,10 +353,15 @@ static int CDC_Device_getchar_Blocking(FILE* Stream) | |||
353 | } | 353 | } |
354 | #endif | 354 | #endif |
355 | 355 | ||
356 | void CDC_Device_Event_Stub(void) | 356 | void CDC_Device_Event_Stub(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) |
357 | { | 357 | { |
358 | 358 | ||
359 | } | 359 | } |
360 | 360 | ||
361 | void CDC_Device_Event_Stub_2(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t _1) | ||
362 | { | ||
363 | CDC_Device_Event_Stub(CDCInterfaceInfo); | ||
364 | } | ||
365 | |||
361 | #endif | 366 | #endif |
362 | 367 | ||
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h index f9a53851a..55dbbc726 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h +++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h | |||
@@ -362,7 +362,8 @@ | |||
362 | static int CDC_Device_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1); | 362 | static int CDC_Device_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1); |
363 | #endif | 363 | #endif |
364 | 364 | ||
365 | void CDC_Device_Event_Stub(void); | 365 | void CDC_Device_Event_Stub(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo); |
366 | void CDC_Device_Event_Stub_2(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t _1); | ||
366 | 367 | ||
367 | void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) | 368 | void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) |
368 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub); | 369 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub); |
@@ -370,7 +371,7 @@ | |||
370 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub); | 371 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub); |
371 | void EVENT_CDC_Device_BreakSent(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, | 372 | void EVENT_CDC_Device_BreakSent(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, |
372 | const uint8_t Duration) ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) | 373 | const uint8_t Duration) ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) |
373 | ATTR_ALIAS(CDC_Device_Event_Stub); | 374 | ATTR_ALIAS(CDC_Device_Event_Stub_2); |
374 | #endif | 375 | #endif |
375 | 376 | ||
376 | #endif | 377 | #endif |
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c index 7209c452d..668b138b7 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c +++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c | |||
@@ -305,7 +305,7 @@ static int PRNT_Device_getchar_Blocking(FILE* Stream) | |||
305 | } | 305 | } |
306 | #endif | 306 | #endif |
307 | 307 | ||
308 | void PRNT_Device_Event_Stub(void) | 308 | void PRNT_Device_Event_Stub(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) |
309 | { | 309 | { |
310 | 310 | ||
311 | } | 311 | } |
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h index 5ac527935..d850842d8 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h +++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h | |||
@@ -273,7 +273,7 @@ | |||
273 | static int PRNT_Device_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1); | 273 | static int PRNT_Device_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1); |
274 | #endif | 274 | #endif |
275 | 275 | ||
276 | void PRNT_Device_Event_Stub(void); | 276 | void PRNT_Device_Event_Stub(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo); |
277 | 277 | ||
278 | void EVENT_PRNT_Device_SoftReset(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) | 278 | void EVENT_PRNT_Device_SoftReset(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) |
279 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(PRNT_Device_Event_Stub); | 279 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(PRNT_Device_Event_Stub); |
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c index af9ed96e2..cc93f9601 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c +++ b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c | |||
@@ -503,7 +503,7 @@ static int CDC_Host_getchar_Blocking(FILE* Stream) | |||
503 | } | 503 | } |
504 | #endif | 504 | #endif |
505 | 505 | ||
506 | void CDC_Host_Event_Stub(void) | 506 | void CDC_Host_Event_Stub(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) |
507 | { | 507 | { |
508 | 508 | ||
509 | } | 509 | } |
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h index f5cc4906b..8d0d89a03 100644 --- a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h +++ b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h | |||
@@ -360,7 +360,7 @@ | |||
360 | static int CDC_Host_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1); | 360 | static int CDC_Host_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1); |
361 | #endif | 361 | #endif |
362 | 362 | ||
363 | void CDC_Host_Event_Stub(void); | 363 | void CDC_Host_Event_Stub(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo); |
364 | 364 | ||
365 | void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) | 365 | void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) |
366 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Host_Event_Stub); | 366 | ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Host_Event_Stub); |
diff --git a/lib/lufa/LUFA/Drivers/USB/Core/Events.c b/lib/lufa/LUFA/Drivers/USB/Core/Events.c index 186557956..e05fd7419 100644 --- a/lib/lufa/LUFA/Drivers/USB/Core/Events.c +++ b/lib/lufa/LUFA/Drivers/USB/Core/Events.c | |||
@@ -37,3 +37,12 @@ void USB_Event_Stub(void) | |||
37 | 37 | ||
38 | } | 38 | } |
39 | 39 | ||
40 | void USB_Event_Stub_2(const uint8_t _1) | ||
41 | { | ||
42 | USB_Event_Stub(); | ||
43 | } | ||
44 | |||
45 | void USB_Event_Stub_3(const uint8_t _1, const uint8_t _2) | ||
46 | { | ||
47 | USB_Event_Stub(); | ||
48 | } | ||
diff --git a/lib/lufa/LUFA/Drivers/USB/Core/Events.h b/lib/lufa/LUFA/Drivers/USB/Core/Events.h index 91fb31b62..d37bb3065 100644 --- a/lib/lufa/LUFA/Drivers/USB/Core/Events.h +++ b/lib/lufa/LUFA/Drivers/USB/Core/Events.h | |||
@@ -332,19 +332,21 @@ | |||
332 | /* Function Prototypes: */ | 332 | /* Function Prototypes: */ |
333 | #if defined(__INCLUDE_FROM_EVENTS_C) | 333 | #if defined(__INCLUDE_FROM_EVENTS_C) |
334 | void USB_Event_Stub(void); | 334 | void USB_Event_Stub(void); |
335 | void USB_Event_Stub_2(const uint8_t _1); | ||
336 | void USB_Event_Stub_3(const uint8_t _1, const uint8_t _2); | ||
335 | 337 | ||
336 | #if defined(USB_CAN_BE_BOTH) | 338 | #if defined(USB_CAN_BE_BOTH) |
337 | void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); | 339 | void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); |
338 | #endif | 340 | #endif |
339 | 341 | ||
340 | #if defined(USB_CAN_BE_HOST) | 342 | #if defined(USB_CAN_BE_HOST) |
341 | void EVENT_USB_Host_HostError(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); | 343 | void EVENT_USB_Host_HostError(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub_2); |
342 | void EVENT_USB_Host_DeviceAttached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); | 344 | void EVENT_USB_Host_DeviceAttached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); |
343 | void EVENT_USB_Host_DeviceUnattached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); | 345 | void EVENT_USB_Host_DeviceUnattached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); |
344 | void EVENT_USB_Host_DeviceEnumerationComplete(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); | 346 | void EVENT_USB_Host_DeviceEnumerationComplete(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); |
345 | void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, | 347 | void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, |
346 | const uint8_t SubErrorCode) | 348 | const uint8_t SubErrorCode) |
347 | ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); | 349 | ATTR_WEAK ATTR_ALIAS(USB_Event_Stub_3); |
348 | void EVENT_USB_Host_StartOfFrame(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); | 350 | void EVENT_USB_Host_StartOfFrame(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); |
349 | #endif | 351 | #endif |
350 | 352 | ||