Merge remote-tracking branch 'tmk/master'

converter/ibmpc_usb/Makefile

@@ -50,8 +50,8 @@ ARCH ?= AVR8
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 F_USB ?= $(F_CPU)
 
-# Interrupt driven control endpoint task
-# Not work with suart debug
+# Interrupt driven control endpoint task. Do not enable this.
+# This blocks long for capslock and etc. and can prevent signal handling.
 #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 # This improves response of keyboard when wakeup

tmk_core/protocol/lufa.mk

@@ -41,6 +41,7 @@ VPATH += $(TMK_DIR)/$(TMK_LUFA_PATH)
 TMK_LUFA_OPTS  = -DUSB_DEVICE_ONLY
 TMK_LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
 TMK_LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+# Do not enable this for converters in particular, it blocks other tasks long.
 #TMK_LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
 TMK_LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
 TMK_LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1

tmk_core/protocol/lufa/lufa.c

@@ -272,7 +272,6 @@ void EVENT_USB_Device_Connect(void)
     if (!USB_IsInitialized) {
         USB_Disable();
         USB_Init();
-        USB_Device_EnableSOFEvents();
     }
 }
 
@@ -315,11 +314,6 @@ void EVENT_USB_Device_WakeUp()
     hook_usb_wakeup();
 }
 
-// called every 1ms
-void EVENT_USB_Device_StartOfFrame(void)
-{
-}
-
 /** Event handler for the USB_ConfigurationChanged event.
  * This is fired when the host sets the current configuration of the USB device after enumeration.
  *
@@ -663,8 +657,6 @@ static void setup_usb(void)
     USB_Disable();
 
     USB_Init();
-
-    USB_Device_EnableSOFEvents();
 }
 
 int main(void)  __attribute__ ((weak));