From 4880e2b661ac255c35c765cd6595ab9b1136ef2f Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 8 May 2019 11:48:47 +0900 Subject: [PATCH] usb_usb: Override startup and suspend hook --- converter/usb_usb/usb_usb.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/converter/usb_usb/usb_usb.cpp b/converter/usb_usb/usb_usb.cpp index 75750911..50d2578e 100644 --- a/converter/usb_usb/usb_usb.cpp +++ b/converter/usb_usb/usb_usb.cpp @@ -35,6 +35,10 @@ along with this program. If not, see . #include "host.h" #include "keyboard.h" +#include "hook.h" +#include "suspend.h" +#include "lufa.h" + /* KEY CODE to Matrix * @@ -233,3 +237,28 @@ void led_set(uint8_t usb_led) if (kbd3.isReady()) kbd3.SetReport(0, 0, 2, 0, 1, &usb_led); if (kbd4.isReady()) kbd4.SetReport(0, 0, 2, 0, 1, &usb_led); } + +// We need to keep doing UHS2 USB::Task() to initialize keyboard +// even before USB is not configured. +void hook_usb_startup_wait_loop(void) +{ + matrix_scan(); +} + +// We need to keep doing UHS2 USB::Task() to initialize keyboard +// even during USB bus is suspended and remote wakeup is not enabled yet on LUFA side. +// This situation can happen just after pluging converter into USB port. +void hook_usb_suspend_loop(void) +{ +#ifndef LUFA_DEBUG_UART + // This corrupts debug print when suspend + suspend_power_down(); +#endif + if (USB_Device_RemoteWakeupEnabled) { + if (suspend_wakeup_condition()) { + USB_Device_SendRemoteWakeup(); + } + } else { + matrix_scan(); + } +} -- 2.46.2