Reduce struct name pollution - group typedef struct names by class driver name where appropriate.
This commit is contained in:
parent
7366f590f5
commit
3cbdcd3686
40 changed files with 402 additions and 467 deletions
|
@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioControlInterface_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_Header,
|
||||
|
||||
.ACSpecification = VERSION_BCD(01.00),
|
||||
.TotalLength = (sizeof(USB_AudioInterface_AC_t) +
|
||||
sizeof(USB_AudioInputTerminal_t) +
|
||||
sizeof(USB_AudioOutputTerminal_t)),
|
||||
.TotalLength = (sizeof(USB_Audio_Interface_AC_t) +
|
||||
sizeof(USB_Audio_InputTerminal_t) +
|
||||
sizeof(USB_Audio_OutputTerminal_t)),
|
||||
|
||||
.InCollection = 1,
|
||||
.InterfaceNumbers = {1},
|
||||
|
@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.InputTerminal =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_InputTerminal,
|
||||
|
||||
.TerminalID = 0x01,
|
||||
|
@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.OutputTerminal =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_OutputTerminal,
|
||||
|
||||
.TerminalID = 0x02,
|
||||
|
@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioStreamInterface_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_General,
|
||||
|
||||
.TerminalLink = 0x02,
|
||||
|
@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioFormat =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_Format,
|
||||
|
||||
.FormatType = 0x01,
|
||||
|
@ -199,7 +199,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.SubFrameSize = 0x02,
|
||||
.BitResolution = 16,
|
||||
.SampleFrequencyType = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)),
|
||||
.SampleFrequencyType = (AUDIO_TOTAL_SAMPLE_RATES * sizeof(USB_Audio_SampleFreq_t)),
|
||||
|
||||
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}
|
||||
},
|
||||
|
@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
{
|
||||
.Endpoint =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioStreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
|
||||
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM),
|
||||
.Attributes = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),
|
||||
|
@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioEndpoint_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},
|
||||
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},
|
||||
.Subtype = DSUBTYPE_General,
|
||||
|
||||
.Attributes = 0x00,
|
||||
|
|
|
@ -68,15 +68,15 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t AudioControlInterface;
|
||||
USB_AudioInterface_AC_t AudioControlInterface_SPC;
|
||||
USB_AudioInputTerminal_t InputTerminal;
|
||||
USB_AudioOutputTerminal_t OutputTerminal;
|
||||
USB_Audio_Interface_AC_t AudioControlInterface_SPC;
|
||||
USB_Audio_InputTerminal_t InputTerminal;
|
||||
USB_Audio_OutputTerminal_t OutputTerminal;
|
||||
USB_Descriptor_Interface_t AudioStreamInterface_Alt0;
|
||||
USB_Descriptor_Interface_t AudioStreamInterface_Alt1;
|
||||
USB_AudioInterface_AS_t AudioStreamInterface_SPC;
|
||||
USB_AudioFormat_t AudioFormat;
|
||||
USB_AudioStreamEndpoint_Std_t AudioEndpoint;
|
||||
USB_AudioStreamEndpoint_Spc_t AudioEndpoint_SPC;
|
||||
USB_Audio_Interface_AS_t AudioStreamInterface_SPC;
|
||||
USB_Audio_Format_t AudioFormat;
|
||||
USB_Audio_StreamEndpoint_Std_t AudioEndpoint;
|
||||
USB_Audio_StreamEndpoint_Spc_t AudioEndpoint_SPC;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
/* Function Prototypes: */
|
||||
|
|
|
@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioControlInterface_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_Header,
|
||||
|
||||
.ACSpecification = VERSION_BCD(01.00),
|
||||
.TotalLength = (sizeof(USB_AudioInterface_AC_t) +
|
||||
sizeof(USB_AudioInputTerminal_t) +
|
||||
sizeof(USB_AudioOutputTerminal_t)),
|
||||
.TotalLength = (sizeof(USB_Audio_Interface_AC_t) +
|
||||
sizeof(USB_Audio_InputTerminal_t) +
|
||||
sizeof(USB_Audio_OutputTerminal_t)),
|
||||
|
||||
.InCollection = 1,
|
||||
.InterfaceNumbers = {1},
|
||||
|
@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.InputTerminal =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_InputTerminal,
|
||||
|
||||
.TerminalID = 0x01,
|
||||
|
@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.OutputTerminal =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_OutputTerminal,
|
||||
|
||||
.TerminalID = 0x02,
|
||||
|
@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioStreamInterface_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_General,
|
||||
|
||||
.TerminalLink = 0x01,
|
||||
|
@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioFormat =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_Format,
|
||||
|
||||
.FormatType = 0x01,
|
||||
|
@ -200,7 +200,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
.SubFrameSize = 0x02,
|
||||
.BitResolution = 16,
|
||||
|
||||
.SampleFrequencyType = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)),
|
||||
.SampleFrequencyType = (AUDIO_TOTAL_SAMPLE_RATES * sizeof(USB_Audio_SampleFreq_t)),
|
||||
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}
|
||||
},
|
||||
|
||||
|
@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
{
|
||||
.Endpoint =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioStreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
|
||||
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | AUDIO_STREAM_EPNUM),
|
||||
.Attributes = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),
|
||||
|
@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioEndpoint_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},
|
||||
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},
|
||||
.Subtype = DSUBTYPE_General,
|
||||
|
||||
.Attributes = EP_ACCEPTS_SMALL_PACKETS,
|
||||
|
|
|
@ -68,15 +68,15 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t AudioControlInterface;
|
||||
USB_AudioInterface_AC_t AudioControlInterface_SPC;
|
||||
USB_AudioInputTerminal_t InputTerminal;
|
||||
USB_AudioOutputTerminal_t OutputTerminal;
|
||||
USB_Audio_Interface_AC_t AudioControlInterface_SPC;
|
||||
USB_Audio_InputTerminal_t InputTerminal;
|
||||
USB_Audio_OutputTerminal_t OutputTerminal;
|
||||
USB_Descriptor_Interface_t AudioStreamInterface_Alt0;
|
||||
USB_Descriptor_Interface_t AudioStreamInterface_Alt1;
|
||||
USB_AudioInterface_AS_t AudioStreamInterface_SPC;
|
||||
USB_AudioFormat_t AudioFormat;
|
||||
USB_AudioStreamEndpoint_Std_t AudioEndpoint;
|
||||
USB_AudioStreamEndpoint_Spc_t AudioEndpoint_SPC;
|
||||
USB_Audio_Interface_AS_t AudioStreamInterface_SPC;
|
||||
USB_Audio_Format_t AudioFormat;
|
||||
USB_Audio_StreamEndpoint_Std_t AudioEndpoint;
|
||||
USB_Audio_StreamEndpoint_Spc_t AudioEndpoint_SPC;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
/* Function Prototypes: */
|
||||
|
|
|
@ -130,7 +130,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.GenericHID =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
|
||||
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
|
||||
|
||||
.HIDSpec = VERSION_BCD(01.11),
|
||||
.CountryCode = 0x00,
|
||||
|
@ -227,7 +227,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
|
|||
break;
|
||||
case DTYPE_HID:
|
||||
Address = (void*)&ConfigurationDescriptor.GenericHID;
|
||||
Size = sizeof(USB_Descriptor_HID_t);
|
||||
Size = sizeof(USB_HID_Descriptor_t);
|
||||
break;
|
||||
case DTYPE_Report:
|
||||
Address = (void*)&GenericReport;
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t Interface;
|
||||
USB_Descriptor_HID_t GenericHID;
|
||||
USB_HID_Descriptor_t GenericHID;
|
||||
USB_Descriptor_Endpoint_t GenericINEndpoint;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
|
|
|
@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.JoystickHID =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
|
||||
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
|
||||
|
||||
.HIDSpec = VERSION_BCD(01.11),
|
||||
.CountryCode = 0x00,
|
||||
|
@ -237,7 +237,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
|
|||
break;
|
||||
case DTYPE_HID:
|
||||
Address = (void*)&ConfigurationDescriptor.JoystickHID;
|
||||
Size = sizeof(USB_Descriptor_HID_t);
|
||||
Size = sizeof(USB_HID_Descriptor_t);
|
||||
break;
|
||||
case DTYPE_Report:
|
||||
Address = (void*)&JoystickReport;
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t Interface;
|
||||
USB_Descriptor_HID_t JoystickHID;
|
||||
USB_HID_Descriptor_t JoystickHID;
|
||||
USB_Descriptor_Endpoint_t JoystickEndpoint;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.KeyboardHID =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
|
||||
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
|
||||
|
||||
.HIDSpec = VERSION_BCD(01.11),
|
||||
.CountryCode = 0x00,
|
||||
|
@ -244,7 +244,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
|
|||
break;
|
||||
case DTYPE_HID:
|
||||
Address = (void*)&ConfigurationDescriptor.KeyboardHID;
|
||||
Size = sizeof(USB_Descriptor_HID_t);
|
||||
Size = sizeof(USB_HID_Descriptor_t);
|
||||
break;
|
||||
case DTYPE_Report:
|
||||
Address = (void*)&KeyboardReport;
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t Interface;
|
||||
USB_Descriptor_HID_t KeyboardHID;
|
||||
USB_HID_Descriptor_t KeyboardHID;
|
||||
USB_Descriptor_Endpoint_t KeyboardEndpoint;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
|
|
|
@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.KeyboardHID =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
|
||||
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
|
||||
|
||||
.HIDSpec = VERSION_BCD(01.11),
|
||||
.CountryCode = 0x00,
|
||||
|
@ -217,7 +217,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.MouseHID =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
|
||||
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
|
||||
|
||||
.HIDSpec = VERSION_BCD(01.11),
|
||||
.CountryCode = 0x00,
|
||||
|
@ -316,12 +316,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
|
|||
if (!(wIndex))
|
||||
{
|
||||
Address = (void*)&ConfigurationDescriptor.KeyboardHID;
|
||||
Size = sizeof(USB_Descriptor_HID_t);
|
||||
Size = sizeof(USB_HID_Descriptor_t);
|
||||
}
|
||||
else
|
||||
{
|
||||
Address = (void*)&ConfigurationDescriptor.MouseHID;
|
||||
Size = sizeof(USB_Descriptor_HID_t);
|
||||
Size = sizeof(USB_HID_Descriptor_t);
|
||||
}
|
||||
break;
|
||||
case DTYPE_Report:
|
||||
|
|
|
@ -52,10 +52,10 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t KeyboardInterface;
|
||||
USB_Descriptor_HID_t KeyboardHID;
|
||||
USB_HID_Descriptor_t KeyboardHID;
|
||||
USB_Descriptor_Endpoint_t KeyboardInEndpoint;
|
||||
USB_Descriptor_Interface_t MouseInterface;
|
||||
USB_Descriptor_HID_t MouseHID;
|
||||
USB_HID_Descriptor_t MouseHID;
|
||||
USB_Descriptor_Endpoint_t MouseInEndpoint;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
|
|
|
@ -104,11 +104,11 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioControlInterface_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_Header,
|
||||
|
||||
.ACSpecification = VERSION_BCD(01.00),
|
||||
.TotalLength = sizeof(USB_AudioInterface_AC_t),
|
||||
.TotalLength = sizeof(USB_Audio_Interface_AC_t),
|
||||
|
||||
.InCollection = 1,
|
||||
.InterfaceNumbers = {1},
|
||||
|
@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.AudioStreamInterface_SPC =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioInterface_MIDI_AS_t), .Type = DTYPE_AudioInterface},
|
||||
.Header = {.Size = sizeof(USB_MIDI_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},
|
||||
.Subtype = DSUBTYPE_General,
|
||||
|
||||
.AudioSpecification = VERSION_BCD(01.00),
|
||||
|
@ -196,7 +196,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
{
|
||||
.Endpoint =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioStreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
|
||||
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | MIDI_STREAM_OUT_EPNUM),
|
||||
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
||||
|
@ -221,7 +221,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
{
|
||||
.Endpoint =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_AudioStreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
|
||||
|
||||
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | MIDI_STREAM_IN_EPNUM),
|
||||
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
||||
|
|
|
@ -61,16 +61,16 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t AudioControlInterface;
|
||||
USB_AudioInterface_AC_t AudioControlInterface_SPC;
|
||||
USB_Audio_Interface_AC_t AudioControlInterface_SPC;
|
||||
USB_Descriptor_Interface_t AudioStreamInterface;
|
||||
USB_AudioInterface_MIDI_AS_t AudioStreamInterface_SPC;
|
||||
USB_MIDI_AudioInterface_AS_t AudioStreamInterface_SPC;
|
||||
USB_MIDI_In_Jack_t MIDI_In_Jack_Emb;
|
||||
USB_MIDI_In_Jack_t MIDI_In_Jack_Ext;
|
||||
USB_MIDI_Out_Jack_t MIDI_Out_Jack_Emb;
|
||||
USB_MIDI_Out_Jack_t MIDI_Out_Jack_Ext;
|
||||
USB_AudioStreamEndpoint_Std_t MIDI_In_Jack_Endpoint;
|
||||
USB_Audio_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint;
|
||||
USB_MIDI_Jack_Endpoint_t MIDI_In_Jack_Endpoint_SPC;
|
||||
USB_AudioStreamEndpoint_Std_t MIDI_Out_Jack_Endpoint;
|
||||
USB_Audio_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint;
|
||||
USB_MIDI_Jack_Endpoint_t MIDI_Out_Jack_Endpoint_SPC;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ int main(void)
|
|||
{
|
||||
CheckJoystickMovement();
|
||||
|
||||
USB_MIDI_EventPacket_t DummyMIDIEvent;
|
||||
MIDI_EventPacket_t DummyMIDIEvent;
|
||||
MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);
|
||||
|
||||
MIDI_Device_USBTask(&Keyboard_MIDI_Interface);
|
||||
|
@ -144,7 +144,7 @@ void CheckJoystickMovement(void)
|
|||
|
||||
if (MIDICommand)
|
||||
{
|
||||
USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
|
||||
MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
|
||||
{
|
||||
.CableNumber = 0,
|
||||
.Command = (MIDICommand >> 4),
|
||||
|
|
|
@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|||
|
||||
.MouseHID =
|
||||
{
|
||||
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
|
||||
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
|
||||
|
||||
.HIDSpec = VERSION_BCD(01.11),
|
||||
.CountryCode = 0x00,
|
||||
|
@ -237,7 +237,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
|
|||
break;
|
||||
case DTYPE_HID:
|
||||
Address = (void*)&ConfigurationDescriptor.MouseHID;
|
||||
Size = sizeof(USB_Descriptor_HID_t);
|
||||
Size = sizeof(USB_HID_Descriptor_t);
|
||||
break;
|
||||
case DTYPE_Report:
|
||||
Address = (void*)&MouseReport;
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
{
|
||||
USB_Descriptor_Configuration_Header_t Config;
|
||||
USB_Descriptor_Interface_t Interface;
|
||||
USB_Descriptor_HID_t MouseHID;
|
||||
USB_HID_Descriptor_t MouseHID;
|
||||
USB_Descriptor_Endpoint_t MouseEndpoint;
|
||||
} USB_Descriptor_Configuration_t;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue