/*\r
LUFA Library\r
Copyright (C) Dean Camera, 2010.\r
- \r
+\r
dean [at] fourwalledcubicle [dot] com\r
- www.fourwalledcubicle.com\r
+ www.lufa-lib.org\r
*/\r
\r
/*\r
Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
\r
- Permission to use, copy, modify, distribute, and sell this \r
+ Permission to use, copy, modify, distribute, and sell this\r
software and its documentation for any purpose is hereby granted\r
- without fee, provided that the above copyright notice appear in \r
+ without fee, provided that the above copyright notice appear in\r
all copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting \r
- documentation, and that the name of the author not be used in \r
- advertising or publicity pertaining to distribution of the \r
+ permission notice and warranty disclaimer appear in supporting\r
+ documentation, and that the name of the author not be used in\r
+ advertising or publicity pertaining to distribution of the\r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
\r
/** \file\r
*\r
- * USB Device Descriptors, for library use when in USB device mode. Descriptors are special \r
+ * USB Device Descriptors, for library use when in USB device mode. Descriptors are special\r
* computer-readable structures which the host requests upon device enumeration, to determine\r
- * the device's capabilities and functions. \r
+ * the device's capabilities and functions.\r
*/\r
- \r
+\r
#include "Descriptors.h"\r
\r
/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall\r
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =\r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},\r
- \r
+\r
.USBSpecification = VERSION_BCD(01.10),\r
- .Class = 0x00,\r
- .SubClass = 0x00,\r
- .Protocol = 0x00,\r
- \r
+ .Class = USB_CSCP_NoDeviceClass,\r
+ .SubClass = USB_CSCP_NoDeviceSubclass,\r
+ .Protocol = USB_CSCP_NoDeviceProtocol,\r
+\r
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,\r
- \r
+\r
.VendorID = 0x03EB,\r
.ProductID = 0x2048,\r
- .ReleaseNumber = 0x0000,\r
- \r
+ .ReleaseNumber = VERSION_BCD(00.01),\r
+\r
.ManufacturerStrIndex = 0x01,\r
.ProductStrIndex = 0x02,\r
.SerialNumStrIndex = NO_DESCRIPTOR,\r
- \r
+\r
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r
};\r
\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
\r
.ConfigurationNumber = 1,\r
.ConfigurationStrIndex = NO_DESCRIPTOR,\r
- \r
+\r
.ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),\r
- \r
+\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
- \r
- .Audio_ControlInterface = \r
+\r
+ .Audio_ControlInterface =\r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceNumber = 0,\r
.AlternateSetting = 0,\r
- \r
+\r
.TotalEndpoints = 0,\r
- \r
- .Class = 0x01,\r
- .SubClass = 0x01,\r
- .Protocol = 0x00,\r
- \r
+\r
+ .Class = AUDIO_CSCP_AudioClass,\r
+ .SubClass = AUDIO_CSCP_ControlSubclass,\r
+ .Protocol = AUDIO_CSCP_ControlProtocol,\r
+\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
- \r
- .Audio_ControlInterface_SPC = \r
+\r
+ .Audio_ControlInterface_SPC =\r
{\r
- .Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
- .Subtype = DSUBTYPE_Header,\r
- \r
+ .Header = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_CSInterface},\r
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_Header,\r
+\r
.ACSpecification = VERSION_BCD(01.00),\r
- .TotalLength = sizeof(USB_Audio_Interface_AC_t),\r
- \r
+ .TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),\r
+\r
.InCollection = 1,\r
- .InterfaceNumbers = {1},\r
+ .InterfaceNumber = 1,\r
},\r
\r
- .Audio_StreamInterface = \r
+ .Audio_StreamInterface =\r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceNumber = 1,\r
.AlternateSetting = 0,\r
- \r
+\r
.TotalEndpoints = 2,\r
- \r
- .Class = 0x01,\r
- .SubClass = 0x03,\r
- .Protocol = 0x00,\r
- \r
+\r
+ .Class = AUDIO_CSCP_AudioClass,\r
+ .SubClass = AUDIO_CSCP_MIDIStreamingSubclass,\r
+ .Protocol = AUDIO_CSCP_StreamingProtocol,\r
+\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
- \r
- .Audio_StreamInterface_SPC = \r
+\r
+ .Audio_StreamInterface_SPC =\r
{\r
- .Header = {.Size = sizeof(USB_MIDI_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},\r
- .Subtype = DSUBTYPE_General,\r
+ .Header = {.Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t), .Type = DTYPE_CSInterface},\r
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_General,\r
\r
.AudioSpecification = VERSION_BCD(01.00),\r
- \r
+\r
.TotalLength = (sizeof(USB_Descriptor_Configuration_t) -\r
offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))\r
},\r
\r
- .MIDI_In_Jack_Emb = \r
+ .MIDI_In_Jack_Emb =\r
{\r
- .Header = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
- .Subtype = DSUBTYPE_InputJack,\r
- \r
- .JackType = MIDI_JACKTYPE_EMBEDDED,\r
+ .Header = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},\r
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal,\r
+\r
+ .JackType = MIDI_JACKTYPE_Embedded,\r
.JackID = 0x01,\r
- \r
+\r
.JackStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MIDI_In_Jack_Ext = \r
+ .MIDI_In_Jack_Ext =\r
{\r
- .Header = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
- .Subtype = DSUBTYPE_InputJack,\r
- \r
- .JackType = MIDI_JACKTYPE_EXTERNAL,\r
+ .Header = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},\r
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal,\r
+\r
+ .JackType = MIDI_JACKTYPE_External,\r
.JackID = 0x02,\r
- \r
+\r
.JackStrIndex = NO_DESCRIPTOR\r
},\r
- \r
- .MIDI_Out_Jack_Emb = \r
+\r
+ .MIDI_Out_Jack_Emb =\r
{\r
- .Header = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
- .Subtype = DSUBTYPE_OutputJack,\r
- \r
- .JackType = MIDI_JACKTYPE_EMBEDDED,\r
+ .Header = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},\r
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,\r
+\r
+ .JackType = MIDI_JACKTYPE_Embedded,\r
.JackID = 0x03,\r
\r
.NumberOfPins = 1,\r
.SourceJackID = {0x02},\r
.SourcePinID = {0x01},\r
- \r
+\r
.JackStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MIDI_Out_Jack_Ext = \r
+ .MIDI_Out_Jack_Ext =\r
{\r
- .Header = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
- .Subtype = DSUBTYPE_OutputJack,\r
- \r
- .JackType = MIDI_JACKTYPE_EXTERNAL,\r
+ .Header = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},\r
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,\r
+\r
+ .JackType = MIDI_JACKTYPE_External,\r
.JackID = 0x04,\r
\r
.NumberOfPins = 1,\r
.SourceJackID = {0x01},\r
.SourcePinID = {0x01},\r
- \r
+\r
.JackStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .MIDI_In_Jack_Endpoint = \r
+ .MIDI_In_Jack_Endpoint =\r
{\r
- .Endpoint = \r
+ .Endpoint =\r
{\r
- .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},\r
+ .Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},\r
\r
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | MIDI_STREAM_OUT_EPNUM),\r
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
.EndpointSize = MIDI_STREAM_EPSIZE,\r
- .PollingIntervalMS = 0\r
+ .PollingIntervalMS = 0x01\r
},\r
- \r
+\r
.Refresh = 0,\r
.SyncEndpointNumber = 0\r
},\r
- \r
- .MIDI_In_Jack_Endpoint_SPC = \r
+\r
+ .MIDI_In_Jack_Endpoint_SPC =\r
{\r
- .Header = {.Size = sizeof(USB_MIDI_Jack_Endpoint_t), .Type = DTYPE_AudioEndpoint},\r
- .Subtype = DSUBTYPE_General,\r
+ .Header = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},\r
+ .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General,\r
\r
.TotalEmbeddedJacks = 0x01,\r
.AssociatedJackID = {0x01}\r
},\r
\r
- .MIDI_Out_Jack_Endpoint = \r
+ .MIDI_Out_Jack_Endpoint =\r
{\r
- .Endpoint = \r
+ .Endpoint =\r
{\r
- .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},\r
+ .Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},\r
\r
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | MIDI_STREAM_IN_EPNUM),\r
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
.EndpointSize = MIDI_STREAM_EPSIZE,\r
- .PollingIntervalMS = 0\r
+ .PollingIntervalMS = 0x01\r
},\r
- \r
+\r
.Refresh = 0,\r
.SyncEndpointNumber = 0\r
},\r
- \r
- .MIDI_Out_Jack_Endpoint_SPC = \r
+\r
+ .MIDI_Out_Jack_Endpoint_SPC =\r
{\r
- .Header = {.Size = sizeof(USB_MIDI_Jack_Endpoint_t), .Type = DTYPE_AudioEndpoint},\r
- .Subtype = DSUBTYPE_General,\r
+ .Header = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},\r
+ .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General,\r
\r
.TotalEmbeddedJacks = 0x01,\r
.AssociatedJackID = {0x03}\r
USB_Descriptor_String_t PROGMEM LanguageString =\r
{\r
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},\r
- \r
+\r
.UnicodeString = {LANGUAGE_ID_ENG}\r
};\r
\r
USB_Descriptor_String_t PROGMEM ManufacturerString =\r
{\r
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},\r
- \r
+\r
.UnicodeString = L"Dean Camera"\r
};\r
\r
USB_Descriptor_String_t PROGMEM ProductString =\r
{\r
.Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},\r
- \r
+\r
.UnicodeString = L"LUFA MIDI Demo"\r
};\r
\r
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
* USB host.\r
*/\r
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,\r
+ const uint8_t wIndex,\r
+ const void** const DescriptorAddress)\r
{\r
const uint8_t DescriptorType = (wValue >> 8);\r
const uint8_t DescriptorNumber = (wValue & 0xFF);\r
\r
- void* Address = NULL;\r
- uint16_t Size = NO_DESCRIPTOR;\r
+ const void* Address = NULL;\r
+ uint16_t Size = NO_DESCRIPTOR;\r
\r
switch (DescriptorType)\r
{\r
- case DTYPE_Device: \r
- Address = (void*)&DeviceDescriptor;\r
+ case DTYPE_Device:\r
+ Address = &DeviceDescriptor;\r
Size = sizeof(USB_Descriptor_Device_t);\r
break;\r
- case DTYPE_Configuration: \r
- Address = (void*)&ConfigurationDescriptor;\r
+ case DTYPE_Configuration:\r
+ Address = &ConfigurationDescriptor;\r
Size = sizeof(USB_Descriptor_Configuration_t);\r
break;\r
- case DTYPE_String: \r
+ case DTYPE_String:\r
switch (DescriptorNumber)\r
{\r
- case 0x00: \r
- Address = (void*)&LanguageString;\r
+ case 0x00:\r
+ Address = &LanguageString;\r
Size = pgm_read_byte(&LanguageString.Header.Size);\r
break;\r
- case 0x01: \r
- Address = (void*)&ManufacturerString;\r
+ case 0x01:\r
+ Address = &ManufacturerString;\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);\r
break;\r
- case 0x02: \r
- Address = (void*)&ProductString;\r
+ case 0x02:\r
+ Address = &ProductString;\r
Size = pgm_read_byte(&ProductString.Header.Size);\r
break;\r
}\r
- \r
+\r
break;\r
}\r
- \r
+\r
*DescriptorAddress = Address;\r
return Size;\r
}\r
+\r
projects / pub / lufa.git / blobdiff