projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation improvements - put driver example code into its own section, fix incorr...
[pub/USBasp.git]
/
Demos
/
Device
/
LowLevel
/
MIDI
/
Descriptors.c
diff --git
a/Demos/Device/LowLevel/MIDI/Descriptors.c
b/Demos/Device/LowLevel/MIDI/Descriptors.c
index
cc1f2ef
..
e556f07
100644
(file)
--- a/
Demos/Device/LowLevel/MIDI/Descriptors.c
+++ b/
Demos/Device/LowLevel/MIDI/Descriptors.c
@@
-1,21
+1,21
@@
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
-
+
dean [at] fourwalledcubicle [dot] com
dean [at] fourwalledcubicle [dot] com
- www.fourwalledcubicle.com
+ www.lufa-lib.org
*/
/*
Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
*/
/*
Copyright 2010 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.
The author disclaim all warranties with regard to this
software without specific, written prior permission.
The author disclaim all warranties with regard to this
@@
-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
@@
-45,22
+45,22
@@
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
-
+
.USBSpecification = VERSION_BCD(01.10),
.USBSpecification = VERSION_BCD(01.10),
- .Class =
0x00
,
- .SubClass =
0x00
,
- .Protocol =
0x00
,
-
+ .Class =
USB_CSCP_NoDeviceClass
,
+ .SubClass =
USB_CSCP_NoDeviceSubclass
,
+ .Protocol =
USB_CSCP_NoDeviceProtocol
,
+
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
-
+
.VendorID = 0x03EB,
.ProductID = 0x2048,
.VendorID = 0x03EB,
.ProductID = 0x2048,
- .ReleaseNumber =
0x0000
,
-
+ .ReleaseNumber =
VERSION_BCD(00.01)
,
+
.ManufacturerStrIndex = 0x01,
.ProductStrIndex = 0x02,
.SerialNumStrIndex = NO_DESCRIPTOR,
.ManufacturerStrIndex = 0x01,
.ProductStrIndex = 0x02,
.SerialNumStrIndex = NO_DESCRIPTOR,
-
+
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
@@
-71,7
+71,7
@@
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
*/
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
*/
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},
@@
-80,164
+80,164
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
.ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
-
+
.ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
.ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | 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},
.InterfaceNumber = 0,
.AlternateSetting = 0,
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
.InterfaceNumber = 0,
.AlternateSetting = 0,
-
+
.TotalEndpoints = 0,
.TotalEndpoints = 0,
-
- .Class =
0x01
,
- .SubClass =
0x01
,
- .Protocol =
0x00
,
-
- .InterfaceStrIndex = NO_DESCRIPTOR
+
+ .Class =
AUDIO_CSCP_AudioClass
,
+ .SubClass =
AUDIO_CSCP_ControlSubclass
,
+ .Protocol =
AUDIO_CSCP_ControlProtocol
,
+
+ .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),
-
+ .TotalLength = sizeof(USB_Audio_
Descriptor_
Interface_AC_t),
+
.InCollection = 1,
.InCollection = 1,
- .InterfaceNumber
s = {1},
+ .InterfaceNumber
= 1,
},
},
- .Audio_StreamInterface =
+ .Audio_StreamInterface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
.InterfaceNumber = 1,
.AlternateSetting = 0,
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
.InterfaceNumber = 1,
.AlternateSetting = 0,
-
+
.TotalEndpoints = 2,
.TotalEndpoints = 2,
-
- .Class =
0x01
,
- .SubClass =
0x03
,
- .Protocol =
0x00
,
-
+
+ .Class =
AUDIO_CSCP_AudioClass
,
+ .SubClass =
AUDIO_CSCP_MIDIStreamingSubclass
,
+ .Protocol =
AUDIO_CSCP_StreamingProtocol
,
+
.InterfaceStrIndex = NO_DESCRIPTOR
},
.InterfaceStrIndex = NO_DESCRIPTOR
},
-
- .Audio_StreamInterface_SPC =
+
+ .Audio_StreamInterface_SPC =
{
{
- .Header = {.Size = sizeof(USB_
Audio_Interface_MIDI_AS_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE
_General,
+ .Header = {.Size = sizeof(USB_
MIDI_Descriptor_AudioInterface_AS_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface
_General,
.AudioSpecification = VERSION_BCD(01.00),
.AudioSpecification = VERSION_BCD(01.00),
-
+
.TotalLength = (sizeof(USB_Descriptor_Configuration_t) -
offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))
},
.TotalLength = (sizeof(USB_Descriptor_Configuration_t) -
offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))
},
- .MIDI_In_Jack_Emb =
+ .MIDI_In_Jack_Emb =
{
{
- .Header = {.Size = sizeof(USB_MIDI_
In_Jack_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE_InputJack
,
-
- .JackType =
JACKTYPE_EMBEDDED
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_InputJack_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
+
+ .JackType =
MIDI_JACKTYPE_Embedded
,
.JackID = 0x01,
.JackID = 0x01,
-
+
.JackStrIndex = NO_DESCRIPTOR
},
.JackStrIndex = NO_DESCRIPTOR
},
- .MIDI_In_Jack_Ext =
+ .MIDI_In_Jack_Ext =
{
{
- .Header = {.Size = sizeof(USB_MIDI_
In_Jack_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE_InputJack
,
-
- .JackType =
JACKTYPE_EXTERNAL
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_InputJack_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
+
+ .JackType =
MIDI_JACKTYPE_External
,
.JackID = 0x02,
.JackID = 0x02,
-
+
.JackStrIndex = NO_DESCRIPTOR
},
.JackStrIndex = NO_DESCRIPTOR
},
-
- .MIDI_Out_Jack_Emb =
+
+ .MIDI_Out_Jack_Emb =
{
{
- .Header = {.Size = sizeof(USB_MIDI_
Out_Jack_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE_OutputJack
,
-
- .JackType =
JACKTYPE_EMBEDDED
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_OutputJack_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
+
+ .JackType =
MIDI_JACKTYPE_Embedded
,
.JackID = 0x03,
.NumberOfPins = 1,
.SourceJackID = {0x02},
.SourcePinID = {0x01},
.JackID = 0x03,
.NumberOfPins = 1,
.SourceJackID = {0x02},
.SourcePinID = {0x01},
-
+
.JackStrIndex = NO_DESCRIPTOR
},
.JackStrIndex = NO_DESCRIPTOR
},
- .MIDI_Out_Jack_Ext =
+ .MIDI_Out_Jack_Ext =
{
{
- .Header = {.Size = sizeof(USB_MIDI_
Out_Jack_t), .Type = DTYPE_Audio
Interface},
- .Subtype =
DSUBTYPE_OutputJack
,
-
- .JackType =
JACKTYPE_EXTERNAL
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_OutputJack_t), .Type = DTYPE_CS
Interface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
+
+ .JackType =
MIDI_JACKTYPE_External
,
.JackID = 0x04,
.NumberOfPins = 1,
.SourceJackID = {0x01},
.SourcePinID = {0x01},
.JackID = 0x04,
.NumberOfPins = 1,
.SourceJackID = {0x01},
.SourcePinID = {0x01},
-
+
.JackStrIndex = NO_DESCRIPTOR
},
.JackStrIndex = NO_DESCRIPTOR
},
- .MIDI_In_Jack_Endpoint =
+ .MIDI_In_Jack_Endpoint =
{
{
- .Endpoint =
+ .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_OUT | MIDI_STREAM_OUT_EPNUM),
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MIDI_STREAM_EPSIZE,
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | MIDI_STREAM_OUT_EPNUM),
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MIDI_STREAM_EPSIZE,
- .PollingIntervalMS = 0
+ .PollingIntervalMS = 0
x01
},
},
-
+
.Refresh = 0,
.SyncEndpointNumber = 0
},
.Refresh = 0,
.SyncEndpointNumber = 0
},
-
- .MIDI_In_Jack_Endpoint_SPC =
+
+ .MIDI_In_Jack_Endpoint_SPC =
{
{
- .Header = {.Size = sizeof(USB_MIDI_
Jack_Endpoint_t), .Type = DTYPE_Audio
Endpoint},
- .Subtype =
DSUBTYPE
_General,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_Jack_Endpoint_t), .Type = DTYPE_CS
Endpoint},
+ .Subtype =
AUDIO_DSUBTYPE_CSEndpoint
_General,
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x01}
},
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x01}
},
- .MIDI_Out_Jack_Endpoint =
+ .MIDI_Out_Jack_Endpoint =
{
{
- .Endpoint =
+ .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 | MIDI_STREAM_IN_EPNUM),
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MIDI_STREAM_EPSIZE,
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | MIDI_STREAM_IN_EPNUM),
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MIDI_STREAM_EPSIZE,
- .PollingIntervalMS = 0
+ .PollingIntervalMS = 0
x01
},
},
-
+
.Refresh = 0,
.SyncEndpointNumber = 0
},
.Refresh = 0,
.SyncEndpointNumber = 0
},
-
- .MIDI_Out_Jack_Endpoint_SPC =
+
+ .MIDI_Out_Jack_Endpoint_SPC =
{
{
- .Header = {.Size = sizeof(USB_MIDI_
Jack_Endpoint_t), .Type = DTYPE_Audio
Endpoint},
- .Subtype =
DSUBTYPE
_General,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_Jack_Endpoint_t), .Type = DTYPE_CS
Endpoint},
+ .Subtype =
AUDIO_DSUBTYPE_CSEndpoint
_General,
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x03}
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x03}
@@
-251,7
+251,7
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
USB_Descriptor_String_t PROGMEM LanguageString =
{
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
USB_Descriptor_String_t PROGMEM LanguageString =
{
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
-
+
.UnicodeString = {LANGUAGE_ID_ENG}
};
.UnicodeString = {LANGUAGE_ID_ENG}
};
@@
-262,7
+262,7
@@
USB_Descriptor_String_t PROGMEM LanguageString =
USB_Descriptor_String_t PROGMEM ManufacturerString =
{
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
USB_Descriptor_String_t PROGMEM ManufacturerString =
{
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
-
+
.UnicodeString = L"Dean Camera"
};
.UnicodeString = L"Dean Camera"
};
@@
-273,7
+273,7
@@
USB_Descriptor_String_t PROGMEM ManufacturerString =
USB_Descriptor_String_t PROGMEM ProductString =
{
.Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},
USB_Descriptor_String_t PROGMEM ProductString =
{
.Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},
-
+
.UnicodeString = L"LUFA MIDI Demo"
};
.UnicodeString = L"LUFA MIDI Demo"
};
@@
-283,44
+283,47
@@
USB_Descriptor_String_t PROGMEM ProductString =
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*/
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*/
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+ const uint8_t wIndex,
+ 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)
{
switch (DescriptorType)
{
- case DTYPE_Device:
- Address =
(void*)
&DeviceDescriptor;
+ case DTYPE_Device:
+ 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 0x00:
+ Address = &LanguageString;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
- case 0x01:
- Address =
(void*)
&ManufacturerString;
+ case 0x01:
+ Address = &ManufacturerString;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
- case 0x02:
- Address =
(void*)
&ProductString;
+ case 0x02:
+ 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