Mercurial > louis > kiibohd-controller

comparison Output/pjrcUSB/arm/usb_desc.h @ 368:06a54d582bf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIxing Media Keys and general USB compatibilty - Media keys tested working on Linux/Windows/Mac (use Consumer control) - Fixed enumeration delays - Fixed virtual serial port configuration issues - Fixed GET_REPORT and SET_REPORT - Added intial descriptors and endpoints for Mouse and Joystick devices - Split out the consumer and system control endpoint - Added more fault debugging messages - Added interface names to endpoints (visible in Windows Device Manager) - Added KLL define for keyboard locale
author Jacob Alexander <haata@kiibohd.com>
date Wed, 19 Aug 2015 00:01:15 -0700
parents 66eccdd9ced5
children 47f89f1bfdb7
comparison
equal deleted inserted replaced
367:8a6c2d410ad9 368:06a54d582bf8
52 52
53 #define DEVICE_CLASS 0x00 // Keep 0x00 to indicate each sub device will indicate what it is 53 #define DEVICE_CLASS 0x00 // Keep 0x00 to indicate each sub device will indicate what it is
54 #define DEVICE_SUBCLASS 0x00 54 #define DEVICE_SUBCLASS 0x00
55 #define DEVICE_PROTOCOL 0x00 55 #define DEVICE_PROTOCOL 0x00
56 #define EP0_SIZE 64 56 #define EP0_SIZE 64
57 #define NUM_ENDPOINTS 5 57 #define NUM_ENDPOINTS 8
58 #define NUM_USB_BUFFERS 30 58 #define NUM_USB_BUFFERS 30
59 #define NUM_INTERFACE 4 59 #define NUM_INTERFACE 7
60 60
61 #define KEYBOARD_INTERFACE 0 // Keyboard 61 #define KEYBOARD_INTERFACE 0 // Keyboard
62 #define KEYBOARD_ENDPOINT 1 62 #define KEYBOARD_ENDPOINT 1
63 #define KEYBOARD_SIZE 8 63 #define KEYBOARD_SIZE 8
64 #define KEYBOARD_INTERVAL 1 64 #define KEYBOARD_INTERVAL 1
65 #define KEYBOARD_NAME L"Boot Keyboard"
65 66
66 #define NKRO_KEYBOARD_INTERFACE 1 // NKRO Keyboard 67 #define NKRO_KEYBOARD_INTERFACE 1 // NKRO Keyboard
67 #define NKRO_KEYBOARD_ENDPOINT 2 68 #define NKRO_KEYBOARD_ENDPOINT 2
68 #define NKRO_KEYBOARD_SIZE 64 69 #define NKRO_KEYBOARD_SIZE 64
69 #define NKRO_KEYBOARD_INTERVAL 1 70 #define NKRO_KEYBOARD_INTERVAL 1
71 #define NKRO_KEYBOARD_NAME L"NKRO Keyboard"
70 72
71 #define CDC_IAD_DESCRIPTOR 1 73 #define CDC_IAD_DESCRIPTOR 1
72 #define CDC_STATUS_INTERFACE 2 74 #define CDC_STATUS_INTERFACE 2
73 #define CDC_DATA_INTERFACE 3 // Serial 75 #define CDC_DATA_INTERFACE 3 // Serial
74 #define CDC_ACM_ENDPOINT 3 76 #define CDC_ACM_ENDPOINT 3
75 #define CDC_RX_ENDPOINT 4 77 #define CDC_RX_ENDPOINT 4
76 #define CDC_TX_ENDPOINT 5 78 #define CDC_TX_ENDPOINT 5
77 #define CDC_ACM_SIZE 16 79 #define CDC_ACM_SIZE 16
78 #define CDC_RX_SIZE 64 80 #define CDC_RX_SIZE 64
79 #define CDC_TX_SIZE 64 81 #define CDC_TX_SIZE 64
82 #define CDC_STATUS_NAME L"Virtual Serial Port - Status"
83 #define CDC_DATA_NAME L"Virtual Serial Port - Data"
80 84
81 #define MOUSE_INTERFACE 4 // Mouse 85 #define MOUSE_INTERFACE 4 // Mouse
82 #define MOUSE_ENDPOINT 6 86 #define MOUSE_ENDPOINT 6
83 #define MOUSE_SIZE 8 87 #define MOUSE_SIZE 8
84 #define MOUSE_INTERVAL 2 88 #define MOUSE_INTERVAL 2
89 #define MOUSE_NAME L"Mouse"
85 90
86 #define JOYSTICK_INTERFACE 5 // Joystick 91 #define JOYSTICK_INTERFACE 5 // Joystick
87 #define JOYSTICK_ENDPOINT 7 92 #define JOYSTICK_ENDPOINT 7
88 #define JOYSTICK_SIZE 16 93 #define JOYSTICK_SIZE 16
89 #define JOYSTICK_INTERVAL 1 94 #define JOYSTICK_INTERVAL 1
95 #define JOYSTICK_NAME L"Joystick"
96
97 #define SYS_CTRL_INTERFACE 6 // Media Keys
98 #define SYS_CTRL_ENDPOINT 8
99 #define SYS_CTRL_SIZE 8
100 #define SYS_CTRL_INTERVAL 1
101 #define SYS_CTRL_NAME L"Media Keys"
90 102
91 #define KEYBOARD_DESC_OFFSET (9 + 9) 103 #define KEYBOARD_DESC_OFFSET (9 + 9)
92 #define NKRO_KEYBOARD_DESC_OFFSET (9 + 9+9+7 + 9) 104 #define NKRO_KEYBOARD_DESC_OFFSET (9 + 9+9+7 + 9)
93 #define SERIAL_CDC_DESC_OFFSET (9 + 9+9+7 + 9+9+7 + 8) 105 #define SERIAL_CDC_DESC_OFFSET (9 + 9+9+7 + 9+9+7 + 8)
94 #define CONFIG_DESC_SIZE (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7)
95
96 // XXX Unused
97 #define MOUSE_DESC_OFFSET (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7 + 9) 106 #define MOUSE_DESC_OFFSET (9 + 9+9+7 + 9+9+7 + 8+9+5+5+4+5+7+9+7+7 + 9)
98 #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) 107 #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)
108 #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)
109 #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)
99 110
100 #define ENDPOINT1_CONFIG ENDPOINT_TRANSIMIT_ONLY 111 #define ENDPOINT1_CONFIG ENDPOINT_TRANSIMIT_ONLY
101 #define ENDPOINT2_CONFIG ENDPOINT_TRANSIMIT_ONLY 112 #define ENDPOINT2_CONFIG ENDPOINT_TRANSIMIT_ONLY
102 #define ENDPOINT3_CONFIG ENDPOINT_TRANSIMIT_ONLY 113 #define ENDPOINT3_CONFIG ENDPOINT_TRANSIMIT_ONLY
103 #define ENDPOINT4_CONFIG ENDPOINT_RECEIVE_ONLY 114 #define ENDPOINT4_CONFIG ENDPOINT_RECEIVE_ONLY
104 #define ENDPOINT5_CONFIG ENDPOINT_TRANSIMIT_ONLY 115 #define ENDPOINT5_CONFIG ENDPOINT_TRANSIMIT_ONLY
105 #define ENDPOINT6_CONFIG ENDPOINT_TRANSIMIT_ONLY 116 #define ENDPOINT6_CONFIG ENDPOINT_TRANSIMIT_ONLY
106 #define ENDPOINT7_CONFIG ENDPOINT_TRANSIMIT_ONLY 117 #define ENDPOINT7_CONFIG ENDPOINT_TRANSIMIT_ONLY
118 #define ENDPOINT8_CONFIG ENDPOINT_TRANSIMIT_ONLY
107 119
108 120
109 121
110 // ----- Enumerations ----- 122 // ----- Enumerations -----
111 123