summaryrefslogtreecommitdiff
path: root/protocol/pjrc
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-04-13 11:55:08 +0900
committertmk <nobody@nowhere>2013-04-13 11:55:08 +0900
commit1348663a4ff1a4696db39e72bcb751608714de8e (patch)
tree9d9990e275299838cd5b4122bb7ead12fe94872c /protocol/pjrc
parent540d0700dc0a8172e32d419a9b99c30e2e82a98a (diff)
Fix USB Descriptors
Diffstat (limited to 'protocol/pjrc')
-rw-r--r--protocol/pjrc/usb.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/protocol/pjrc/usb.c b/protocol/pjrc/usb.c
index 14df9efdda..0a5436deb4 100644
--- a/protocol/pjrc/usb.c
+++ b/protocol/pjrc/usb.c
@@ -103,7 +103,11 @@ static const uint8_t PROGMEM endpoint_config_table[] = {
#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
@@ -332,8 +336,12 @@ static const uint8_t PROGMEM extra_hid_report_desc[] = {
# 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)
@@ -424,6 +432,7 @@ static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = {
1, // bInterval
#endif
+#ifdef CONSOLE_ENABLE
// interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
9, // bLength
4, // bDescriptorType
@@ -450,6 +459,7 @@ static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = {
0x03, // bmAttributes (0x03=intr)
DEBUG_TX_SIZE, 0, // wMaxPacketSize
1, // bInterval
+#endif
#ifdef EXTRAKEY_ENABLE
// interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
@@ -553,8 +563,10 @@ static const struct descriptor_list_struct {
{0x2100, MOUSE_INTERFACE, config1_descriptor+MOUSE_HID_DESC_OFFSET, 9},
{0x2200, MOUSE_INTERFACE, mouse_hid_report_desc, sizeof(mouse_hid_report_desc)},
#endif
+#ifdef CONSOLE_ENABLE
{0x2100, DEBUG_INTERFACE, config1_descriptor+DEBUG_HID_DESC_OFFSET, 9},
{0x2200, DEBUG_INTERFACE, debug_hid_report_desc, sizeof(debug_hid_report_desc)},
+#endif
#ifdef EXTRAKEY_ENABLE
{0x2100, EXTRA_INTERFACE, config1_descriptor+EXTRA_HID_DESC_OFFSET, 9},
{0x2200, EXTRA_INTERFACE, extra_hid_report_desc, sizeof(extra_hid_report_desc)},