max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'interrupt_control_endpoint_fix'

Browse source
This commit is contained in:
tmk 2020-05-08 22:47:29 +09:00
commit 93e9ee22ce
18 changed files with 4 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
converter/adb_usb/Makefile
View file

@ -53,9 +53,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes* # Boot Section Size in *bytes*
# Teensy halfKay 512 # Teensy halfKay 512

3
converter/ibm4704_usb/Makefile
View file

@ -70,7 +70,8 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(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 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT

3
converter/ibmpc_usb/Makefile
View file

@ -50,9 +50,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(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 # This improves response of keyboard when wakeup
OPT_DEFS += -DSUSPEND_MODE_STANDBY OPT_DEFS += -DSUSPEND_MODE_STANDBY

3
converter/m0110_usb/Makefile
View file

@ -65,9 +65,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in bytes # Boot Section Size in bytes
# Teensy halfKay 512 # Teensy halfKay 512

3
converter/news_usb/Makefile
View file

@ -58,9 +58,6 @@ ARCH = AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU) F_USB = $(F_CPU)
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes* # Boot Section Size in *bytes*
# Teensy halfKay 512 # Teensy halfKay 512

3
converter/next_usb/Makefile
View file

@ -68,9 +68,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task(+60)
#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes* # Boot Section Size in *bytes*
# Teensy halfKay 512 # Teensy halfKay 512

1
converter/pana_m8/Makefile
View file

@ -10,7 +10,6 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# LUFA specific # LUFA specific
ARCH ?= AVR8 ARCH ?= AVR8
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options # Build Options

3
converter/pc88_usb/Makefile
View file

@ -49,9 +49,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options # Build Options
# *Comment out* to disable the options. # *Comment out* to disable the options.

3
converter/pc88_usb/Makefile.unimap
View file

@ -49,9 +49,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options # Build Options
# *Comment out* to disable the options. # *Comment out* to disable the options.

3
converter/pc98_usb/Makefile
View file

@ -49,9 +49,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task
#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options # Build Options
# *Comment out* to disable the options. # *Comment out* to disable the options.

3
converter/ps2_usb/Makefile
View file

@ -68,9 +68,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(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 # This improves response of keyboard when wakeup
OPT_DEFS += -DSUSPEND_MODE_STANDBY OPT_DEFS += -DSUSPEND_MODE_STANDBY

3
converter/sun_usb/Makefile
View file

@ -52,9 +52,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options # Build Options
# *Comment out* to disable the options. # *Comment out* to disable the options.

3
converter/terminal_usb/Makefile
View file

@ -50,9 +50,6 @@ ARCH = AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU) F_USB = $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in bytes # Boot Section Size in bytes
# Teensy halfKay 512 # Teensy halfKay 512

3
converter/usb_usb/Makefile
View file

@ -82,9 +82,6 @@ ARCH ?= AVR8
# If no clock division is performed on the input clock inside the AVR (via the # 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. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options # Build Options

7
converter/usb_usb/usb_usb.cpp
View file

@ -226,13 +226,6 @@ void led_set(uint8_t usb_led)
if (kbd4.isReady()) kbd4.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 // 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. // 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. // This situation can happen just after pluging converter into USB port.

3
converter/x68k_usb/Makefile
View file

@ -54,9 +54,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes* # Boot Section Size in *bytes*
# Teensy halfKay 512 # Teensy halfKay 512

3
converter/xt_usb/Makefile
View file

@ -69,9 +69,6 @@ ARCH ?= AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU) F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes* # Boot Section Size in *bytes*
# Teensy halfKay 512 # Teensy halfKay 512

3
tmk_core/protocol/lufa.mk
View file

@ -41,7 +41,8 @@ VPATH += $(TMK_DIR)/$(TMK_LUFA_PATH)
TMK_LUFA_OPTS = -DUSB_DEVICE_ONLY TMK_LUFA_OPTS = -DUSB_DEVICE_ONLY
TMK_LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS TMK_LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
TMK_LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" 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 += -DINTERRUPT_CONTROL_ENDPOINT
TMK_LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 TMK_LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
TMK_LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1 TMK_LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1