diff options
Diffstat (limited to 'protocol/pjrc/usb.c')
| -rw-r--r-- | protocol/pjrc/usb.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/protocol/pjrc/usb.c b/protocol/pjrc/usb.c index 14df9efdd..0a5436deb 100644 --- a/protocol/pjrc/usb.c +++ b/protocol/pjrc/usb.c | |||
| @@ -103,7 +103,11 @@ static const uint8_t PROGMEM endpoint_config_table[] = { | |||
| 103 | #else | 103 | #else |
| 104 | 0, // 2 | 104 | 0, // 2 |
| 105 | #endif | 105 | #endif |
| 106 | #ifdef CONSOLE_ENABLE | ||
| 106 | 1, EP_TYPE_INTERRUPT_IN, EP_SIZE(DEBUG_TX_SIZE) | DEBUG_TX_BUFFER, // 3 | 107 | 1, EP_TYPE_INTERRUPT_IN, EP_SIZE(DEBUG_TX_SIZE) | DEBUG_TX_BUFFER, // 3 |
| 108 | #else | ||
| 109 | 0, | ||
| 110 | #endif | ||
| 107 | #ifdef EXTRAKEY_ENABLE | 111 | #ifdef EXTRAKEY_ENABLE |
| 108 | 1, EP_TYPE_INTERRUPT_IN, EP_SIZE(EXTRA_SIZE) | EXTRA_BUFFER, // 4 | 112 | 1, EP_TYPE_INTERRUPT_IN, EP_SIZE(EXTRA_SIZE) | EXTRA_BUFFER, // 4 |
| 109 | #else | 113 | #else |
| @@ -332,8 +336,12 @@ static const uint8_t PROGMEM extra_hid_report_desc[] = { | |||
| 332 | # define MOUSE_HID_DESC_NUM (KBD_HID_DESC_NUM + 0) | 336 | # define MOUSE_HID_DESC_NUM (KBD_HID_DESC_NUM + 0) |
| 333 | #endif | 337 | #endif |
| 334 | 338 | ||
| 339 | #ifdef CONSOLE_ENABLE | ||
| 335 | #define DEBUG_HID_DESC_NUM (MOUSE_HID_DESC_NUM + 1) | 340 | #define DEBUG_HID_DESC_NUM (MOUSE_HID_DESC_NUM + 1) |
| 336 | #define DEBUG_HID_DESC_OFFSET (9+(9+9+7)*DEBUG_HID_DESC_NUM+9) | 341 | #define DEBUG_HID_DESC_OFFSET (9+(9+9+7)*DEBUG_HID_DESC_NUM+9) |
| 342 | #else | ||
| 343 | # define DEBUG_HID_DESC_NUM (MOUSE_HID_DESC_NUM + 0) | ||
| 344 | #endif | ||
| 337 | 345 | ||
| 338 | #ifdef EXTRAKEY_ENABLE | 346 | #ifdef EXTRAKEY_ENABLE |
| 339 | # define EXTRA_HID_DESC_NUM (DEBUG_HID_DESC_NUM + 1) | 347 | # define EXTRA_HID_DESC_NUM (DEBUG_HID_DESC_NUM + 1) |
| @@ -424,6 +432,7 @@ static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = { | |||
| 424 | 1, // bInterval | 432 | 1, // bInterval |
| 425 | #endif | 433 | #endif |
| 426 | 434 | ||
| 435 | #ifdef CONSOLE_ENABLE | ||
| 427 | // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 | 436 | // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
| 428 | 9, // bLength | 437 | 9, // bLength |
| 429 | 4, // bDescriptorType | 438 | 4, // bDescriptorType |
| @@ -450,6 +459,7 @@ static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = { | |||
| 450 | 0x03, // bmAttributes (0x03=intr) | 459 | 0x03, // bmAttributes (0x03=intr) |
| 451 | DEBUG_TX_SIZE, 0, // wMaxPacketSize | 460 | DEBUG_TX_SIZE, 0, // wMaxPacketSize |
| 452 | 1, // bInterval | 461 | 1, // bInterval |
| 462 | #endif | ||
| 453 | 463 | ||
| 454 | #ifdef EXTRAKEY_ENABLE | 464 | #ifdef EXTRAKEY_ENABLE |
| 455 | // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 | 465 | // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
| @@ -553,8 +563,10 @@ static const struct descriptor_list_struct { | |||
| 553 | {0x2100, MOUSE_INTERFACE, config1_descriptor+MOUSE_HID_DESC_OFFSET, 9}, | 563 | {0x2100, MOUSE_INTERFACE, config1_descriptor+MOUSE_HID_DESC_OFFSET, 9}, |
| 554 | {0x2200, MOUSE_INTERFACE, mouse_hid_report_desc, sizeof(mouse_hid_report_desc)}, | 564 | {0x2200, MOUSE_INTERFACE, mouse_hid_report_desc, sizeof(mouse_hid_report_desc)}, |
| 555 | #endif | 565 | #endif |
| 566 | #ifdef CONSOLE_ENABLE | ||
| 556 | {0x2100, DEBUG_INTERFACE, config1_descriptor+DEBUG_HID_DESC_OFFSET, 9}, | 567 | {0x2100, DEBUG_INTERFACE, config1_descriptor+DEBUG_HID_DESC_OFFSET, 9}, |
| 557 | {0x2200, DEBUG_INTERFACE, debug_hid_report_desc, sizeof(debug_hid_report_desc)}, | 568 | {0x2200, DEBUG_INTERFACE, debug_hid_report_desc, sizeof(debug_hid_report_desc)}, |
| 569 | #endif | ||
| 558 | #ifdef EXTRAKEY_ENABLE | 570 | #ifdef EXTRAKEY_ENABLE |
| 559 | {0x2100, EXTRA_INTERFACE, config1_descriptor+EXTRA_HID_DESC_OFFSET, 9}, | 571 | {0x2100, EXTRA_INTERFACE, config1_descriptor+EXTRA_HID_DESC_OFFSET, 9}, |
| 560 | {0x2200, EXTRA_INTERFACE, extra_hid_report_desc, sizeof(extra_hid_report_desc)}, | 572 | {0x2200, EXTRA_INTERFACE, extra_hid_report_desc, sizeof(extra_hid_report_desc)}, |
