diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-08-20 00:42:08 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-08-20 00:42:08 -0400 |
| commit | e528087ee539fda2f13795d4a6c03403faef44d5 (patch) | |
| tree | 6f80bd86bdd5e5a044deee9bb195c0ecc9bfd670 /protocol/lufa/descriptor.h | |
| parent | 2d76b5c3d421c984f6b4b9da757383cc87e3f808 (diff) | |
| download | qmk_firmware-e528087ee539fda2f13795d4a6c03403faef44d5.tar.gz qmk_firmware-e528087ee539fda2f13795d4a6c03403faef44d5.zip | |
midi
Diffstat (limited to 'protocol/lufa/descriptor.h')
| -rw-r--r-- | protocol/lufa/descriptor.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/protocol/lufa/descriptor.h b/protocol/lufa/descriptor.h index 42af07917..58a7df440 100644 --- a/protocol/lufa/descriptor.h +++ b/protocol/lufa/descriptor.h | |||
| @@ -85,6 +85,23 @@ typedef struct | |||
| 85 | USB_HID_Descriptor_HID_t NKRO_HID; | 85 | USB_HID_Descriptor_HID_t NKRO_HID; |
| 86 | USB_Descriptor_Endpoint_t NKRO_INEndpoint; | 86 | USB_Descriptor_Endpoint_t NKRO_INEndpoint; |
| 87 | #endif | 87 | #endif |
| 88 | |||
| 89 | // MIDI Audio Control Interface | ||
| 90 | USB_Descriptor_Interface_t Audio_ControlInterface; | ||
| 91 | USB_Audio_Descriptor_Interface_AC_t Audio_ControlInterface_SPC; | ||
| 92 | |||
| 93 | // MIDI Audio Streaming Interface | ||
| 94 | USB_Descriptor_Interface_t Audio_StreamInterface; | ||
| 95 | USB_MIDI_Descriptor_AudioInterface_AS_t Audio_StreamInterface_SPC; | ||
| 96 | USB_MIDI_Descriptor_InputJack_t MIDI_In_Jack_Emb; | ||
| 97 | USB_MIDI_Descriptor_InputJack_t MIDI_In_Jack_Ext; | ||
| 98 | USB_MIDI_Descriptor_OutputJack_t MIDI_Out_Jack_Emb; | ||
| 99 | USB_MIDI_Descriptor_OutputJack_t MIDI_Out_Jack_Ext; | ||
| 100 | USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint; | ||
| 101 | USB_MIDI_Descriptor_Jack_Endpoint_t MIDI_In_Jack_Endpoint_SPC; | ||
| 102 | USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint; | ||
| 103 | USB_MIDI_Descriptor_Jack_Endpoint_t MIDI_Out_Jack_Endpoint_SPC; | ||
| 104 | |||
| 88 | } USB_Descriptor_Configuration_t; | 105 | } USB_Descriptor_Configuration_t; |
| 89 | 106 | ||
| 90 | 107 | ||
| @@ -117,7 +134,7 @@ typedef struct | |||
| 117 | 134 | ||
| 118 | 135 | ||
| 119 | /* nubmer of interfaces */ | 136 | /* nubmer of interfaces */ |
| 120 | #define TOTAL_INTERFACES (NKRO_INTERFACE + 1) | 137 | #define TOTAL_INTERFACES (NKRO_INTERFACE + 3) |
| 121 | 138 | ||
| 122 | 139 | ||
| 123 | // Endopoint number and size | 140 | // Endopoint number and size |
| @@ -150,12 +167,16 @@ typedef struct | |||
| 150 | # endif | 167 | # endif |
| 151 | #endif | 168 | #endif |
| 152 | 169 | ||
| 170 | #define MIDI_STREAM_IN_EPNUM (NKRO_IN_EPNUM + 1) | ||
| 171 | #define MIDI_STREAM_OUT_EPNUM (NKRO_IN_EPNUM + 1) | ||
| 172 | |||
| 153 | 173 | ||
| 154 | #define KEYBOARD_EPSIZE 8 | 174 | #define KEYBOARD_EPSIZE 8 |
| 155 | #define MOUSE_EPSIZE 8 | 175 | #define MOUSE_EPSIZE 8 |
| 156 | #define EXTRAKEY_EPSIZE 8 | 176 | #define EXTRAKEY_EPSIZE 8 |
| 157 | #define CONSOLE_EPSIZE 32 | 177 | #define CONSOLE_EPSIZE 32 |
| 158 | #define NKRO_EPSIZE 16 | 178 | #define NKRO_EPSIZE 16 |
| 179 | #define MIDI_STREAM_EPSIZE 64 | ||
| 159 | 180 | ||
| 160 | 181 | ||
| 161 | uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, | 182 | uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, |
