lufa: Rename LUFA_DEBUG to TMK_LUFA_DEBUG

diff --git a/converter/usb_usb/Makefile.debug b/converter/usb_usb/Makefile.debug
index 830995b4a1106befb643cf09c6306b2e4a308ce9..82a361eb59ede7f6cc2b0c6c6c58048d8b25ee0c 100644 (file)
--- a/converter/usb_usb/Makefile.debug
+++ b/converter/usb_usb/Makefile.debug
@@ -5,10 +5,10 @@ TARGET = usb_usb_debug
 
 # LUFA debug print
 # This may prevent USB enumeration and keyboard init
-LUFA_DEBUG = yes
+TMK_LUFA_DEBUG = yes
 # Select one of outputs for debug print
-LUFA_DEBUG_UART = yes
-#LUFA_DEBUG_SUART = yes
+TMK_LUFA_DEBUG_UART = yes
+#TMK_LUFA_DEBUG_SUART = yes
 
 # USB_Host_Shield_2.0 debug print
 # This may prevent USB enumeration and keyboard init

diff --git a/converter/usb_usb/Makefile.unimap b/converter/usb_usb/Makefile.unimap
index 48a041ba9b038981b9a2b694abd1ff27cc18b056..facf3a9e399e24ed20f57a1c067a6209b9c8bb87 100644 (file)
--- a/converter/usb_usb/Makefile.unimap
+++ b/converter/usb_usb/Makefile.unimap
@@ -1,7 +1,7 @@
 TARGET = usb_usb_unimap
 UNIMAP_ENABLE = yes
 KEYMAP_SECTION_ENABLE = yes
-#LUFA_DEBUG = yes
+#TMK_LUFA_DEBUG = yes
 #CONSOLE_ENABLE = no
 NO_DEBUG = yes
 include Makefile

