Fix errors in the MouseHostWithParser demo from incorrect use of the HID_ALIGN_DATA() macro.
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
}, \r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x02\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .DFUInterface = \r
+ .DFU_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DFUFunctional = \r
+ .DFU_Functional = \r
{\r
.Header = {.Size = sizeof(USB_DFU_Functional_Descriptor_t), .Type = DTYPE_DFUFunctional},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t DFUInterface;\r
- USB_DFU_Functional_Descriptor_t DFUFunctional;\r
+ USB_Descriptor_Interface_t DFU_Interface;\r
+ USB_DFU_Functional_Descriptor_t DFU_Functional;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .HIDDescriptor = \r
+ .HID_VendorHID = \r
{ \r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(HIDReport)\r
},\r
\r
- .HIDEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
Size = sizeof(USB_Descriptor_Configuration_t);\r
break;\r
case DTYPE_HID:\r
- Address = (void*)&ConfigurationDescriptor.HIDDescriptor;\r
+ Address = (void*)&ConfigurationDescriptor.HID_VendorHID;\r
Size = sizeof(USB_Descriptor_HID_t);\r
break;\r
case DTYPE_Report:\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_HID_t HIDDescriptor;\r
- USB_Descriptor_Endpoint_t HIDEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_Descriptor_HID_t HID_VendorHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AudioControlInterface = \r
+ .Audio_ControlInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioControlInterface_SPC = \r
+ .Audio_ControlInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Header,\r
.InterfaceNumbers = {1},\r
},\r
\r
- .InputTerminal = \r
+ .Audio_InputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_InputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .OutputTerminal = \r
+ .Audio_OutputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_OutputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_Alt0 = \r
+ .Audio_StreamInterface_Alt0 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_Alt1 = \r
+ .Audio_StreamInterface_Alt1 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_SPC = \r
+ .Audio_StreamInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_General,\r
.AudioFormat = 0x0001\r
},\r
\r
- .AudioFormat = \r
+ .Audio_AudioFormat = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Format,\r
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}\r
},\r
\r
- .AudioEndpoint = \r
+ .Audio_StreamEndpoint = \r
{\r
.Endpoint = \r
{\r
.SyncEndpointNumber = 0\r
},\r
\r
- .AudioEndpoint_SPC = \r
+ .Audio_StreamEndpoint_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},\r
.Subtype = DSUBTYPE_General,\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AudioControlInterface;\r
- USB_Audio_Interface_AC_t AudioControlInterface_SPC;\r
- USB_Audio_InputTerminal_t InputTerminal;\r
- USB_Audio_OutputTerminal_t OutputTerminal;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt0;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt1;\r
- USB_Audio_Interface_AS_t AudioStreamInterface_SPC;\r
- USB_Audio_Format_t AudioFormat;\r
- USB_Audio_StreamEndpoint_Std_t AudioEndpoint;\r
- USB_Audio_StreamEndpoint_Spc_t AudioEndpoint_SPC;\r
+ USB_Descriptor_Interface_t Audio_ControlInterface;\r
+ USB_Audio_Interface_AC_t Audio_ControlInterface_SPC;\r
+ USB_Audio_InputTerminal_t Audio_InputTerminal;\r
+ USB_Audio_OutputTerminal_t Audio_OutputTerminal;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt0;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;\r
+ USB_Audio_Interface_AS_t Audio_StreamInterface_SPC;\r
+ USB_Audio_Format_t Audio_AudioFormat;\r
+ USB_Audio_StreamEndpoint_Std_t Audio_StreamEndpoint;\r
+ USB_Audio_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AudioControlInterface = \r
+ .Audio_ControlInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioControlInterface_SPC = \r
+ .Audio_ControlInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Header,\r
.InterfaceNumbers = {1},\r
},\r
\r
- .InputTerminal = \r
+ .Audio_InputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_InputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .OutputTerminal = \r
+ .Audio_OutputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_OutputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_Alt0 = \r
+ .Audio_StreamInterface_Alt0 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_Alt1 = \r
+ .Audio_StreamInterface_Alt1 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_SPC = \r
+ .Audio_StreamInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_General,\r
.AudioFormat = 0x0001\r
},\r
\r
- .AudioFormat = \r
+ .Audio_AudioFormat = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Format,\r
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}\r
},\r
\r
- .AudioEndpoint = \r
+ .Audio_StreamEndpoint = \r
{\r
.Endpoint = \r
{\r
.SyncEndpointNumber = 0\r
},\r
\r
- .AudioEndpoint_SPC = \r
+ .Audio_StreamEndpoint_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},\r
.Subtype = DSUBTYPE_General,\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AudioControlInterface;\r
- USB_Audio_Interface_AC_t AudioControlInterface_SPC;\r
- USB_Audio_InputTerminal_t InputTerminal;\r
- USB_Audio_OutputTerminal_t OutputTerminal;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt0;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt1;\r
- USB_Audio_Interface_AS_t AudioStreamInterface_SPC;\r
- USB_Audio_Format_t AudioFormat;\r
- USB_Audio_StreamEndpoint_Std_t AudioEndpoint;\r
- USB_Audio_StreamEndpoint_Spc_t AudioEndpoint_SPC;\r
+ USB_Descriptor_Interface_t Audio_ControlInterface;\r
+ USB_Audio_Interface_AC_t Audio_ControlInterface_SPC;\r
+ USB_Audio_InputTerminal_t Audio_InputTerminal;\r
+ USB_Audio_OutputTerminal_t Audio_OutputTerminal;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt0;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;\r
+ USB_Audio_Interface_AS_t Audio_StreamInterface_SPC;\r
+ USB_Audio_Format_t Audio_AudioFormat;\r
+ USB_Audio_StreamEndpoint_Std_t Audio_StreamEndpoint;\r
+ USB_Audio_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .IAD1 = \r
+ .CDC1_IAD = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .IAD2 = \r
+ .CDC2_IAD = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_Association_t IAD1;\r
+ USB_Descriptor_Interface_Association_t CDC1_IAD;\r
USB_Descriptor_Interface_t CDC1_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_CallManagement;\r
USB_Descriptor_Interface_t CDC1_DCI_Interface;\r
USB_Descriptor_Endpoint_t CDC1_DataOutEndpoint;\r
USB_Descriptor_Endpoint_t CDC1_DataInEndpoint;\r
- USB_Descriptor_Interface_Association_t IAD2;\r
+ USB_Descriptor_Interface_Association_t CDC2_IAD;\r
USB_Descriptor_Interface_t CDC2_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_CallManagement;\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .GenericHID = \r
+ .HID_GenericHID = \r
{\r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(GenericReport)\r
},\r
\r
- .GenericINEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.GenericHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_GenericHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_HID_Descriptor_t GenericHID;\r
- USB_Descriptor_Endpoint_t GenericINEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_HID_Descriptor_t HID_GenericHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .JoystickHID = \r
+ .HID_JoystickHID = \r
{\r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(JoystickReport)\r
},\r
\r
- .JoystickEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.JoystickHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_JoystickHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_HID_Descriptor_t JoystickHID;\r
- USB_Descriptor_Endpoint_t JoystickEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_HID_Descriptor_t HID_JoystickHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .KeyboardHID = \r
+ .HID_KeyboardHID = \r
{ \r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(KeyboardReport)\r
},\r
\r
- .KeyboardEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_KeyboardHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_HID_Descriptor_t KeyboardHID;\r
- USB_Descriptor_Endpoint_t KeyboardEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_HID_Descriptor_t HID_KeyboardHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .KeyboardInterface = \r
+ .HID1_KeyboardInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .KeyboardHID = \r
+ .HID1_KeyboardHID = \r
{ \r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(KeyboardReport)\r
},\r
\r
- .KeyboardInEndpoint = \r
+ .HID1_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x0A\r
},\r
\r
- .MouseInterface = \r
+ .HID2_MouseInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MouseHID = \r
+ .HID2_MouseHID = \r
{ \r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(MouseReport)\r
},\r
\r
- .MouseInEndpoint = \r
+ .HID2_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
case DTYPE_HID: \r
if (!(wIndex))\r
{\r
- Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID1_KeyboardHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
}\r
else\r
{\r
- Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID2_MouseHID;\r
Size = sizeof(USB_HID_Descriptor_t); \r
}\r
break;\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t KeyboardInterface;\r
- USB_HID_Descriptor_t KeyboardHID;\r
- USB_Descriptor_Endpoint_t KeyboardInEndpoint;\r
- USB_Descriptor_Interface_t MouseInterface;\r
- USB_HID_Descriptor_t MouseHID;\r
- USB_Descriptor_Endpoint_t MouseInEndpoint;\r
+ USB_Descriptor_Interface_t HID1_KeyboardInterface;\r
+ USB_HID_Descriptor_t HID1_KeyboardHID;\r
+ USB_Descriptor_Endpoint_t HID1_ReportINEndpoint;\r
+ USB_Descriptor_Interface_t HID2_MouseInterface;\r
+ USB_HID_Descriptor_t HID2_MouseHID;\r
+ USB_Descriptor_Endpoint_t HID2_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AudioControlInterface = \r
+ .Audio_ControlInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioControlInterface_SPC = \r
+ .Audio_ControlInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Header,\r
.InterfaceNumbers = {1},\r
},\r
\r
- .AudioStreamInterface = \r
+ .Audio_StreamInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_SPC = \r
+ .Audio_StreamInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_MIDI_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_General,\r
\r
.AudioSpecification = VERSION_BCD(01.00),\r
\r
- .TotalLength = (sizeof(USB_Descriptor_Configuration_t) - offsetof(USB_Descriptor_Configuration_t, AudioStreamInterface_SPC))\r
+ .TotalLength = (sizeof(USB_Descriptor_Configuration_t) -\r
+ offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))\r
},\r
\r
.MIDI_In_Jack_Emb = \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AudioControlInterface;\r
- USB_Audio_Interface_AC_t AudioControlInterface_SPC;\r
- USB_Descriptor_Interface_t AudioStreamInterface;\r
- USB_MIDI_AudioInterface_AS_t AudioStreamInterface_SPC;\r
+ USB_Descriptor_Interface_t Audio_ControlInterface;\r
+ USB_Audio_Interface_AC_t Audio_ControlInterface_SPC;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface;\r
+ USB_MIDI_AudioInterface_AS_t Audio_StreamInterface_SPC;\r
USB_MIDI_In_Jack_t MIDI_In_Jack_Emb;\r
USB_MIDI_In_Jack_t MIDI_In_Jack_Ext;\r
USB_MIDI_Out_Jack_t MIDI_Out_Jack_Emb;\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .MS_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataInEndpoint = \r
+ .MS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataOutEndpoint = \r
+ .MS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
+ USB_Descriptor_Interface_t MS_Interface;\r
+ USB_Descriptor_Endpoint_t MS_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t MS_DataOutEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .MassStorageInterface = \r
+ .MS_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MassStorageDataInEndpoint = \r
+ .MS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .MassStorageDataOutEndpoint = \r
+ .MS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .KeyboardInterface = \r
+ .HID_KeyboardInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .KeyboardHID = \r
+ .HID_KeyboardHID = \r
{ \r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(KeyboardReport)\r
},\r
\r
- .KeyboardEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID:\r
- Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_KeyboardHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report:\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t MassStorageInterface;\r
- USB_Descriptor_Endpoint_t MassStorageDataInEndpoint;\r
- USB_Descriptor_Endpoint_t MassStorageDataOutEndpoint;\r
- USB_Descriptor_Interface_t KeyboardInterface;\r
- USB_HID_Descriptor_t KeyboardHID;\r
- USB_Descriptor_Endpoint_t KeyboardEndpoint;\r
+ USB_Descriptor_Interface_t MS_Interface;\r
+ USB_Descriptor_Endpoint_t MS_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t MS_DataOutEndpoint;\r
+ USB_Descriptor_Interface_t HID_KeyboardInterface;\r
+ USB_HID_Descriptor_t HID_KeyboardHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MouseHID = \r
+ .HID_MouseHID = \r
{\r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(MouseReport)\r
},\r
\r
- .MouseEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_MouseHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_HID_Descriptor_t MouseHID;\r
- USB_Descriptor_Endpoint_t MouseEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_HID_Descriptor_t HID_MouseHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x02\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .RNDIS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .RNDIS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Header;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t RNDIS_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t RNDIS_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0xFF\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.IADStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0xFF\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .InterfaceHID = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MouseHID = \r
+ .HID_MouseHID = \r
{\r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(MouseReport)\r
},\r
\r
- .MouseEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_MouseHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report: \r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
USB_Descriptor_Interface_Association_t CDC_IAD;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
- USB_Descriptor_Interface_t InterfaceHID;\r
- USB_HID_Descriptor_t MouseHID;\r
- USB_Descriptor_Endpoint_t MouseEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_HID_Descriptor_t HID_MouseHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
\r
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =\r
{\r
- Config:\r
+ .Config =\r
{\r
Header: {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration},\r
\r
MaxPowerConsumption: USB_CONFIG_POWER_MA(100)\r
},\r
\r
- Interface:\r
+ .SSHOW_Interface =\r
{\r
Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},\r
\r
InterfaceStrIndex: NO_DESCRIPTOR\r
},\r
\r
- DataInEndpoint:\r
+ .SSHOW_DataInEndpoint =\r
{\r
Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
\r
PollingIntervalMS: 0x00\r
},\r
\r
- DataOutEndpoint:\r
+ .SSHOW_DataOutEndpoint =\r
{\r
Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
+ USB_Descriptor_Interface_t SSHOW_Interface;\r
+ USB_Descriptor_Endpoint_t SSHOW_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t SSHOW_DataOutEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
typedef struct\r
#include <avr/io.h>\r
#include <stdbool.h>\r
#include <string.h>\r
+ #include <stdio.h>\r
\r
#include "SideshowCommon.h"\r
#include "SideshowApplications.h"\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AudioControlInterface = \r
+ .Audio_ControlInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioControlInterface_SPC = \r
+ .Audio_ControlInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Header,\r
.InterfaceNumbers = {1},\r
},\r
\r
- .InputTerminal = \r
+ .Audio_InputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_InputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .OutputTerminal = \r
+ .Audio_OutputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_OutputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_Alt0 = \r
+ .Audio_StreamInterface_Alt0 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_Alt1 = \r
+ .Audio_StreamInterface_Alt1 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_SPC = \r
+ .Audio_StreamInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_General,\r
.AudioFormat = 0x0001\r
},\r
\r
- .AudioFormat = \r
+ .Audio_AudioFormat = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Format,\r
\r
.SubFrameSize = 0x02,\r
.BitResolution = 16,\r
- .SampleFrequencyType = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(Audio_SampleFreq_t)),\r
+ .SampleFrequencyType = (sizeof(ConfigurationDescriptor.Audio_AudioFormat.SampleFrequencies) /\r
+ sizeof(Audio_SampleFreq_t)),\r
\r
.SampleFrequencies = {SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}\r
},\r
\r
- .AudioEndpoint = \r
+ .Audio_StreamEndpoint = \r
{\r
.Endpoint = \r
{\r
.SyncEndpointNumber = 0\r
},\r
\r
- .AudioEndpoint_SPC = \r
+ .Audio_StreamEndpoint_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},\r
.Subtype = DSUBTYPE_General,\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AudioControlInterface;\r
- USB_Audio_Interface_AC_t AudioControlInterface_SPC;\r
- USB_Audio_InputTerminal_t InputTerminal;\r
- USB_Audio_OutputTerminal_t OutputTerminal;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt0;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt1;\r
- USB_Audio_Interface_AS_t AudioStreamInterface_SPC;\r
- USB_Audio_Format_t AudioFormat;\r
- USB_Audio_StreamEndpoint_Std_t AudioEndpoint;\r
- USB_Audio_StreamEndpoint_Spc_t AudioEndpoint_SPC;\r
+ USB_Descriptor_Interface_t Audio_ControlInterface;\r
+ USB_Audio_Interface_AC_t Audio_ControlInterface_SPC;\r
+ USB_Audio_InputTerminal_t Audio_InputTerminal;\r
+ USB_Audio_OutputTerminal_t Audio_OutputTerminal;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt0;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;\r
+ USB_Audio_Interface_AS_t Audio_StreamInterface_SPC;\r
+ USB_Audio_Format_t Audio_AudioFormat;\r
+ USB_Audio_StreamEndpoint_Std_t Audio_StreamEndpoint;\r
+ USB_Audio_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AudioControlInterface = \r
+ .Audio_ControlInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioControlInterface_SPC = \r
+ .Audio_ControlInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Header,\r
.InterfaceNumbers = {1},\r
},\r
\r
- .InputTerminal = \r
+ .Audio_InputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_InputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .OutputTerminal = \r
+ .Audio_OutputTerminal = \r
{\r
.Header = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_OutputTerminal,\r
.TerminalStrIndex = NO_DESCRIPTOR \r
},\r
\r
- .AudioStreamInterface_Alt0 = \r
+ .Audio_StreamInterface_Alt0 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_Alt1 = \r
+ .Audio_StreamInterface_Alt1 = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_SPC = \r
+ .Audio_StreamInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_General,\r
.AudioFormat = 0x0001\r
},\r
\r
- .AudioFormat = \r
+ .Audio_AudioFormat = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Format,\r
.SubFrameSize = 0x02,\r
.BitResolution = 16,\r
\r
- .SampleFrequencyType = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(Audio_SampleFreq_t)), \r
+ .SampleFrequencyType = (sizeof(ConfigurationDescriptor.Audio_AudioFormat.SampleFrequencies) /\r
+ sizeof(Audio_SampleFreq_t)), \r
.SampleFrequencies = {SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}\r
},\r
\r
- .AudioEndpoint = \r
+ .Audio_StreamEndpoint = \r
{\r
.Endpoint = \r
{\r
.SyncEndpointNumber = 0\r
},\r
\r
- .AudioEndpoint_SPC = \r
+ .Audio_StreamEndpoint_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},\r
.Subtype = DSUBTYPE_General,\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AudioControlInterface;\r
- USB_Audio_Interface_AC_t AudioControlInterface_SPC;\r
- USB_Audio_InputTerminal_t InputTerminal;\r
- USB_Audio_OutputTerminal_t OutputTerminal;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt0;\r
- USB_Descriptor_Interface_t AudioStreamInterface_Alt1;\r
- USB_Audio_Interface_AS_t AudioStreamInterface_SPC;\r
- USB_Audio_Format_t AudioFormat;\r
- USB_Audio_StreamEndpoint_Std_t AudioEndpoint;\r
- USB_Audio_StreamEndpoint_Spc_t AudioEndpoint_SPC;\r
+ USB_Descriptor_Interface_t Audio_ControlInterface;\r
+ USB_Audio_Interface_AC_t Audio_ControlInterface_SPC;\r
+ USB_Audio_InputTerminal_t Audio_InputTerminal;\r
+ USB_Audio_OutputTerminal_t Audio_OutputTerminal;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt0;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;\r
+ USB_Audio_Interface_AS_t Audio_StreamInterface_SPC;\r
+ USB_Audio_Format_t Audio_AudioFormat;\r
+ USB_Audio_StreamEndpoint_Std_t Audio_StreamEndpoint;\r
+ USB_Audio_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .IAD1 = \r
+ .CDC1_IAD = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .IAD2 = \r
+ .CDC2_IAD = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_Association_t IAD1;\r
+ USB_Descriptor_Interface_Association_t CDC1_IAD;\r
USB_Descriptor_Interface_t CDC1_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_CallManagement;\r
USB_Descriptor_Interface_t CDC1_DCI_Interface;\r
USB_Descriptor_Endpoint_t CDC1_DataOutEndpoint;\r
USB_Descriptor_Endpoint_t CDC1_DataInEndpoint;\r
- USB_Descriptor_Interface_Association_t IAD2;\r
+ USB_Descriptor_Interface_Association_t CDC2_IAD;\r
USB_Descriptor_Interface_t CDC2_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_CallManagement;\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .GenericHID = \r
+ .HID_GenericHID = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(GenericReport)\r
},\r
\r
- .GenericINEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x0A\r
},\r
\r
- .GenericOUTEndpoint = \r
+ .HID_ReportOUTEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.GenericHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_GenericHID;\r
Size = sizeof(USB_Descriptor_HID_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_HID_t GenericHID;\r
- USB_Descriptor_Endpoint_t GenericINEndpoint;\r
- USB_Descriptor_Endpoint_t GenericOUTEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_Descriptor_HID_t HID_GenericHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
+ USB_Descriptor_Endpoint_t HID_ReportOUTEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .JoystickHID = \r
+ .HID_JoystickHID = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(JoystickReport)\r
},\r
\r
- .JoystickEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.JoystickHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_JoystickHID;\r
Size = sizeof(USB_Descriptor_HID_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_HID_t JoystickHID;\r
- USB_Descriptor_Endpoint_t JoystickEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_Descriptor_HID_t HID_JoystickHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .KeyboardHID = \r
+ .HID_KeyboardHID = \r
{ \r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(KeyboardReport)\r
},\r
\r
- .KeyboardEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x0A\r
},\r
\r
- .KeyboardLEDsEndpoint = \r
+ .HID_ReportOUTEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_KeyboardHID;\r
Size = sizeof(USB_Descriptor_HID_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_HID_t KeyboardHID;\r
- USB_Descriptor_Endpoint_t KeyboardEndpoint;\r
- USB_Descriptor_Endpoint_t KeyboardLEDsEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_Descriptor_HID_t HID_KeyboardHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
+ USB_Descriptor_Endpoint_t HID_ReportOUTEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .KeyboardInterface = \r
+ .HID1_KeyboardInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .KeyboardHID = \r
+ .HID1_KeyboardHID = \r
{ \r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(KeyboardReport)\r
},\r
\r
- .KeyboardInEndpoint = \r
+ .HID1_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x0A\r
},\r
\r
- .KeyboardOutEndpoint = \r
+ .HID1_ReportOUTEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x0A\r
},\r
\r
- .MouseInterface = \r
+ .HID2_MouseInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MouseHID = \r
+ .HID2_MouseHID = \r
{ \r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(MouseReport)\r
},\r
\r
- .MouseInEndpoint = \r
+ .HID2_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
case DTYPE_HID: \r
if (!(wIndex))\r
{\r
- Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID1_KeyboardHID;\r
Size = sizeof(USB_Descriptor_HID_t);\r
}\r
else\r
{\r
- Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID2_MouseHID;\r
Size = sizeof(USB_Descriptor_HID_t); \r
}\r
break;\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t KeyboardInterface;\r
- USB_Descriptor_HID_t KeyboardHID;\r
- USB_Descriptor_Endpoint_t KeyboardInEndpoint;\r
- USB_Descriptor_Endpoint_t KeyboardOutEndpoint;\r
- USB_Descriptor_Interface_t MouseInterface;\r
- USB_Descriptor_HID_t MouseHID;\r
- USB_Descriptor_Endpoint_t MouseInEndpoint;\r
+ USB_Descriptor_Interface_t HID1_KeyboardInterface;\r
+ USB_Descriptor_HID_t HID1_KeyboardHID;\r
+ USB_Descriptor_Endpoint_t HID1_ReportINEndpoint;\r
+ USB_Descriptor_Endpoint_t HID1_ReportOUTEndpoint;\r
+ USB_Descriptor_Interface_t HID2_MouseInterface;\r
+ USB_Descriptor_HID_t HID2_MouseHID;\r
+ USB_Descriptor_Endpoint_t HID2_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AudioControlInterface = \r
+ .Audio_ControlInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR \r
},\r
\r
- .AudioControlInterface_SPC = \r
+ .Audio_ControlInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_Header,\r
.InterfaceNumbers = {1}, \r
},\r
\r
- .AudioStreamInterface = \r
+ .Audio_StreamInterface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .AudioStreamInterface_SPC = \r
+ .Audio_StreamInterface_SPC = \r
{\r
.Header = {.Size = sizeof(USB_Audio_Interface_MIDI_AS_t), .Type = DTYPE_AudioInterface},\r
.Subtype = DSUBTYPE_General,\r
\r
.AudioSpecification = VERSION_BCD(01.00),\r
\r
- .TotalLength = (sizeof(USB_Descriptor_Configuration_t) - offsetof(USB_Descriptor_Configuration_t, AudioStreamInterface_SPC))\r
+ .TotalLength = (sizeof(USB_Descriptor_Configuration_t) -\r
+ offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))\r
},\r
\r
.MIDI_In_Jack_Emb = \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AudioControlInterface;\r
- USB_Audio_Interface_AC_t AudioControlInterface_SPC;\r
- USB_Descriptor_Interface_t AudioStreamInterface;\r
- USB_Audio_Interface_MIDI_AS_t AudioStreamInterface_SPC;\r
+ USB_Descriptor_Interface_t Audio_ControlInterface;\r
+ USB_Audio_Interface_AC_t Audio_ControlInterface_SPC;\r
+ USB_Descriptor_Interface_t Audio_StreamInterface;\r
+ USB_Audio_Interface_MIDI_AS_t Audio_StreamInterface_SPC;\r
USB_MIDI_In_Jack_t MIDI_In_Jack_Emb;\r
USB_MIDI_In_Jack_t MIDI_In_Jack_Ext;\r
USB_MIDI_Out_Jack_t MIDI_Out_Jack_Emb;\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .MS_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataInEndpoint = \r
+ .MS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataOutEndpoint = \r
+ .MS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
+ USB_Descriptor_Interface_t MS_Interface;\r
+ USB_Descriptor_Endpoint_t MS_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t MS_DataOutEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MouseHID = \r
+ .HID_MouseHID = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(MouseReport)\r
},\r
\r
- .MouseEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_MouseHID;\r
Size = sizeof(USB_Descriptor_HID_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_HID_t MouseHID;\r
- USB_Descriptor_Endpoint_t MouseEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_Descriptor_HID_t HID_MouseHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x02\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .RNDIS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .RNDIS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Header;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t RNDIS_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t RNDIS_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0xFF\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MouseHID = \r
+ .HID_MouseHID = \r
{\r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(MouseReport)\r
},\r
\r
- .MouseEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_MouseHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_HID_Descriptor_t MouseHID;\r
- USB_Descriptor_Endpoint_t MouseEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_HID_Descriptor_t HID_MouseHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
(ReportItem->Attributes.Usage.Usage == USAGE_SCROLL_WHEEL) &&\r
(ReportItem->ItemType == REPORT_ITEM_TYPE_In))\r
{\r
- int16_t WheelDelta = HID_ALIGN_DATA(ReportItem->Value, int16_t);\r
+ int16_t WheelDelta = HID_ALIGN_DATA(ReportItem, int16_t);\r
\r
if (WheelDelta)\r
LEDMask = (LEDS_LED1 | LEDS_LED2 | ((WheelDelta > 0) ? LEDS_LED3 : LEDS_LED4));\r
(ReportItem->Attributes.Usage.Usage == USAGE_Y)) &&\r
(ReportItem->ItemType == REPORT_ITEM_TYPE_In))\r
{\r
- int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem->Value, int16_t);\r
+ int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);\r
\r
if (ReportItem->Attributes.Usage.Usage == USAGE_X)\r
{\r
* - Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable the TELNET server if desired\r
* - Increased throughput of the USBtoSerial demo on systems that send multiple bytes per packet (thanks to Opendous Inc.)\r
* - Double bank CDC endpoints in the XPLAIN Bridge project, re-enable JTAG once the mode selection pin has been sampled.\r
+ * - Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders\r
+ * and projects\r
*\r
* <b>Fixed:</b>\r
* - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AVRISPInterface = \r
+ .AVRISP_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataInEndpoint = \r
+ .AVRISP_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataOutEndpoint =\r
+ .AVRISP_DataOutEndpoint =\r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AVRISPInterface;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
+ USB_Descriptor_Interface_t AVRISP_Interface;\r
+ USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t AVRISP_DataOutEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0xFF\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .MSInterface = \r
+ .MS_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MSDataInEndpoint = \r
+ .MS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .MSDataOutEndpoint = \r
+ .MS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t MSInterface;\r
- USB_Descriptor_Endpoint_t MSDataInEndpoint;\r
- USB_Descriptor_Endpoint_t MSDataOutEndpoint;\r
+ USB_Descriptor_Interface_t MS_Interface;\r
+ USB_Descriptor_Endpoint_t MS_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t MS_DataOutEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0xFF\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .KeyboardHID = \r
+ .HID_KeyboardHID = \r
{ \r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(KeyboardReport)\r
},\r
\r
- .KeyboardEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID:\r
- Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+ Address = (void*)&ConfigurationDescriptor.HID_KeyboardHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report:\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */\r
- USB_Descriptor_Interface_t Interface; /**< Keyboard interface descriptor */\r
- USB_HID_Descriptor_t KeyboardHID; /**< Keyboard HID descriptor */\r
- USB_Descriptor_Endpoint_t KeyboardEndpoint; /**< Keyboard key report endpoint descriptor */\r
+ USB_Descriptor_Interface_t HID_Interface; /**< Keyboard interface descriptor */\r
+ USB_HID_Descriptor_t HID_KeyboardHID; /**< Keyboard HID descriptor */\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint; /**< Keyboard key report endpoint descriptor */\r
} USB_Descriptor_Configuration_t;\r
\r
/* Macros: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .MSInterface = \r
+ .MS_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MSDataInEndpoint = \r
+ .MS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .MSDataOutEndpoint = \r
+ .MS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .HIDInterface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .HIDInfo = \r
+ .HID_GenericHID = \r
{\r
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
.HIDReportLength = sizeof(GenericReport)\r
},\r
\r
- .HIDDataInEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
\r
break;\r
case DTYPE_HID: \r
- Address = (void*)&ConfigurationDescriptor.HIDInfo;\r
+ Address = (void*)&ConfigurationDescriptor.HID_GenericHID;\r
Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report: \r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t MSInterface;\r
- USB_Descriptor_Endpoint_t MSDataInEndpoint;\r
- USB_Descriptor_Endpoint_t MSDataOutEndpoint;\r
- USB_Descriptor_Interface_t HIDInterface;\r
- USB_HID_Descriptor_t HIDInfo;\r
- USB_Descriptor_Endpoint_t HIDDataInEndpoint;\r
+ USB_Descriptor_Interface_t MS_Interface;\r
+ USB_Descriptor_Endpoint_t MS_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t MS_DataOutEndpoint;\r
+ USB_Descriptor_Interface_t HID_Interface;\r
+ USB_HID_Descriptor_t HID_GenericHID;\r
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0xFF\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .Interface = \r
+ .MS_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataInEndpoint = \r
+ .MS_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataOutEndpoint = \r
+ .MS_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t Interface;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
+ USB_Descriptor_Interface_t MS_Interface;\r
+ USB_Descriptor_Endpoint_t MS_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t MS_DataOutEndpoint;\r
} USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .AVRISPInterface = \r
+ .AVRISP_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataInEndpoint = \r
+ .AVRISP_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataOutEndpoint =\r
+ .AVRISP_DataOutEndpoint =\r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t AVRISPInterface;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
+ USB_Descriptor_Interface_t AVRISP_Interface;\r
+ USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t AVRISP_DataOutEndpoint;\r
} AVRISP_USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- .CCI_Interface = \r
+ .CDC_CCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.Data = {0x00, 0x01}\r
},\r
\r
- .ManagementEndpoint = \r
+ .CDC_ManagementEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0xFF\r
},\r
\r
- .DCI_Interface = \r
+ .CDC_DCI_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .DataOutEndpoint = \r
+ .CDC_DataOutEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.PollingIntervalMS = 0x00\r
},\r
\r
- .DataInEndpoint = \r
+ .CDC_DataInEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
typedef struct\r
{\r
USB_Descriptor_Configuration_Header_t Config;\r
- USB_Descriptor_Interface_t CCI_Interface;\r
+ USB_Descriptor_Interface_t CDC_CCI_Interface;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;\r
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;\r
- USB_Descriptor_Endpoint_t ManagementEndpoint;\r
- USB_Descriptor_Interface_t DCI_Interface;\r
- USB_Descriptor_Endpoint_t DataOutEndpoint;\r
- USB_Descriptor_Endpoint_t DataInEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;\r
+ USB_Descriptor_Interface_t CDC_DCI_Interface;\r
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;\r
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;\r
} USART_USB_Descriptor_Configuration_t;\r
\r
/* Function Prototypes: */\r
* \section SSec_Description Project Description: \r
*\r
* This project serves a dual purpose. When loaded into the USB AVR on the XPLAIN board, it will act as either a USB to Serial\r
- * converter for the XPLAIN's hardware USART (at a speed of 9600 baud), or a PDI programmer for the XMEGA. This project replaces\r
- * the firmware preloaded onto the XPLAIN's onboard AT90USB1287 microcontroller.\r
+ * converter for the XPLAIN's hardware USART (at a speed of 9600 baud), or an AVRStudio compaible PDI programmer for the XMEGA.\r
+ * This project replaces the firmware preloaded onto the XPLAIN's onboard AT90USB1287 microcontroller.\r
*\r
- * When inserted, the JTAG port's TDI pin is read. If the pin is left high, the device will enumerate as a regular COM port on\r
- * the host, which can then be opened and data exchanged between the XMEGA and Host as if the XMEGA was connected directly to\r
- * the host's serial port. If the pin is pulled low, the device will enumerate as an AVRISP-MKII to the host, so that the XMEGA\r
- * can be reprogrammed by AVRStudio or other compatible software such as avrdude.\r
+ * When power to the board is applied, the TDI pin (pin 9) of the USB AVR's JTAG port is read. If the pin is left high, the device\r
+ * will enumerate as a regular COM port on the host, which can then be opened and data exchanged between the XMEGA and Host as if\r
+ * the XMEGA was connected directly to the host's serial port. If the pin is pulled low by shorting it to GND (pin 10), the device\r
+ * will enumerate as an AVRISP-MKII to the host, so that the XMEGA can be reprogrammed by AVRStudio or other compatible software\r
+ * such as avrdude.\r
*\r
* After running this project for the first time on a new computer, you will need to supply the .INF file located in this project\r
* project's directory as the device's driver when running under Windows. This will enable Windows to use its inbuilt CDC drivers,\r
* negating the need for custom drivers for the device. Other Operating Systems should automatically use their own inbuilt CDC-ACM\r
* drivers.\r
*\r
- * This project relies on files from the LUFA AVRISP-MKII project.\r
+ * This project relies on files from the LUFA AVRISP-MKII project for compilation.\r
*\r
* \section SSec_Options Project Options\r
*\r
projects / pub / USBasp.git / commitdiff