Merge branch 'interrupt_control_endpoint_fix'

diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile
index fe94d9f7b8463cad9b5e9b762d3a2744d6ddc1e5..ba87b07e7e0ae5e1a80a32113511a2fddb1b5565 100644 (file)
--- a/converter/adb_usb/Makefile
+++ b/converter/adb_usb/Makefile
@@ -53,9 +53,6 @@ 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(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512

diff --git a/converter/ibm4704_usb/Makefile b/converter/ibm4704_usb/Makefile
index f930cb5981077ab2df3af400886b09a823767616..007e0e01337a1a756d40c96812485633cd0a87df 100644 (file)
--- a/converter/ibm4704_usb/Makefile
+++ b/converter/ibm4704_usb/Makefile
@@ -70,7 +70,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(+60)
+# TODO: This can prevent converter ISR from handling signal instantly, better remove it.
+# Without this option debug prints from enable_break() won't be displayed comopletely.
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 

diff --git a/converter/ibmpc_usb/Makefile b/converter/ibmpc_usb/Makefile
index 2b272a591e4f7a349350c894a4b7108e29214fdb..30ce9248288cccc347834e2bbdf8dd34b2d71ead 100644 (file)
--- a/converter/ibmpc_usb/Makefile
+++ b/converter/ibmpc_usb/Makefile
@@ -50,9 +50,6 @@ 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. 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
 OPT_DEFS += -DSUSPEND_MODE_STANDBY

diff --git a/converter/m0110_usb/Makefile b/converter/m0110_usb/Makefile
index 71d675ac7f43b6f67814c1f962ddca8a03f29f4d..d54fe596a9600413962718434f121f50a34cbdee 100644 (file)
--- a/converter/m0110_usb/Makefile
+++ b/converter/m0110_usb/Makefile
@@ -65,9 +65,6 @@ 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
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Boot Section Size in bytes
 #   Teensy halfKay   512

diff --git a/converter/news_usb/Makefile b/converter/news_usb/Makefile
index e94a4f61a55bb716c09d9fe5d695645943322d9a..77a61e938f28d6a92f28944dd20f93a409b2b78f 100644 (file)
--- a/converter/news_usb/Makefile
+++ b/converter/news_usb/Makefile
@@ -58,9 +58,6 @@ 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(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512

diff --git a/converter/next_usb/Makefile b/converter/next_usb/Makefile
index f3143c25c40b8224602fa3a586cfa9677dc781ef..7e6e7230b5fd18e625881a3abebaaa6e2011b96b 100644 (file)
--- a/converter/next_usb/Makefile
+++ b/converter/next_usb/Makefile
@@ -68,9 +68,6 @@ 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(+60)
-#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512

diff --git a/converter/pana_m8/Makefile b/converter/pana_m8/Makefile
index 93f3c462ee51c778ee6162df662e47a6114d3c80..39a5885e58863a532e428e1a64ad6b591a6d52bf 100644 (file)
--- a/converter/pana_m8/Makefile
+++ b/converter/pana_m8/Makefile
@@ -10,7 +10,6 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # LUFA specific
 ARCH ?= AVR8
 F_USB ?= $(F_CPU)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 
 # Build Options

diff --git a/converter/pc88_usb/Makefile b/converter/pc88_usb/Makefile
index c6af973542143637941df9e62d4af4dc98709790..05be2234a78576adaeb3483a3dabbd23ba0459ea 100644 (file)
--- a/converter/pc88_usb/Makefile
+++ b/converter/pc88_usb/Makefile
@@ -49,9 +49,6 @@ 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
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Build Options
 #   *Comment out* to disable the options.

diff --git a/converter/pc88_usb/Makefile.unimap b/converter/pc88_usb/Makefile.unimap
index da526033a5ffc29c70e9141dc7da75cc64eb81b4..4e71d822f19679a8157fbde6afa4cd35c6b3d49d 100644 (file)
--- a/converter/pc88_usb/Makefile.unimap
+++ b/converter/pc88_usb/Makefile.unimap
@@ -49,9 +49,6 @@ 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
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Build Options
 #   *Comment out* to disable the options.

diff --git a/converter/pc98_usb/Makefile b/converter/pc98_usb/Makefile
index 0f284a1b339fd0b28aa2c5c284a9e150f984bc6b..5f7a06868ca1cbb798bad1ff77c010e30d55ee1f 100644 (file)
--- a/converter/pc98_usb/Makefile
+++ b/converter/pc98_usb/Makefile
@@ -49,9 +49,6 @@ 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
-#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Build Options
 #   *Comment out* to disable the options.

diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index 5f9c4042c8cd5ae5dc5a88cb84a7ff34f389bcea..f8c470d0aa431a6d6bb48cecd3e6268b094b4b06 100644 (file)
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -68,9 +68,6 @@ 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
-#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 # This improves response of keyboard when wakeup
 OPT_DEFS += -DSUSPEND_MODE_STANDBY

diff --git a/converter/sun_usb/Makefile b/converter/sun_usb/Makefile
index 20addfc9de8a1e230260fcf1f704ae3a7b341d70..366bac70ce5cce73f82ccaa3ee3699975f7a6757 100644 (file)
--- a/converter/sun_usb/Makefile
+++ b/converter/sun_usb/Makefile
@@ -52,9 +52,6 @@ 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
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Build Options
 #   *Comment out* to disable the options.

diff --git a/converter/terminal_usb/Makefile b/converter/terminal_usb/Makefile
index fc07155f69a732590277b517f8ea7386b3d2b7b6..766e92fed0638a2b12a64230d8d883f37b369f15 100644 (file)
--- a/converter/terminal_usb/Makefile
+++ b/converter/terminal_usb/Makefile
@@ -50,9 +50,6 @@ 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
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Boot Section Size in bytes
 #   Teensy halfKay   512

diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile
index 65b6d949511ca0cd8c894464fa8e6aef02e6b44f..4b88b6510ab6ae7f839ec7a4748f4b30bfbf16e1 100644 (file)
--- a/converter/usb_usb/Makefile
+++ b/converter/usb_usb/Makefile
@@ -82,9 +82,6 @@ ARCH ?= AVR8
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     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
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 
 # Build Options

diff --git a/converter/usb_usb/usb_usb.cpp b/converter/usb_usb/usb_usb.cpp
index 3d08b118004b2e35c4e2ce150596dcc15be16d0a..625a3b827993b3beb6431f264e1dee0c628eb1f8 100644 (file)
--- a/converter/usb_usb/usb_usb.cpp
+++ b/converter/usb_usb/usb_usb.cpp
@@ -226,13 +226,6 @@ void led_set(uint8_t 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.

diff --git a/converter/x68k_usb/Makefile b/converter/x68k_usb/Makefile
index 41e32b18e003e80f73b813033dce8ccb3d1b362b..ae5f3c8e93d3e4aa632ac1b122ff1be0bf5f94bd 100644 (file)
--- a/converter/x68k_usb/Makefile
+++ b/converter/x68k_usb/Makefile
@@ -54,9 +54,6 @@ 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(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512

diff --git a/converter/xt_usb/Makefile b/converter/xt_usb/Makefile
index 081d2a2a46e4b43a1faf619403313f609be3b4de..f9946a9a8e6fb7370655e471511421d7dc419ac5 100644 (file)
--- a/converter/xt_usb/Makefile
+++ b/converter/xt_usb/Makefile
@@ -69,9 +69,6 @@ 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(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512

diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 0b4b7847956cfad1b0cc4b0041722af921a469c3..7afedd7365790b7273c42b5e0af833d2c9982827 100644 (file)
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -41,7 +41,8 @@ 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.
+# Do not enable INTERRUPT_CONTROL_ENDPOINT for converters which requires ISR in particular,
+# it can block other ISRs long like 500-1000us for HID keyboard LED report.
 #TMK_LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
 TMK_LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
 TMK_LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1