Merge branch 'led'

[max/tmk_keyboard.git] / usb.c

diff --git a/usb.c b/usb.c
index f5905f2ee470a0a07b057d4bb7a4a7d3e5c232c5..3011ecb2a90b909497140fb2f24c242f7c01fd52 100644 (file)
--- a/usb.c
+++ b/usb.c
@@ -29,6 +29,7 @@
 #include "usb_mouse.h"
 #include "usb_debug.h"
 #include "print.h"
+#include "util.h"
 
 
 /**************************************************************************
@@ -38,16 +39,29 @@
  **************************************************************************/
 
 // You can change these to give your code its own name.
-#define STR_MANUFACTURER       L"t.m.k."
-#define STR_PRODUCT            L"t.m.k. keyboard"
+#ifndef MANUFACTURER
+#   define STR_MANUFACTURER    L"t.m.k."
+#else
+#   define STR_MANUFACTURER    LSTR(MANUFACTURER)
+#endif
+#ifndef PRODUCT
+#   define STR_PRODUCT         L"t.m.k. keyboard"
+#else
+#   define STR_PRODUCT         LSTR(PRODUCT)
+#endif
 
 
 // Mac OS-X and Linux automatically load the correct drivers.  On
 // Windows, even though the driver is supplied by Microsoft, an
 // INF file is needed to load the driver.  These numbers need to
 // match the INF file.
-#define VENDOR_ID              0xFEED
-#define PRODUCT_ID             0xCAFE
+#ifndef VENDOR_ID
+#   define VENDOR_ID           0xFEED
+#endif
+
+#ifndef PRODUCT_ID
+#   define PRODUCT_ID          0xBABE
+#endif
 
 
 // USB devices are supposed to implment a halt feature, which is
@@ -464,16 +478,16 @@ ISR(USB_GEN_vect)
                                UEINTX = 0x3A;
                        }
                }
-               if (keyboard_idle_config && (++div4 & 3) == 0) {
+               if (usb_keyboard_idle_config && (++div4 & 3) == 0) {
                        UENUM = KEYBOARD_ENDPOINT;
                        if (UEINTX & (1<<RWAL)) {
-                               keyboard_idle_count++;
-                               if (keyboard_idle_count == keyboard_idle_config) {
-                                       keyboard_idle_count = 0;
-                                       UEDATX = keyboard_modifier_keys;
+                               usb_keyboard_idle_count++;
+                               if (usb_keyboard_idle_count == usb_keyboard_idle_config) {
+                                       usb_keyboard_idle_count = 0;
+                                       UEDATX = usb_keyboard_mods;
                                        UEDATX = 0;
                                        for (i=0; i<6; i++) {
-                                               UEDATX = keyboard_keys[i];
+                                               UEDATX = usb_keyboard_keys[i];
                                        }
                                        UEINTX = 0x3A;
                                }
@@ -644,23 +658,23 @@ ISR(USB_COM_vect)
                        if (bmRequestType == 0xA1) {
                                if (bRequest == HID_GET_REPORT) {
                                        usb_wait_in_ready();
-                                       UEDATX = keyboard_modifier_keys;
+                                       UEDATX = usb_keyboard_mods;
                                        UEDATX = 0;
                                        for (i=0; i<6; i++) {
-                                               UEDATX = keyboard_keys[i];
+                                               UEDATX = usb_keyboard_keys[i];
                                        }
                                        usb_send_in();
                                        return;
                                }
                                if (bRequest == HID_GET_IDLE) {
                                        usb_wait_in_ready();
-                                       UEDATX = keyboard_idle_config;
+                                       UEDATX = usb_keyboard_idle_config;
                                        usb_send_in();
                                        return;
                                }
                                if (bRequest == HID_GET_PROTOCOL) {
                                        usb_wait_in_ready();
-                                       UEDATX = keyboard_protocol;
+                                       UEDATX = usb_keyboard_protocol;
                                        usb_send_in();
                                        return;
                                }
@@ -668,20 +682,20 @@ ISR(USB_COM_vect)
                        if (bmRequestType == 0x21) {
                                if (bRequest == HID_SET_REPORT) {
                                        usb_wait_receive_out();
-                                       keyboard_leds = UEDATX;
+                                       usb_keyboard_leds = UEDATX;
                                        usb_ack_out();
                                        usb_send_in();
                                        return;
                                }
                                if (bRequest == HID_SET_IDLE) {
-                                       keyboard_idle_config = (wValue >> 8);
-                                       keyboard_idle_count = 0;
+                                       usb_keyboard_idle_config = (wValue >> 8);
+                                       usb_keyboard_idle_count = 0;
                                        //usb_wait_in_ready();
                                        usb_send_in();
                                        return;
                                }
                                if (bRequest == HID_SET_PROTOCOL) {
-                                       keyboard_protocol = wValue;
+                                       usb_keyboard_protocol = wValue;
                                        //usb_wait_in_ready();
                                        usb_send_in();
                                        return;