ezri/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into lotus-march2023

Browse Source
This commit is contained in:
Daniel Schaefer
2023-03-22 02:54:55 +08:00
parent 6e4246ceb4 ac75242132
commit cb290c4132
11612 changed files with 115637 additions and 107111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tmk_core/protocol/lufa/lufa.c
View File

@@ -298,7 +298,7 @@ void EVENT_USB_Device_Reset(void) {
*
* FIXME: Needs doc
*/
void EVENT_USB_Device_Suspend() {
void EVENT_USB_Device_Suspend(void) {
print("[S]");
usb_device_state_set_suspend(USB_Device_ConfigurationNumber != 0, USB_Device_ConfigurationNumber);
@@ -311,7 +311,7 @@ void EVENT_USB_Device_Suspend() {
*
* FIXME: Needs doc
*/
void EVENT_USB_Device_WakeUp() {
void EVENT_USB_Device_WakeUp(void) {
print("[W]");
#if defined(NO_USB_STARTUP_CHECK)
suspend_wakeup_init();
@@ -907,5 +907,5 @@ void protocol_post_task(void) {
}
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, const void **const DescriptorAddress) {
return get_usb_descriptor(wValue, wIndex, DescriptorAddress);
return get_usb_descriptor(wValue, wIndex, USB_ControlRequest.wLength, DescriptorAddress);
}