From 3cbdcd36868693cfc1863231a1ec64507ce3d29f Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 26 Jun 2009 11:43:56 +0000 Subject: Reduce struct name pollution - group typedef struct names by class driver name where appropriate. --- Demos/Device/ClassDriver/MIDI/Descriptors.c | 10 +++++----- Demos/Device/ClassDriver/MIDI/Descriptors.h | 8 ++++---- Demos/Device/ClassDriver/MIDI/MIDI.c | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'Demos/Device/ClassDriver/MIDI') diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c index 2ff22ceae..0185c7702 100644 --- a/Demos/Device/ClassDriver/MIDI/Descriptors.c +++ b/Demos/Device/ClassDriver/MIDI/Descriptors.c @@ -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), diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h index 6702cc461..bc2a6d5cb 100644 --- a/Demos/Device/ClassDriver/MIDI/Descriptors.h +++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h @@ -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; diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c index 3dca7430a..a6c31ee47 100644 --- a/Demos/Device/ClassDriver/MIDI/MIDI.c +++ b/Demos/Device/ClassDriver/MIDI/MIDI.c @@ -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), -- cgit v1.2.3