Remove PJRC USB stack

20 files changed, 5 insertions, 1935 deletions

diff --git a/doxygen-todo b/doxygen-todo
index 0f3010ffaf..6483b47c61 100644
--- a/doxygen-todo
+++ b/doxygen-todo
@@ -6,7 +6,6 @@ tmk_core/protocol/lufa
 tmk_core/protocol/midi
 tmk_core/protocol/midi/bytequeue
 tmk_core/protocol/midi/Config
-tmk_core/protocol/pjrc
 tmk_core/protocol/usb_hid
 tmk_core/protocol/vusb
 tmk_core/tool
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 0d6661d603..900de54103 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -43,13 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "mousekey.h"
 #endif
 
-#ifdef PROTOCOL_PJRC
-#    include "usb_keyboard.h"
-#    ifdef EXTRAKEY_ENABLE
-#        include "usb_extra.h"
-#    endif
-#endif
-
 #ifdef PROTOCOL_VUSB
 #    include "usbdrv.h"
 #endif
@@ -165,9 +158,6 @@ static void print_version(void) {
     /* build options */
     print("OPTIONS:"
 
-#ifdef PROTOCOL_PJRC
-          " PJRC"
-#endif
 #ifdef PROTOCOL_LUFA
           " LUFA"
 #endif
@@ -217,20 +207,6 @@ static void print_status(void) {
     print_val_hex8(keymap_config.nkro);
 #endif
     print_val_hex32(timer_read32());
-
-#ifdef PROTOCOL_PJRC
-    print_val_hex8(UDCON);
-    print_val_hex8(UDIEN);
-    print_val_hex8(UDINT);
-    print_val_hex8(usb_keyboard_leds);
-    print_val_hex8(usb_keyboard_idle_count);
-#endif
-
-#ifdef PROTOCOL_PJRC
-#    if USB_COUNT_SOF
-    print_val_hex8(usbSofCount);
-#    endif
-#endif
     return;
 }
 
diff --git a/tmk_core/protocol/bluefruit.mk b/tmk_core/protocol/bluefruit.mk
index e1c5fff77f..13a0693c57 100644
--- a/tmk_core/protocol/bluefruit.mk
+++ b/tmk_core/protocol/bluefruit.mk
@@ -1,27 +1,11 @@
 BLUEFRUIT_DIR = protocol/bluefruit
-PJRC_DIR = protocol/pjrc
 
 SRC +=	$(BLUEFRUIT_DIR)/main.c \
 	$(BLUEFRUIT_DIR)/bluefruit.c \
-	serial_uart.c \
-	$(PJRC_DIR)/pjrc.c \
-	$(PJRC_DIR)/usb_keyboard.c \
-	$(PJRC_DIR)/usb_debug.c \
-	$(PJRC_DIR)/usb.c
-
-# Option modules
-ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
-    SRC += $(PJRC_DIR)/usb_mouse.c
-endif
-
-ifdef EXTRAKEY_ENABLE
-    SRC += $(PJRC_DIR)/usb_extra.c
-endif
+	serial_uart.c
 
 # Search Path
 VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)
 #VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)/usb_debug_only
-VPATH += $(TMK_DIR)/$(PJRC_DIR)
 
 OPT_DEFS += -DPROTOCOL_BLUEFRUIT
-OPT_DEFS += -DPROTOCOL_PJRC
diff --git a/tmk_core/protocol/bluefruit/main.c b/tmk_core/protocol/bluefruit/main.c
index 3adcab4f42..aca46206d5 100644
--- a/tmk_core/protocol/bluefruit/main.c
+++ b/tmk_core/protocol/bluefruit/main.c
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <util/delay.h>
 #include "../serial.h"
 #include "keyboard.h"
-#include "usb.h"
 #include "host.h"
 #include "timer.h"
 #include "print.h"
@@ -32,14 +31,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sendchar.h"
 #include "suspend.h"
 #include "bluefruit.h"
-#include "pjrc.h"
 
 #define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
 
-#define HOST_DRIVER_NOT_SET 0
-#define BLUEFRUIT_HOST_DRIVER 1
-#define PJRC_HOST_DRIVER 2
-
 int main(void) {
     CPU_PRESCALE(0);
 
@@ -51,27 +45,11 @@ int main(void) {
 
     print_set_sendchar(sendchar);
 
-    // usb_init();
-    // _delay_ms(2000);
-    // while (!usb_configured()) /* wait */
-
     keyboard_setup();
 
     dprintf("Initializing keyboard...\n");
     keyboard_init();
 
-    // This implementation is pretty simplistic... if the USB connection
-    // is not configured, choose the Bluefruit, otherwise use USB
-    // Definitely would prefer to have this driven by an input pin and make
-    // it switch dynamically - BCG
-    // if (!usb_configured()) {
-
-    //     // Send power to Bluefruit... Adafruit says it takes 27 mA, I think
-    //     // the pins should provide 40 mA, but just in case I switch the
-    //     // Bluefruit using a transistor - BCG
-    //     DDRB   = _BV(PB6);
-    //     PORTB |= _BV(PB6);
-
     dprintf("Setting host driver to bluefruit...\n");
     host_set_driver(bluefruit_driver());
 
@@ -106,29 +84,4 @@ int main(void) {
     while (1) {
         keyboard_task();
     }
-
-    //     } else {
-
-    //         // I'm not smart enough to get this done with LUFA - BCG
-    //         dprintf("Setting host driver to PJRC...\n");
-    //         host_set_driver(pjrc_driver());
-    // #ifdef SLEEP_LED_ENABLE
-    //     sleep_led_init();
-    // #endif
-    //         // wait an extra second for the PC's operating system
-    //         // to load drivers and do whatever it does to actually
-    //         // be ready for input
-    //         _delay_ms(1000);
-    //         PORTB = ~_BV(PB0);
-    //         dprintf("Starting main loop");
-    //         while (1) {
-    //             while (suspend) {
-    //                 suspend_power_down();
-    //                 if (remote_wakeup && suspend_wakeup_condition()) {
-    //                     usb_remote_wakeup();
-    //                 }
-    //             }
-    //             keyboard_task();
-    //         }
-    //     }
 }
diff --git a/tmk_core/protocol/pjrc.mk b/tmk_core/protocol/pjrc.mk
deleted file mode 100644
index 7c0c1fa851..0000000000
--- a/tmk_core/protocol/pjrc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-PJRC_DIR = protocol/pjrc
-
-SRC +=	$(PJRC_DIR)/main.c \
-	$(PJRC_DIR)/pjrc.c \
-	$(PJRC_DIR)/usb_keyboard.c \
-	$(PJRC_DIR)/usb_debug.c \
-	$(PJRC_DIR)/usb.c
-
-# Option modules
-ifdef MOUSEKEY_ENABLE
-    SRC += $(PJRC_DIR)/usb_mouse.c
-endif
-
-ifdef ADB_MOUSE_ENABLE
-    SRC += $(PJRC_DIR)/usb_mouse.c
-endif
-
-ifdef PS2_MOUSE_ENABLE
-    SRC += $(PJRC_DIR)/usb_mouse.c
-endif
-
-ifdef EXTRAKEY_ENABLE
-    SRC += $(PJRC_DIR)/usb_extra.c
-endif
-
-
-ifdef POINTING_DEVICE_ENABLE
-    SRC += $(PJRC_DIR)/usb_mouse.c
-endif
-
-# Search Path
-VPATH += $(TMK_DIR)/$(PJRC_DIR)
-
-# This indicates using LUFA stack
-OPT_DEFS += -DPROTOCOL_PJRC
diff --git a/tmk_core/protocol/pjrc/MEMO.txt b/tmk_core/protocol/pjrc/MEMO.txt
deleted file mode 100644
index b0f0598313..0000000000
--- a/tmk_core/protocol/pjrc/MEMO.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Endpoint configuration
-----------------------
-0   Control endpoint
-1   keyboard
-2   mouse
-3   debug
-4   extra key(consumer/system)
-5   nkro keyboard(supported only on ATmega32U4/16U4 and AT90USB64/128)
-
-
-ATmega32U4/16U4, AT90USB64/128
-• Endpoint 0:programmable size FIFO up to 64 bytes, default control endpoint
-• Endpoints 1 programmable size FIFO up to 256 bytes in ping-pong mode.
-• Endpoints 2 to 6: programmable size FIFO up to 64 bytes in ping-pong mode.
-
-AT90USB82/162, ATmega8U2/16U2/32U2
-• Endpoint 0:programmable size FIFO up to 64 bytes, default control endpoint
-• Endpoints 1 and 2: programmable size FIFO up to 64 bytes.
-• Endpoints 3 and 4: programmable size FIFO up to 64 bytes with ping-pong mode.
-
-ping-pong mode means double buffer feature.
-
-
-NOTE: ATmega8U2/16U2/32U2 is not supported with PJRC stack at this time.
-TODO: Macro definition for ATmega8U2/16U2/32U2 in usb.h
diff --git a/tmk_core/protocol/pjrc/main.c b/tmk_core/protocol/pjrc/main.c
deleted file mode 100644
index d16051c5f8..0000000000
--- a/tmk_core/protocol/pjrc/main.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Keyboard example with debug channel, for Teensy USB Development Board
- * http://www.pjrc.com/teensy/usb_keyboard.html
- * Copyright (c) 2008 PJRC.COM, LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <avr/wdt.h>
-#include <util/delay.h>
-#include "keyboard.h"
-#include "usb.h"
-#include "matrix.h"
-#include "print.h"
-#include "debug.h"
-#include "sendchar.h"
-#include "util.h"
-#include "suspend.h"
-#include "host.h"
-#include "pjrc.h"
-
-#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
-
-int main(void) {
-    // set for 16 MHz clock
-    CPU_PRESCALE(0);
-
-    keyboard_setup();
-
-    // Initialize the USB, and then wait for the host to set configuration.
-    // If the Teensy is powered without a PC connected to the USB port,
-    // this will wait forever.
-    usb_init();
-    while (!usb_configured()) /* wait */
-        ;
-
-    print_set_sendchar(sendchar);
-
-    keyboard_init();
-    host_set_driver(pjrc_driver());
-#ifdef SLEEP_LED_ENABLE
-    sleep_led_init();
-#endif
-    while (1) {
-        while (suspend) {
-            suspend_power_down();
-            if (remote_wakeup && suspend_wakeup_condition()) {
-                usb_remote_wakeup();
-            }
-        }
-
-        keyboard_task();
-    }
-}
diff --git a/tmk_core/protocol/pjrc/pjrc.c b/tmk_core/protocol/pjrc/pjrc.c
deleted file mode 100644
index 60932f59e8..0000000000
--- a/tmk_core/protocol/pjrc/pjrc.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdint.h>
-#include "usb_keyboard.h"
-#include "usb_mouse.h"
-#include "usb_extra.h"
-#include "host_driver.h"
-#include "pjrc.h"
-
-/*------------------------------------------------------------------*
- * Host driver
- *------------------------------------------------------------------*/
-static uint8_t keyboard_leds(void);
-static void    send_keyboard(report_keyboard_t *report);
-static void    send_mouse(report_mouse_t *report);
-static void    send_system(uint16_t data);
-static void    send_consumer(uint16_t data);
-
-static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
-
-host_driver_t *pjrc_driver(void) { return &driver; }
-
-static uint8_t keyboard_leds(void) { return usb_keyboard_leds; }
-
-static void send_keyboard(report_keyboard_t *report) { usb_keyboard_send_report(report); }
-
-static void send_mouse(report_mouse_t *report) {
-#ifdef MOUSE_ENABLE
-    usb_mouse_send(report->x, report->y, report->v, report->h, report->buttons);
-#endif
-}
-
-static void send_system(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    usb_extra_system_send(data);
-#endif
-}
-
-static void send_consumer(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    usb_extra_consumer_send(data);
-#endif
-}
diff --git a/tmk_core/protocol/pjrc/pjrc.h b/tmk_core/protocol/pjrc/pjrc.h
deleted file mode 100644
index 08a1ede186..0000000000
--- a/tmk_core/protocol/pjrc/pjrc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PJRC_H
-#define PJRC_H
-
-#include "host_driver.h"
-
-host_driver_t *pjrc_driver(void);
-
-#endif
diff --git a/tmk_core/protocol/pjrc/usb.c b/tmk_core/protocol/pjrc/usb.c
deleted file mode 100644
index 22fbcfdcd4..0000000000
--- a/tmk_core/protocol/pjrc/usb.c
+++ /dev/null
@@ -1,970 +0,0 @@
-/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
- * http://www.pjrc.com/teensy/usb_keyboard.html
- * Copyright (c) 2009 PJRC.COM, LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/pgmspace.h>
-#include <avr/interrupt.h>
-#include "usb.h"
-#include "usb_keyboard.h"
-#include "usb_mouse.h"
-#include "usb_debug.h"
-#include "usb_extra.h"
-#include "led.h"
-#include "print.h"
-#include "util.h"
-#ifdef SLEEP_LED_ENABLE
-#    include "sleep_led.h"
-#endif
-#include "suspend.h"
-#include "action.h"
-#include "action_util.h"
-
-#ifdef NKRO_ENABLE
-#    include "keycode_config.h"
-
-extern keymap_config_t keymap_config;
-#endif
-
-/**************************************************************************
- *
- *  Configurable Options
- *
- **************************************************************************/
-
-// You can change these to give your code its own name.
-#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.
-#ifndef VENDOR_ID
-#    define VENDOR_ID 0xFEED
-#endif
-
-#ifndef PRODUCT_ID
-#    define PRODUCT_ID 0xBABE
-#endif
-
-#ifndef DEVICE_VER
-#    define DEVICE_VER 0x0100
-#endif
-
-// USB devices are supposed to implment a halt feature, which is
-// rarely (if ever) used.  If you comment this line out, the halt
-// code will be removed, saving 102 bytes of space (gcc 4.3.0).
-// This is not strictly USB compliant, but works with all major
-// operating systems.
-#define SUPPORT_ENDPOINT_HALT
-
-/**************************************************************************
- *
- *  Endpoint Buffer Configuration
- *
- **************************************************************************/
-
-#define ENDPOINT0_SIZE 32
-
-bool remote_wakeup = false;
-bool suspend       = false;
-
-// 0:control endpoint is enabled automatically by controller.
-static const uint8_t PROGMEM endpoint_config_table[] = {
-    // enable, UECFG0X(type, direction), UECFG1X(size, bank, allocation)
-    1, EP_TYPE_INTERRUPT_IN, EP_SIZE(KBD_SIZE) | KBD_BUFFER,  // 1
-#ifdef MOUSE_ENABLE
-    1, EP_TYPE_INTERRUPT_IN, EP_SIZE(MOUSE_SIZE) | MOUSE_BUFFER,  // 2
-#else
-    0,  // 2
-#endif
-#ifdef CONSOLE_ENABLE
-    1, EP_TYPE_INTERRUPT_IN, EP_SIZE(DEBUG_TX_SIZE) | DEBUG_TX_BUFFER,  // 3
-#else
-    0,
-#endif
-#ifdef EXTRAKEY_ENABLE
-    1, EP_TYPE_INTERRUPT_IN, EP_SIZE(EXTRA_SIZE) | EXTRA_BUFFER,  // 4
-#else
-    0,  // 4
-#endif
-#ifdef NKRO_ENABLE
-    1, EP_TYPE_INTERRUPT_IN, EP_SIZE(KBD2_SIZE) | KBD2_BUFFER,  // 5
-#else
-    0,  // 5
-#endif
-    0,  // 6
-};
-
-/**************************************************************************
- *
- *  Descriptor Data
- *
- **************************************************************************/
-
-// Descriptors are the data that your computer reads when it auto-detects
-// this USB device (called "enumeration" in USB lingo).  The most commonly
-// changed items are editable at the top of this file.  Changing things
-// in here should only be done by those who've read chapter 9 of the USB
-// spec and relevant portions of any USB class specifications!
-
-static const uint8_t PROGMEM device_descriptor[] = {
-    18,  // bLength
-    1,   // bDescriptorType
-    0x00,
-    0x02,            // bcdUSB
-    0,               // bDeviceClass
-    0,               // bDeviceSubClass
-    0,               // bDeviceProtocol
-    ENDPOINT0_SIZE,  // bMaxPacketSize0
-    LSB(VENDOR_ID),
-    MSB(VENDOR_ID),  // idVendor
-    LSB(PRODUCT_ID),
-    MSB(PRODUCT_ID),  // idProduct
-    LSB(DEVICE_VER),
-    MSB(DEVICE_VER),  // bcdDevice
-    1,                // iManufacturer
-    2,                // iProduct
-    0,                // iSerialNumber
-    1                 // bNumConfigurations
-};
-
-// Keyboard Protocol 1, HID 1.11 spec, Appendix B, page 59-60
-static const uint8_t PROGMEM keyboard_hid_report_desc[] = {
-    0x05, 0x01,             // Usage Page (Generic Desktop),
-    0x09, 0x06,             // Usage (Keyboard),
-    0xA1, 0x01,             // Collection (Application),
-    0x75, 0x01,             //   Report Size (1),
-    0x95, 0x08,             //   Report Count (8),
-    0x05, 0x07,             //   Usage Page (Key Codes),
-    0x19, 0xE0,             //   Usage Minimum (224),
-    0x29, 0xE7,             //   Usage Maximum (231),
-    0x15, 0x00,             //   Logical Minimum (0),
-    0x25, 0x01,             //   Logical Maximum (1),
-    0x81, 0x02,             //   Input (Data, Variable, Absolute), ;Modifier byte
-    0x95, 0x01,             //   Report Count (1),
-    0x75, 0x08,             //   Report Size (8),
-    0x81, 0x03,             //   Input (Constant),                 ;Reserved byte
-    0x95, 0x05,             //   Report Count (5),
-    0x75, 0x01,             //   Report Size (1),
-    0x05, 0x08,             //   Usage Page (LEDs),
-    0x19, 0x01,             //   Usage Minimum (1),
-    0x29, 0x05,             //   Usage Maximum (5),
-    0x91, 0x02,             //   Output (Data, Variable, Absolute), ;LED report
-    0x95, 0x01,             //   Report Count (1),
-    0x75, 0x03,             //   Report Size (3),
-    0x91, 0x03,             //   Output (Constant),                 ;LED report padding
-    0x95, KBD_REPORT_KEYS,  //   Report Count (),
-    0x75, 0x08,             //   Report Size (8),
-    0x15, 0x00,             //   Logical Minimum (0),
-    0x25, 0xFF,             //   Logical Maximum(255),
-    0x05, 0x07,             //   Usage Page (Key Codes),
-    0x19, 0x00,             //   Usage Minimum (0),
-    0x29, 0xFF,             //   Usage Maximum (255),
-    0x81, 0x00,             //   Input (Data, Array),
-    0xc0                    // End Collection
-};
-#ifdef NKRO_ENABLE
-static const uint8_t PROGMEM keyboard2_hid_report_desc[] = {
-    0x05, 0x01,  // Usage Page (Generic Desktop),
-    0x09, 0x06,  // Usage (Keyboard),
-    0xA1, 0x01,  // Collection (Application),
-    // bitmap of modifiers
-    0x75, 0x01,  //   Report Size (1),
-    0x95, 0x08,  //   Report Count (8),
-    0x05, 0x07,  //   Usage Page (Key Codes),
-    0x19, 0xE0,  //   Usage Minimum (224),
-    0x29, 0xE7,  //   Usage Maximum (231),
-    0x15, 0x00,  //   Logical Minimum (0),
-    0x25, 0x01,  //   Logical Maximum (1),
-    0x81, 0x02,  //   Input (Data, Variable, Absolute), ;Modifier byte
-    // LED output report
-    0x95, 0x05,  //   Report Count (5),
-    0x75, 0x01,  //   Report Size (1),
-    0x05, 0x08,  //   Usage Page (LEDs),
-    0x19, 0x01,  //   Usage Minimum (1),
-    0x29, 0x05,  //   Usage Maximum (5),
-    0x91, 0x02,  //   Output (Data, Variable, Absolute),
-    0x95, 0x01,  //   Report Count (1),
-    0x75, 0x03,  //   Report Size (3),
-    0x91, 0x03,  //   Output (Constant),
-    // bitmap of keys
-    0x95, KBD2_REPORT_KEYS * 8,      //   Report Count (),
-    0x75, 0x01,                      //   Report Size (1),
-    0x15, 0x00,                      //   Logical Minimum (0),
-    0x25, 0x01,                      //   Logical Maximum(1),
-    0x05, 0x07,                      //   Usage Page (Key Codes),
-    0x19, 0x00,                      //   Usage Minimum (0),
-    0x29, KBD2_REPORT_KEYS * 8 - 1,  //   Usage Maximum (),
-    0x81, 0x02,                      //   Input (Data, Variable, Absolute),
-    0xc0                             // End Collection
-};
-#endif
-
-#ifdef MOUSE_ENABLE
-// Mouse Protocol 1, HID 1.11 spec, Appendix B, page 59-60, with wheel extension
-// http://www.microchip.com/forums/tm.aspx?high=&m=391435&mpage=1#391521
-// http://www.keil.com/forum/15671/
-// http://www.microsoft.com/whdc/device/input/wheel.mspx
-static const uint8_t PROGMEM mouse_hid_report_desc[] = {
-    /* mouse */
-    0x05, 0x01,  // USAGE_PAGE (Generic Desktop)
-    0x09, 0x02,  // USAGE (Mouse)
-    0xa1, 0x01,  // COLLECTION (Application)
-    // 0x85, REPORT_ID_MOUSE,         //   REPORT_ID (1)
-    0x09, 0x01,        //   USAGE (Pointer)
-    0xa1, 0x00,        //   COLLECTION (Physical)
-                       // ----------------------------  Buttons
-    0x05, 0x09,        //     USAGE_PAGE (Button)
-    0x19, 0x01,        //     USAGE_MINIMUM (Button 1)
-    0x29, 0x05,        //     USAGE_MAXIMUM (Button 5)
-    0x15, 0x00,        //     LOGICAL_MINIMUM (0)
-    0x25, 0x01,        //     LOGICAL_MAXIMUM (1)
-    0x75, 0x01,        //     REPORT_SIZE (1)
-    0x95, 0x05,        //     REPORT_COUNT (5)
-    0x81, 0x02,        //     INPUT (Data,Var,Abs)
-    0x75, 0x03,        //     REPORT_SIZE (3)
-    0x95, 0x01,        //     REPORT_COUNT (1)
-    0x81, 0x03,        //     INPUT (Cnst,Var,Abs)
-                       // ----------------------------  X,Y position
-    0x05, 0x01,        //     USAGE_PAGE (Generic Desktop)
-    0x09, 0x30,        //     USAGE (X)
-    0x09, 0x31,        //     USAGE (Y)
-    0x15, 0x81,        //     LOGICAL_MINIMUM (-127)
-    0x25, 0x7f,        //     LOGICAL_MAXIMUM (127)
-    0x75, 0x08,        //     REPORT_SIZE (8)
-    0x95, 0x02,        //     REPORT_COUNT (2)
-    0x81, 0x06,        //     INPUT (Data,Var,Rel)
-                       // ----------------------------  Vertical wheel
-    0x09, 0x38,        //     USAGE (Wheel)
-    0x15, 0x81,        //     LOGICAL_MINIMUM (-127)
-    0x25, 0x7f,        //     LOGICAL_MAXIMUM (127)
-    0x35, 0x00,        //     PHYSICAL_MINIMUM (0)        - reset physical
-    0x45, 0x00,        //     PHYSICAL_MAXIMUM (0)
-    0x75, 0x08,        //     REPORT_SIZE (8)
-    0x95, 0x01,        //     REPORT_COUNT (1)
-    0x81, 0x06,        //     INPUT (Data,Var,Rel)
-                       // ----------------------------  Horizontal wheel
-    0x05, 0x0c,        //     USAGE_PAGE (Consumer Devices)
-    0x0a, 0x38, 0x02,  //     USAGE (AC Pan)
-    0x15, 0x81,        //     LOGICAL_MINIMUM (-127)
-    0x25, 0x7f,        //     LOGICAL_MAXIMUM (127)
-    0x75, 0x08,        //     REPORT_SIZE (8)
-    0x95, 0x01,        //     REPORT_COUNT (1)
-    0x81, 0x06,        //     INPUT (Data,Var,Rel)
-    0xc0,              //   END_COLLECTION
-    0xc0,              // END_COLLECTION
-};
-#endif
-
-static const uint8_t PROGMEM debug_hid_report_desc[] = {
-    0x06, 0x31,          0xFF,  // Usage Page 0xFF31 (vendor defined)
-    0x09, 0x74,                 // Usage 0x74
-    0xA1, 0x53,                 // Collection 0x53
-    0x75, 0x08,                 // report size = 8 bits
-    0x15, 0x00,                 // logical minimum = 0
-    0x26, 0xFF,          0x00,  // logical maximum = 255
-    0x95, DEBUG_TX_SIZE,        // report count
-    0x09, 0x75,                 // usage
-    0x81, 0x02,                 // Input (array)
-    0xC0                        // end collection
-};
-
-#ifdef EXTRAKEY_ENABLE
-// audio controls & system controls
-// http://www.microsoft.com/whdc/archive/w2kbd.mspx
-static const uint8_t PROGMEM extra_hid_report_desc[] = {
-    /* system control */
-    0x05, 0x01,              // USAGE_PAGE (Generic Desktop)
-    0x09, 0x80,              // USAGE (System Control)
-    0xa1, 0x01,              // COLLECTION (Application)
-    0x85, REPORT_ID_SYSTEM,  //   REPORT_ID (2)
-    0x15, 0x01,              //   LOGICAL_MINIMUM (0x1)
-    0x25, 0xb7,              //   LOGICAL_MAXIMUM (0xb7)
-    0x19, 0x01,              //   USAGE_MINIMUM (0x1)
-    0x29, 0xb7,              //   USAGE_MAXIMUM (0xb7)
-    0x75, 0x10,              //   REPORT_SIZE (16)
-    0x95, 0x01,              //   REPORT_COUNT (1)
-    0x81, 0x00,              //   INPUT (Data,Array,Abs)
-    0xc0,                    // END_COLLECTION
-    /* consumer */
-    0x05, 0x0c,                // USAGE_PAGE (Consumer Devices)
-    0x09, 0x01,                // USAGE (Consumer Control)
-    0xa1, 0x01,                // COLLECTION (Application)
-    0x85, REPORT_ID_CONSUMER,  //   REPORT_ID (3)
-    0x15, 0x01,                //   LOGICAL_MINIMUM (0x1)
-    0x26, 0x9c, 0x02,          //   LOGICAL_MAXIMUM (0x29c)
-    0x19, 0x01,                //   USAGE_MINIMUM (0x1)
-    0x2a, 0x9c, 0x02,          //   USAGE_MAXIMUM (0x29c)
-    0x75, 0x10,                //   REPORT_SIZE (16)
-    0x95, 0x01,                //   REPORT_COUNT (1)
-    0x81, 0x00,                //   INPUT (Data,Array,Abs)
-    0xc0,                      // END_COLLECTION
-};
-#endif
-
-#define KBD_HID_DESC_NUM 0
-#define KBD_HID_DESC_OFFSET (9 + (9 + 9 + 7) * KBD_HID_DESC_NUM + 9)
-
-#ifdef MOUSE_ENABLE
-#    define MOUSE_HID_DESC_NUM (KBD_HID_DESC_NUM + 1)
-#    define MOUSE_HID_DESC_OFFSET (9 + (9 + 9 + 7) * MOUSE_HID_DESC_NUM + 9)
-#else
-#    define MOUSE_HID_DESC_NUM (KBD_HID_DESC_NUM + 0)
-#endif
-
-#ifdef CONSOLE_ENABLE
-#    define DEBUG_HID_DESC_NUM (MOUSE_HID_DESC_NUM + 1)
-#    define DEBUG_HID_DESC_OFFSET (9 + (9 + 9 + 7) * DEBUG_HID_DESC_NUM + 9)
-#else
-#    define DEBUG_HID_DESC_NUM (MOUSE_HID_DESC_NUM + 0)
-#endif
-
-#ifdef EXTRAKEY_ENABLE
-#    define EXTRA_HID_DESC_NUM (DEBUG_HID_DESC_NUM + 1)
-#    define EXTRA_HID_DESC_OFFSET (9 + (9 + 9 + 7) * EXTRA_HID_DESC_NUM + 9)
-#else
-#    define EXTRA_HID_DESC_NUM (DEBUG_HID_DESC_NUM + 0)
-#endif
-
-#ifdef NKRO_ENABLE
-#    define KBD2_HID_DESC_NUM (EXTRA_HID_DESC_NUM + 1)
-#    define KBD2_HID_DESC_OFFSET (9 + (9 + 9 + 7) * EXTRA_HID_DESC_NUM + 9)
-#else
-#    define KBD2_HID_DESC_NUM (EXTRA_HID_DESC_NUM + 0)
-#endif
-
-#define NUM_INTERFACES (KBD2_HID_DESC_NUM + 1)
-#define CONFIG1_DESC_SIZE (9 + (9 + 9 + 7) * NUM_INTERFACES)
-static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = {
-    // configuration descriptor, USB spec 9.6.3, page 264-266, Table 9-10
-    9,                       // bLength;
-    2,                       // bDescriptorType;
-    LSB(CONFIG1_DESC_SIZE),  // wTotalLength
-    MSB(CONFIG1_DESC_SIZE),
-    NUM_INTERFACES,  // bNumInterfaces
-    1,               // bConfigurationValue
-    0,               // iConfiguration
-    0xA0,            // bmAttributes
-    50,              // bMaxPower
-
-    // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-    9,              // bLength
-    4,              // bDescriptorType
-    KBD_INTERFACE,  // bInterfaceNumber
-    0,              // bAlternateSetting
-    1,              // bNumEndpoints
-    0x03,           // bInterfaceClass (0x03 = HID)
-    0x01,           // bInterfaceSubClass (0x01 = Boot)
-    0x01,           // bInterfaceProtocol (0x01 = Keyboard)
-    0,              // iInterface
-    // HID descriptor, HID 1.11 spec, section 6.2.1
-    9,                                 // bLength
-    0x21,                              // bDescriptorType
-    0x11, 0x01,                        // bcdHID
-    0,                                 // bCountryCode
-    1,                                 // bNumDescriptors
-    0x22,                              // bDescriptorType
-    sizeof(keyboard_hid_report_desc),  // wDescriptorLength
-    0,
-    // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-    7,                    // bLength
-    5,                    // bDescriptorType
-    KBD_ENDPOINT | 0x80,  // bEndpointAddress
-    0x03,                 // bmAttributes (0x03=intr)
-    KBD_SIZE, 0,          // wMaxPacketSize
-    10,                   // bInterval
-
-#ifdef MOUSE_ENABLE
-    // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-    9,                // bLength
-    4,                // bDescriptorType
-    MOUSE_INTERFACE,  // bInterfaceNumber
-    0,                // bAlternateSetting
-    1,                // bNumEndpoints
-    0x03,             // bInterfaceClass (0x03 = HID)
-                      // ThinkPad T23 BIOS doesn't work with boot mouse.
-    0x00,             // bInterfaceSubClass (0x01 = Boot)
-    0x00,             // bInterfaceProtocol (0x02 = Mouse)
-                      /*
-                          0x01,					// bInterfaceSubClass (0x01 = Boot)
-                          0x02,					// bInterfaceProtocol (0x02 = Mouse)
-                      */
-    0,                // iInterface
-    // HID descriptor, HID 1.11 spec, section 6.2.1
-    9,                              // bLength
-    0x21,                           // bDescriptorType
-    0x11, 0x01,                     // bcdHID
-    0,                              // bCountryCode
-    1,                              // bNumDescriptors
-    0x22,                           // bDescriptorType
-    sizeof(mouse_hid_report_desc),  // wDescriptorLength
-    0,
-    // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
-    7,                      // bLength
-    5,                      // bDescriptorType
-    MOUSE_ENDPOINT | 0x80,  // bEndpointAddress
-    0x03,                   // bmAttributes (0x03=intr)
-    MOUSE_SIZE, 0,          // wMaxPacketSize
-    1,                      // bInterval
-#endif
-
-#ifdef CONSOLE_ENABLE
-    // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
-    9,                // bLength
-    4,                // bDescriptorType
-    DEBUG_INTERFACE,  // bInterfaceNumber
-    0,                // bAlternateSetting
-    1,                // bNumEndpoints
-    0x03,             // bInterfaceClass (0x03 = HID)
-    0x00,