diff --git a/converter/usb_usb/usb_usb.cpp b/converter/usb_usb/usb_usb.cpp
index 9277cece3cdef4b48d10a2dcea438a92e4e2cbc3..3d08b118004b2e35c4e2ce150596dcc15be16d0a 100644 (file)
--- a/converter/usb_usb/usb_usb.cpp
+++ b/converter/usb_usb/usb_usb.cpp
@@ -238,7 +238,7 @@ void hook_usb_startup_wait_loop(void)
 // This situation can happen just after pluging converter into USB port.
 void hook_usb_suspend_loop(void)
 {
-#ifndef LUFA_DEBUG_UART
+#ifndef TMK_LUFA_DEBUG_UART
     // This corrupts debug print when suspend
     suspend_power_down();
 #endif

diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 6e2d559feed9c6f02664c2e9418affe0c25a6379..443b1f05ba6dfa02691373febe9fa3a7ce92cfed 100644 (file)
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -49,20 +49,20 @@ ifeq ($(MCU),atmega32u2)
         TMK_LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT
 endif
 
-ifeq (yes,$(strip $(LUFA_DEBUG)))
-    TMK_LUFA_OPTS += -DLUFA_DEBUG
+ifeq (yes,$(strip $(TMK_LUFA_DEBUG)))
+    TMK_LUFA_OPTS += -DTMK_LUFA_DEBUG
 endif
 
-ifeq (yes,$(strip $(LUFA_DEBUG_SUART)))
+ifeq (yes,$(strip $(TMK_LUFA_DEBUG_SUART)))
     SRC += common/avr/suart.S
-    TMK_LUFA_OPTS += -DLUFA_DEBUG_SUART
+    TMK_LUFA_OPTS += -DTMK_LUFA_DEBUG_SUART
     # Keep print/debug lines when disabling HID console. See common.mk.
     DEBUG_PRINT_AVAILABLE = yes
 endif
 
-ifeq (yes,$(strip $(LUFA_DEBUG_UART)))
+ifeq (yes,$(strip $(TMK_LUFA_DEBUG_UART)))
     SRC += common/avr/uart.c
-    TMK_LUFA_OPTS += -DLUFA_DEBUG_UART
+    TMK_LUFA_OPTS += -DTMK_LUFA_DEBUG_UART
     # Keep print/debug lines when disabling HID console. See common.mk.
     DEBUG_PRINT_AVAILABLE = yes
 endif

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index ac05e75b4bdfa81bba253e06911e883f385dcb36..c194368ffaa1f444f584d346766fa5f6aeef2226 100644 (file)
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -52,11 +52,11 @@
 #include "hook.h"
 #include "timer.h"
 
-#ifdef LUFA_DEBUG_SUART
+#ifdef TMK_LUFA_DEBUG_SUART
 #include "avr/suart.h"
 #endif
 
-#ifdef LUFA_DEBUG_UART
+#ifdef TMK_LUFA_DEBUG_UART
 #include "uart.h"
 #endif
 
@@ -65,7 +65,7 @@
 #include "lufa.h"
 
 
-//#define LUFA_DEBUG
+//#define TMK_LUFA_DEBUG
 
 
 uint8_t keyboard_idle = 0;
@@ -265,7 +265,7 @@ static void console_task(void)
 */
 void EVENT_USB_Device_Connect(void)
 {
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
     print("[C]");
 #endif
     /* For battery powered device */
@@ -278,7 +278,7 @@ void EVENT_USB_Device_Connect(void)
 
 void EVENT_USB_Device_Disconnect(void)
 {
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
     print("[D]");
 #endif
     /* For battery powered device */
@@ -294,14 +294,14 @@ void EVENT_USB_Device_Disconnect(void)
 
 void EVENT_USB_Device_Reset(void)
 {
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
     print("[R]");
 #endif
 }
 
 void EVENT_USB_Device_Suspend()
 {
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
     print("[S]");
 #endif
     hook_usb_suspend_entry();
@@ -309,7 +309,7 @@ void EVENT_USB_Device_Suspend()
 
 void EVENT_USB_Device_WakeUp()
 {
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
     print("[W]");
 #endif
     hook_usb_wakeup();
@@ -328,7 +328,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  */
 void EVENT_USB_Device_ConfigurationChanged(void)
 {
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
     print("[c]");
 #endif
     bool ConfigSuccess = true;
@@ -407,7 +407,7 @@ void EVENT_USB_Device_ControlRequest(void)
                 /* Write the report data to the control endpoint */
                 Endpoint_Write_Control_Stream_LE(ReportData, ReportSize);
                 Endpoint_ClearOUT();
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
                 xprintf("[r%d]", USB_ControlRequest.wIndex);
 #endif
             }
@@ -433,7 +433,7 @@ void EVENT_USB_Device_ControlRequest(void)
 
                     Endpoint_ClearOUT();
                     Endpoint_ClearStatusStage();
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
                     xprintf("[L%d]", USB_ControlRequest.wIndex);
 #endif
                     break;
@@ -452,7 +452,7 @@ void EVENT_USB_Device_ControlRequest(void)
                     Endpoint_Write_8(keyboard_protocol);
                     Endpoint_ClearIN();
                     Endpoint_ClearStatusStage();
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
                     print("[p]");
 #endif
                 }
@@ -468,7 +468,7 @@ void EVENT_USB_Device_ControlRequest(void)
 
                     keyboard_protocol = (USB_ControlRequest.wValue & 0xFF);
                     clear_keyboard();
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
                     print("[P]");
 #endif
                 }
@@ -482,7 +482,7 @@ void EVENT_USB_Device_ControlRequest(void)
                 Endpoint_ClearStatusStage();
 
                 keyboard_idle = ((USB_ControlRequest.wValue & 0xFF00) >> 8);
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
                 xprintf("[I%d]%d", USB_ControlRequest.wIndex, (USB_ControlRequest.wValue & 0xFF00) >> 8);
 #endif
             }
@@ -496,7 +496,7 @@ void EVENT_USB_Device_ControlRequest(void)
                 Endpoint_Write_8(keyboard_idle);
                 Endpoint_ClearIN();
                 Endpoint_ClearStatusStage();
-#ifdef LUFA_DEBUG
+#ifdef TMK_LUFA_DEBUG
                 print("[i]");
 #endif
             }
@@ -628,11 +628,11 @@ static void send_consumer(uint16_t data)
  ******************************************************************************/
 int8_t sendchar(uint8_t c)
 {
-    #ifdef LUFA_DEBUG_SUART
+    #ifdef TMK_LUFA_DEBUG_SUART
     xmit(c);
     #endif
 
-    #ifdef LUFA_DEBUG_UART
+    #ifdef TMK_LUFA_DEBUG_UART
     uart_putchar(c);
     #endif
 
@@ -672,12 +672,12 @@ int main(void)
 {
     setup_mcu();
 
-#ifdef LUFA_DEBUG_SUART
+#ifdef TMK_LUFA_DEBUG_SUART
     SUART_OUT_DDR |= (1<<SUART_OUT_BIT);
     SUART_OUT_PORT |= (1<<SUART_OUT_BIT);
 #endif
 
-#ifdef LUFA_DEBUG_UART
+#ifdef TMK_LUFA_DEBUG_UART
     uart_init(115200);
 #endif
 
@@ -761,7 +761,7 @@ void hook_usb_suspend_entry(void)
 __attribute__((weak))
 void hook_usb_suspend_loop(void)
 {
-#ifndef LUFA_DEBUG_UART
+#ifndef TMK_LUFA_DEBUG_UART
     // This corrupts debug print when suspend
     suspend_power_down();
 #endif