projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...
[pub/USBasp.git]
/
Demos
/
Device
/
ClassDriver
/
AudioInput
/
Descriptors.c
diff --git
a/Demos/Device/ClassDriver/AudioInput/Descriptors.c
b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
index
2a58064
..
b65d747
100644
(file)
--- a/
Demos/Device/ClassDriver/AudioInput/Descriptors.c
+++ b/
Demos/Device/ClassDriver/AudioInput/Descriptors.c
@@
-1,24
+1,24
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
0
.
-
+ Copyright (C) Dean Camera, 201
3
.
+
dean [at] fourwalledcubicle [dot] com
dean [at] fourwalledcubicle [dot] com
- www.fourwalledcubicle.com
+ www.lufa-lib.org
*/
/*
*/
/*
- Copyright 201
0
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
3
Dean Camera (dean [at] fourwalledcubicle [dot] com)
- Permission to use, copy, modify, distribute, and sell this
+ Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
software and its documentation for any purpose is hereby granted
- without fee, provided that the above copyright notice appear in
+ without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this
all copies and that both that the copyright notice and this
- permission notice and warranty disclaimer appear in supporting
- documentation, and that the name of the author not be used in
- advertising or publicity pertaining to distribution of the
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
software without specific, written prior permission.
- The author disclaim all warranties with regard to this
+ The author disclaim
s
all warranties with regard to this
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
@@
-30,11
+30,11
@@
/** \file
*
/** \file
*
- * USB Device Descriptors, for library use when in USB device mode. Descriptors are special
+ * USB Device Descriptors, for library use when in USB device mode. Descriptors are special
* computer-readable structures which the host requests upon device enumeration, to determine
* computer-readable structures which the host requests upon device enumeration, to determine
- * the device's capabilities and functions.
+ * the device's capabilities and functions.
*/
*/
-
+
#include "Descriptors.h"
/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
#include "Descriptors.h"
/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
@@
-42,23
+42,23
@@
* number of device configurations. The descriptor is read out by the USB host when the enumeration
* process begins.
*/
* number of device configurations. The descriptor is read out by the USB host when the enumeration
* process begins.
*/
-USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+
const
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
.USBSpecification = VERSION_BCD(02.00),
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
.USBSpecification = VERSION_BCD(02.00),
- .Class =
0x00
,
- .SubClass =
0x00
,
- .Protocol =
0x00
,
+ .Class =
USB_CSCP_NoDeviceClass
,
+ .SubClass =
USB_CSCP_NoDeviceSubclass
,
+ .Protocol =
USB_CSCP_NoDeviceProtocol
,
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
.VendorID = 0x03EB,
.ProductID = 0x2047,
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
.VendorID = 0x03EB,
.ProductID = 0x2047,
- .ReleaseNumber =
0x0000
,
+ .ReleaseNumber =
VERSION_BCD(00.02)
,
- .ManufacturerStrIndex =
0x01
,
- .ProductStrIndex =
0x02
,
+ .ManufacturerStrIndex =
STRING_ID_Manufacturer
,
+ .ProductStrIndex =
STRING_ID_Product
,
.SerialNumStrIndex = NO_DESCRIPTOR,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
.SerialNumStrIndex = NO_DESCRIPTOR,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
@@
-69,9
+69,9
@@
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
* and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
* a configuration so that the host may correctly communicate with the USB device.
*/
* and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
* a configuration so that the host may correctly communicate with the USB device.
*/
-USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+
const
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
{
- .Config =
+ .Config =
{
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
{
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
@@
-81,48
+81,48
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
.ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
- .ConfigAttributes = (USB_CONFIG_ATTR_
BUSPOWER
ED | USB_CONFIG_ATTR_SELFPOWERED),
+ .ConfigAttributes = (USB_CONFIG_ATTR_
RESERV
ED | USB_CONFIG_ATTR_SELFPOWERED),
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
- .Audio_ControlInterface =
+ .Audio_ControlInterface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- .InterfaceNumber =
0
,
+ .InterfaceNumber =
INTERFACE_ID_AudioControl
,
.AlternateSetting = 0,
.AlternateSetting = 0,
-
+
.TotalEndpoints = 0,
.TotalEndpoints = 0,
- .Class =
0x01
,
- .SubClass =
0x01
,
- .Protocol =
0x00
,
+ .Class =
AUDIO_CSCP_AudioClass
,
+ .SubClass =
AUDIO_CSCP_ControlSubclass
,
+ .Protocol =
AUDIO_CSCP_ControlProtocol
,
.InterfaceStrIndex = NO_DESCRIPTOR
},
.InterfaceStrIndex = NO_DESCRIPTOR
},
- .Audio_ControlInterface_SPC =
+ .Audio_ControlInterface_SPC =
{
{
- .Header = {.Size = sizeof(USB_Audio_
Interface_AC_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE
_Header,
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_Interface_AC_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface
_Header,
.ACSpecification = VERSION_BCD(01.00),
.ACSpecification = VERSION_BCD(01.00),
- .TotalLength = (sizeof(USB_Audio_Interface_AC_t) +
- sizeof(USB_Audio_InputTerminal_t) +
- sizeof(USB_Audio_OutputTerminal_t)),
-
+ .TotalLength = (sizeof(USB_Audio_
Descriptor_
Interface_AC_t) +
+ sizeof(USB_Audio_
Descriptor_
InputTerminal_t) +
+ sizeof(USB_Audio_
Descriptor_
OutputTerminal_t)),
+
.InCollection = 1,
.InCollection = 1,
- .InterfaceNumber
s = {1}
,
+ .InterfaceNumber
= INTERFACE_ID_AudioStream
,
},
},
- .Audio_InputTerminal =
+ .Audio_InputTerminal =
{
{
- .Header = {.Size = sizeof(USB_Audio_
InputTerminal_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE
_InputTerminal,
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_InputTerminal_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface
_InputTerminal,
.TerminalID = 0x01,
.TerminalID = 0x01,
- .TerminalType = TERMINAL_IN_MIC,
+ .TerminalType =
AUDIO_
TERMINAL_IN_MIC,
.AssociatedOutputTerminal = 0x00,
.TotalChannels = 1,
.AssociatedOutputTerminal = 0x00,
.TotalChannels = 1,
@@
-132,13
+132,13
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TerminalStrIndex = NO_DESCRIPTOR
},
.TerminalStrIndex = NO_DESCRIPTOR
},
- .Audio_OutputTerminal =
+ .Audio_OutputTerminal =
{
{
- .Header = {.Size = sizeof(USB_Audio_
OutputTerminal_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE
_OutputTerminal,
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_OutputTerminal_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface
_OutputTerminal,
.TerminalID = 0x02,
.TerminalID = 0x02,
- .TerminalType = TERMINAL_STREAMING,
+ .TerminalType =
AUDIO_
TERMINAL_STREAMING,
.AssociatedInputTerminal = 0x00,
.SourceID = 0x01,
.AssociatedInputTerminal = 0x00,
.SourceID = 0x01,
@@
-146,42
+146,42
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TerminalStrIndex = NO_DESCRIPTOR
},
.TerminalStrIndex = NO_DESCRIPTOR
},
- .Audio_StreamInterface_Alt0 =
+ .Audio_StreamInterface_Alt0 =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- .InterfaceNumber =
1
,
+ .InterfaceNumber =
INTERFACE_ID_AudioStream
,
.AlternateSetting = 0,
.TotalEndpoints = 0,
.AlternateSetting = 0,
.TotalEndpoints = 0,
- .Class =
0x01
,
- .SubClass =
0x02
,
- .Protocol =
0x00
,
+ .Class =
AUDIO_CSCP_AudioClass
,
+ .SubClass =
AUDIO_CSCP_AudioStreamingSubclass
,
+ .Protocol =
AUDIO_CSCP_StreamingProtocol
,
.InterfaceStrIndex = NO_DESCRIPTOR
},
.InterfaceStrIndex = NO_DESCRIPTOR
},
- .Audio_StreamInterface_Alt1 =
+ .Audio_StreamInterface_Alt1 =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- .InterfaceNumber =
1
,
+ .InterfaceNumber =
INTERFACE_ID_AudioStream
,
.AlternateSetting = 1,
.TotalEndpoints = 1,
.AlternateSetting = 1,
.TotalEndpoints = 1,
- .Class =
0x01
,
- .SubClass =
0x02
,
- .Protocol =
0x00
,
+ .Class =
AUDIO_CSCP_AudioClass
,
+ .SubClass =
AUDIO_CSCP_AudioStreamingSubclass
,
+ .Protocol =
AUDIO_CSCP_StreamingProtocol
,
.InterfaceStrIndex = NO_DESCRIPTOR
},
.InterfaceStrIndex = NO_DESCRIPTOR
},
- .Audio_StreamInterface_SPC =
+ .Audio_StreamInterface_SPC =
{
{
- .Header = {.Size = sizeof(USB_Audio_
Interface_AS_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE
_General,
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_Interface_AS_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface
_General,
.TerminalLink = 0x02,
.TerminalLink = 0x02,
@@
-189,44
+189,54
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.AudioFormat = 0x0001
},
.AudioFormat = 0x0001
},
- .Audio_AudioFormat =
+ .Audio_AudioFormat =
{
{
- .Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},
- .Subtype = DSUBTYPE_Format,
+ .Header = {.Size = sizeof(USB_Audio_Descriptor_Format_t) +
+ sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates),
+ .Type = DTYPE_CSInterface},
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_FormatType,
.FormatType = 0x01,
.Channels = 0x01,
.FormatType = 0x01,
.Channels = 0x01,
-
+
.SubFrameSize = 0x02,
.BitResolution = 16,
.SubFrameSize = 0x02,
.BitResolution = 16,
- .SampleFrequencyType = AUDIO_TOTAL_SAMPLE_RATES,
-
- .SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}
+
+ .TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t))
},
},
-
- .Audio_
StreamEndpoint =
+
+ .Audio_
AudioFormatSampleRates =
{
{
- .Endpoint =
+ AUDIO_SAMPLE_FREQ(8000),
+ AUDIO_SAMPLE_FREQ(11025),
+ AUDIO_SAMPLE_FREQ(22050),
+ AUDIO_SAMPLE_FREQ(44100),
+ AUDIO_SAMPLE_FREQ(48000),
+ },
+
+ .Audio_StreamEndpoint =
+ {
+ .Endpoint =
{
{
- .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_
StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
- .EndpointAddress =
(ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM)
,
+ .EndpointAddress =
AUDIO_STREAM_EPADDR
,
.Attributes = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = AUDIO_STREAM_EPSIZE,
.Attributes = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = AUDIO_STREAM_EPSIZE,
- .PollingIntervalMS = 1
+ .PollingIntervalMS =
0x0
1
},
},
-
+
.Refresh = 0,
.SyncEndpointNumber = 0
},
.Refresh = 0,
.SyncEndpointNumber = 0
},
-
- .Audio_StreamEndpoint_SPC =
+
+ .Audio_StreamEndpoint_SPC =
{
{
- .Header = {.Size = sizeof(USB_Audio_
StreamEndpoint_Spc_t), .Type = DTYPE_Audio
Endpoint},
- .Subtype =
DSUBTYPE
_General,
-
- .Attributes =
0x00
,
-
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_StreamEndpoint_Spc_t), .Type = DTYPE_CS
Endpoint},
+ .Subtype =
AUDIO_DSUBTYPE_CSEndpoint
_General,
+
+ .Attributes =
(AUDIO_EP_ACCEPTS_SMALL_PACKETS | AUDIO_EP_SAMPLE_FREQ_CONTROL)
,
+
.LockDelayUnits = 0x00,
.LockDelay = 0x0000
}
.LockDelayUnits = 0x00,
.LockDelay = 0x0000
}
@@
-236,7
+246,7
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
* the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
* via the language ID table available at USB.org what languages the device supports for its string descriptors.
*/
* the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
* via the language ID table available at USB.org what languages the device supports for its string descriptors.
*/
-USB_Descriptor_String_t PROGMEM LanguageString =
+
const
USB_Descriptor_String_t PROGMEM LanguageString =
{
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
{
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
@@
-247,7
+257,7
@@
USB_Descriptor_String_t PROGMEM LanguageString =
* form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
* form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
-USB_Descriptor_String_t PROGMEM ManufacturerString =
+
const
USB_Descriptor_String_t PROGMEM ManufacturerString =
{
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
{
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
@@
-258,7
+268,7
@@
USB_Descriptor_String_t PROGMEM ManufacturerString =
* and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
* and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
-USB_Descriptor_String_t PROGMEM ProductString =
+
const
USB_Descriptor_String_t PROGMEM ProductString =
{
.Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},
{
.Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},
@@
-273,44
+283,45
@@
USB_Descriptor_String_t PROGMEM ProductString =
*/
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
*/
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
- void** const DescriptorAddress)
+
const
void** const DescriptorAddress)
{
const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF);
{
const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF);
-
void*
Address = NULL;
- uint16_t Size = NO_DESCRIPTOR;
+
const void*
Address = NULL;
+ uint16_t
Size = NO_DESCRIPTOR;
switch (DescriptorType)
{
case DTYPE_Device:
switch (DescriptorType)
{
case DTYPE_Device:
- Address =
(void*)
&DeviceDescriptor;
+ Address = &DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t);
break;
Size = sizeof(USB_Descriptor_Device_t);
break;
- case DTYPE_Configuration:
- Address =
(void*)
&ConfigurationDescriptor;
+ case DTYPE_Configuration:
+ Address = &ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t);
break;
Size = sizeof(USB_Descriptor_Configuration_t);
break;
- case DTYPE_String:
+ case DTYPE_String:
switch (DescriptorNumber)
{
switch (DescriptorNumber)
{
- case
0x00:
- Address =
(void*)
&LanguageString;
+ case
STRING_ID_Language:
+ Address = &LanguageString;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
- case
0x01:
- Address =
(void*)
&ManufacturerString;
+ case
STRING_ID_Manufacturer:
+ Address = &ManufacturerString;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
- case
0x02:
- Address =
(void*)
&ProductString;
+ case
STRING_ID_Product:
+ Address = &ProductString;
Size = pgm_read_byte(&ProductString.Header.Size);
break;
}
Size = pgm_read_byte(&ProductString.Header.Size);
break;
}
-
+
break;
}
break;
}
-
+
*DescriptorAddress = Address;
return Size;
}
*DescriptorAddress = Address;
return Size;
}
+
projects / pub / USBasp.git / blobdiff