FIxing Media Keys and general USB compatibilty

[kiibohd-controller.git] / Output / pjrcUSB / arm / usb_desc.h

diff --git a/Output/pjrcUSB/arm/usb_desc.h b/Output/pjrcUSB/arm/usb_desc.h
index 30aeedd734d3ee10d05674b55ce02b631514d919..16d37daea1a25b6acbf9dd28d04b3d405cf34c9b 100644 (file)
--- a/Output/pjrcUSB/arm/usb_desc.h
+++ b/Output/pjrcUSB/arm/usb_desc.h
@@ -1,7 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
- * Modified by Jacob Alexander (2013-2014)
+ * Modified by Jacob Alexander (2013-2015)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -29,8 +29,7 @@
  * SOFTWARE.
  */
 
-#ifndef _usb_desc_h_
-#define _usb_desc_h_
+#pragma once
 
 // ----- Includes -----
 
@@ -45,29 +44,31 @@
 
 // ----- Defines -----
 
-#define ENDPOINT_UNUSED                        0x00
-#define ENDPOINT_TRANSIMIT_ONLY                0x15
-#define ENDPOINT_RECEIVE_ONLY          0x19
-#define ENDPOINT_TRANSMIT_AND_RECEIVE  0x1D
+#define ENDPOINT_UNUSED                 0x00
+#define ENDPOINT_TRANSIMIT_ONLY         0x15
+#define ENDPOINT_RECEIVE_ONLY           0x19
+#define ENDPOINT_TRANSMIT_AND_RECEIVE   0x1D
 
 
 #define DEVICE_CLASS            0x00 // Keep 0x00 to indicate each sub device will indicate what it is
 #define DEVICE_SUBCLASS         0x00
 #define DEVICE_PROTOCOL         0x00
 #define EP0_SIZE                64
-#define NUM_ENDPOINTS           5
+#define NUM_ENDPOINTS           8
 #define NUM_USB_BUFFERS         30
-#define NUM_INTERFACE           4
+#define NUM_INTERFACE           7
 
 #define KEYBOARD_INTERFACE      0 // Keyboard
 #define KEYBOARD_ENDPOINT       1
 #define KEYBOARD_SIZE           8
 #define KEYBOARD_INTERVAL       1
+#define KEYBOARD_NAME           L"Boot Keyboard"
 
 #define NKRO_KEYBOARD_INTERFACE 1 // NKRO Keyboard
 #define NKRO_KEYBOARD_ENDPOINT  2
 #define NKRO_KEYBOARD_SIZE      64
 #define NKRO_KEYBOARD_INTERVAL  1
+#define NKRO_KEYBOARD_NAME      L"NKRO Keyboard"
 
 #define CDC_IAD_DESCRIPTOR      1
 #define CDC_STATUS_INTERFACE    2
@@ -78,43 +79,53 @@
 #define CDC_ACM_SIZE            16
 #define CDC_RX_SIZE             64
 #define CDC_TX_SIZE             64
+#define CDC_STATUS_NAME         L"Virtual Serial Port - Status"
+#define CDC_DATA_NAME           L"Virtual Serial Port - Data"
 
 #define MOUSE_INTERFACE         4 // Mouse
 #define MOUSE_ENDPOINT          6
 #define MOUSE_SIZE              8
 #define MOUSE_INTERVAL          2
+#define MOUSE_NAME              L"Mouse"
 
 #define JOYSTICK_INTERFACE      5 // Joystick
 #define JOYSTICK_ENDPOINT       7
 #define JOYSTICK_SIZE           16
 #define JOYSTICK_INTERVAL       1
+#define JOYSTICK_NAME           L"Joystick"
+
+#define SYS_CTRL_INTERFACE      6 // Media Keys
+#define SYS_CTRL_ENDPOINT       8
+#define SYS_CTRL_SIZE           8
+#define SYS_CTRL_INTERVAL       1
+#define SYS_CTRL_NAME           L"Media Keys"
 
 #define KEYBOARD_DESC_OFFSET      (9 + 9)
 #define NKRO_KEYBOARD_DESC_OFFSET (9 + 9+9+7 + 9)
 #define SERIAL_CDC_DESC_OFFSET    (9 + 9+9+7 + 9+9+7 + 8)
-#define CONFIG_DESC_SIZE          (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7)
-
-// XXX Unused
 #define MOUSE_DESC_OFFSET         (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7 + 9)
 #define JOYSTICK_DESC_OFFSET      (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7 + 9+9+7 + 9)
+#define SYS_CTRL_DESC_OFFSET      (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7 + 9+9+7 + 9+9+7 + 9)
+#define CONFIG_DESC_SIZE          (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7 + 9+9+7 + 9+9+7 + 9+9+7)
 
-#define ENDPOINT1_CONFIG       ENDPOINT_TRANSIMIT_ONLY
-#define ENDPOINT2_CONFIG       ENDPOINT_TRANSIMIT_ONLY
-#define ENDPOINT3_CONFIG       ENDPOINT_TRANSIMIT_ONLY
-#define ENDPOINT4_CONFIG       ENDPOINT_RECEIVE_ONLY
-#define ENDPOINT5_CONFIG       ENDPOINT_TRANSIMIT_ONLY
-#define ENDPOINT6_CONFIG       ENDPOINT_TRANSIMIT_ONLY
-#define ENDPOINT7_CONFIG       ENDPOINT_TRANSIMIT_ONLY
+#define ENDPOINT1_CONFIG        ENDPOINT_TRANSIMIT_ONLY
+#define ENDPOINT2_CONFIG        ENDPOINT_TRANSIMIT_ONLY
+#define ENDPOINT3_CONFIG        ENDPOINT_TRANSIMIT_ONLY
+#define ENDPOINT4_CONFIG        ENDPOINT_RECEIVE_ONLY
+#define ENDPOINT5_CONFIG        ENDPOINT_TRANSIMIT_ONLY
+#define ENDPOINT6_CONFIG        ENDPOINT_TRANSIMIT_ONLY
+#define ENDPOINT7_CONFIG        ENDPOINT_TRANSIMIT_ONLY
+#define ENDPOINT8_CONFIG        ENDPOINT_TRANSIMIT_ONLY
 
 
 
 // ----- Enumerations -----
 
 typedef struct {
-       uint16_t        wValue;
-       uint16_t        wIndex;
-       const uint8_t   *addr;
-       uint16_t        length;
+       uint16_t        wValue;
+       uint16_t        wIndex;
+       const uint8_t   *addr;
+       uint16_t        length;
 } usb_descriptor_list_t;
 
 
@@ -126,6 +137,3 @@ extern const uint8_t usb_endpoint_config_table[NUM_ENDPOINTS];
 
 extern const usb_descriptor_list_t usb_descriptor_list[];
 
-
-#endif
-