From aad57466827c6aac8f612f5fbbb5adcea6fc5975 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 23 Jun 2023 00:07:28 +1000
Subject: Move protocol makefiles into their respective folders (#21332)

* Move protocol makefiles into their respective folders

* Fix USB-USB converter
---
 tmk_core/protocol/lufa/lufa.mk | 52 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 tmk_core/protocol/lufa/lufa.mk

(limited to 'tmk_core/protocol/lufa')

diff --git a/tmk_core/protocol/lufa/lufa.mk b/tmk_core/protocol/lufa/lufa.mk
new file mode 100644
index 0000000000..b048c1836c
--- /dev/null
+++ b/tmk_core/protocol/lufa/lufa.mk
@@ -0,0 +1,52 @@
+LUFA_DIR = protocol/lufa
+
+# Path to the LUFA library
+LUFA_PATH = $(LIB_PATH)/lufa
+
+# Create the LUFA source path variables by including the LUFA makefile
+ifneq (, $(wildcard $(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
+    # New build system from 20120730
+    LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
+    DMBS_LUFA_PATH = $(LUFA_PATH)/LUFA/Build/LUFA
+    include $(LUFA_PATH)/LUFA/Build/lufa_sources.mk
+else
+    include $(LUFA_PATH)/LUFA/makefile
+endif
+
+LUFA_SRC = lufa.c \
+	usb_descriptor.c \
+	$(LUFA_SRC_USB)
+
+ifeq ($(strip $(MIDI_ENABLE)), yes)
+	LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c
+endif
+
+ifeq ($(strip $(VIRTSER_ENABLE)), yes)
+	LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c
+endif
+
+SRC += $(LUFA_SRC)
+SRC += $(LUFA_DIR)/usb_util.c
+
+# Search Path
+VPATH += $(TMK_PATH)/$(LUFA_DIR)
+VPATH += $(LUFA_PATH)
+
+# LUFA library compile-time options and predefined tokens
+LUFA_OPTS  = -DUSB_DEVICE_ONLY
+LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
+LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
+
+# Remote wakeup fix for ATmega16/32U2        https://github.com/tmk/tmk_keyboard/issues/361
+ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2))
+	LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT
+endif
+
+OPT_DEFS += -DF_USB=$(F_USB)UL
+OPT_DEFS += -DARCH=ARCH_$(ARCH)
+OPT_DEFS += $(LUFA_OPTS)
+
+# This indicates using LUFA stack
+OPT_DEFS += -DPROTOCOL_LUFA
-- 
cgit v1.2.3


From a87c74ebe14aee0d4a82f5ff8a0170afb8105598 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 26 Jun 2023 23:55:52 +0200
Subject: [Bug] Fix non-functional S3 wakeup / resume from suspense  (#19780)

* Update ChibiOS-Contrib for USB suspend fixes

* Remove S3 wakup workaround

ChibiOS OTGv1 driver has a remote wakeup bug that prevents the device to
resume it's operation. 02516cbc24647f522eee975e69cc0c8a925470eb
introduced a hotfix that forcefully restarted the usb driver as a workaround.
This workaround broke multiple boards which do not use this driver /
peripheral. With the update of ChibiOS this hotfix is now obsolete.

* Remove restart_usb_driver overrides

they are no longer necessary as the workaround is not needed anymore
for stm32f4

* Remove unused RP_USB_USE_SOF_INTR defines

The SOF interrupt is enabled dynamically by the RP2040 usb driver
---
 tmk_core/protocol/lufa/lufa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tmk_core/protocol/lufa')

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 20bfc8fb3c..d1cda24227 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -858,7 +858,7 @@ void protocol_post_init(void) {
 void protocol_pre_task(void) {
 #if !defined(NO_USB_STARTUP_CHECK)
     if (USB_DeviceState == DEVICE_STATE_Suspended) {
-        print("[s]");
+        dprintln("suspending keyboard");
         while (USB_DeviceState == DEVICE_STATE_Suspended) {
             suspend_power_down();
             if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
-- 
cgit v1.2.3


From 30de598650f368e215ad5f82c7b9de52eceb539e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 7 Jul 2023 21:24:07 +1000
Subject: tmk_core: remove direct `quantum.h` includes (#21465)

---
 tmk_core/protocol/lufa/lufa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tmk_core/protocol/lufa')

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index d1cda24227..f04ca79a0c 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -48,10 +48,10 @@
 #    include "sleep_led.h"
 #endif
 #include "suspend.h"
+#include "wait.h"
 
 #include "usb_descriptor.h"
 #include "lufa.h"
-#include "quantum.h"
 #include "usb_device_state.h"
 #include <util/atomic.h>
 
-- 
cgit v1.2.3