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/lufa/Demos/Device | |
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/lufa/Demos/Device')
4 files changed, 10 insertions, 2 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 | } |