projects
/
pub
/
lufa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add script reading bootloader flags
[pub/lufa.git]
/
Bootloaders
/
CDC
/
Descriptors.c
diff --git
a/Bootloaders/CDC/Descriptors.c
b/Bootloaders/CDC/Descriptors.c
index
b86b213
..
f8a004c
100644
(file)
--- a/
Bootloaders/CDC/Descriptors.c
+++ b/
Bootloaders/CDC/Descriptors.c
@@
-1,24
+1,24
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 20
10
.
-
+ Copyright (C) Dean Camera, 20
21
.
+
dean [at] fourwalledcubicle [dot] com
dean [at] fourwalledcubicle [dot] com
- www.fourwalledcubicle.com
+ www.lufa-lib.org
*/
/*
*/
/*
- Copyright 20
10
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 20
21
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,9
+30,9
@@
/** \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"
*/
#include "Descriptors.h"
@@
-42,25
+42,25
@@
* 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 DeviceDescriptor =
+
const
USB_Descriptor_Device_t DeviceDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
-
- .USBSpecification = VERSION_BCD(
01.1
0),
- .Class =
0x02
,
- .SubClass =
0x00
,
- .Protocol =
0x00
,
-
+
+ .USBSpecification = VERSION_BCD(
1,1,
0),
+ .Class =
CDC_CSCP_CDCClass
,
+ .SubClass =
CDC_CSCP_NoSpecificSubclass
,
+ .Protocol =
CDC_CSCP_NoSpecificProtocol
,
+
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
-
+
.VendorID = 0x03EB,
.ProductID = 0x204A,
.VendorID = 0x03EB,
.ProductID = 0x204A,
- .ReleaseNumber =
0x0002
,
-
- .ManufacturerStrIndex =
NO_DESCRIPTOR
,
- .ProductStrIndex =
0x01
,
+ .ReleaseNumber =
VERSION_BCD(1,0,0)
,
+
+ .ManufacturerStrIndex =
STRING_ID_Manufacturer
,
+ .ProductStrIndex =
STRING_ID_Product
,
.SerialNumStrIndex = NO_DESCRIPTOR,
.SerialNumStrIndex = NO_DESCRIPTOR,
-
+
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
@@
-69,108
+69,108
@@
USB_Descriptor_Device_t 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 ConfigurationDescriptor =
+
const
USB_Descriptor_Configuration_t ConfigurationDescriptor =
{
{
- .Config =
+ .Config =
{
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
.TotalInterfaces = 2,
{
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
.TotalInterfaces = 2,
-
+
.ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
.ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
-
- .ConfigAttributes = USB_CONFIG_ATTR_
BUSPOWER
ED,
-
+
+ .ConfigAttributes = USB_CONFIG_ATTR_
RESERV
ED,
+
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
-
- .CDC_CCI_Interface =
+
+ .CDC_CCI_Interface =
{
.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_CDC_CCI
,
.AlternateSetting = 0,
.AlternateSetting = 0,
-
+
.TotalEndpoints = 1,
.TotalEndpoints = 1,
-
- .Class =
0x02
,
- .SubClass =
0x02
,
- .Protocol =
0x01
,
-
+
+ .Class =
CDC_CSCP_CDCClass
,
+ .SubClass =
CDC_CSCP_ACMSubclass
,
+ .Protocol =
CDC_CSCP_ATCommandProtocol
,
+
.InterfaceStrIndex = NO_DESCRIPTOR
},
.InterfaceStrIndex = NO_DESCRIPTOR
},
- .CDC_Functional_Header =
+ .CDC_Functional_Header =
{
{
- .Header = {.Size = sizeof(USB_
Descriptor_CDC_FunctionalHeader_t), .Type =
DTYPE_CSInterface},
+ .Header = {.Size = sizeof(USB_
CDC_Descriptor_FunctionalHeader_t), .Type = CDC_
DTYPE_CSInterface},
.Subtype = 0x00,
.Subtype = 0x00,
-
- .CDCSpecification = VERSION_BCD(
01.1
0),
+
+ .CDCSpecification = VERSION_BCD(
1,1,
0),
},
},
- .CDC_Functional_ACM =
+ .CDC_Functional_ACM =
{
{
- .Header = {.Size = sizeof(USB_
Descriptor_CDC_FunctionalACM_t), .Type =
DTYPE_CSInterface},
+ .Header = {.Size = sizeof(USB_
CDC_Descriptor_FunctionalACM_t), .Type = CDC_
DTYPE_CSInterface},
.Subtype = 0x02,
.Subtype = 0x02,
-
- .Capabilities = 0x0
4
,
+
+ .Capabilities = 0x0
2
,
},
},
-
- .CDC_Functional_Union =
+
+ .CDC_Functional_Union =
{
{
- .Header = {.Size = sizeof(USB_
Descriptor_CDC_FunctionalUnion_t), .Type =
DTYPE_CSInterface},
+ .Header = {.Size = sizeof(USB_
CDC_Descriptor_FunctionalUnion_t), .Type = CDC_
DTYPE_CSInterface},
.Subtype = 0x06,
.Subtype = 0x06,
-
- .MasterInterfaceNumber =
0
,
- .SlaveInterfaceNumber =
1
,
+
+ .MasterInterfaceNumber =
INTERFACE_ID_CDC_CCI
,
+ .SlaveInterfaceNumber =
INTERFACE_ID_CDC_DCI
,
},
},
- .CDC_NotificationEndpoint =
+ .CDC_NotificationEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-
- .EndpointAddress =
(ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM)
,
+
+ .EndpointAddress =
CDC_NOTIFICATION_EPADDR
,
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = CDC_NOTIFICATION_EPSIZE,
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = CDC_NOTIFICATION_EPSIZE,
- .PollingIntervalMS = 0x
02
+ .PollingIntervalMS = 0x
FF
},
},
- .CDC_DCI_Interface =
+ .CDC_DCI_Interface =
{
.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_CDC_DCI
,
.AlternateSetting = 0,
.AlternateSetting = 0,
-
+
.TotalEndpoints = 2,
.TotalEndpoints = 2,
-
- .Class =
0x0A
,
- .SubClass =
0x00
,
- .Protocol =
0x00
,
-
+
+ .Class =
CDC_CSCP_CDCDataClass
,
+ .SubClass =
CDC_CSCP_NoDataSubclass
,
+ .Protocol =
CDC_CSCP_NoDataProtocol
,
+
.InterfaceStrIndex = NO_DESCRIPTOR
},
.InterfaceStrIndex = NO_DESCRIPTOR
},
- .CDC_DataOutEndpoint =
+ .CDC_DataOutEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-
- .EndpointAddress =
(ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM)
,
+
+ .EndpointAddress =
CDC_RX_EPADDR
,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = CDC_TXRX_EPSIZE,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = CDC_TXRX_EPSIZE,
- .PollingIntervalMS = 0x0
0
+ .PollingIntervalMS = 0x0
5
},
},
-
- .CDC_DataInEndpoint =
+
+ .CDC_DataInEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-
- .EndpointAddress =
(ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM)
,
+
+ .EndpointAddress =
CDC_TX_EPADDR
,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = CDC_TXRX_EPSIZE,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = CDC_TXRX_EPSIZE,
- .PollingIntervalMS = 0x0
0
+ .PollingIntervalMS = 0x0
5
}
};
}
};
@@
-178,23
+178,19
@@
USB_Descriptor_Configuration_t 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 LanguageString =
-{
- .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
-
- .UnicodeString = {LANGUAGE_ID_ENG}
-};
+const USB_Descriptor_String_t LanguageString = USB_STRING_DESCRIPTOR_ARRAY(LANGUAGE_ID_ENG);
+
+/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
+ * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
+ * Descriptor.
+ */
+const USB_Descriptor_String_t ManufacturerString = USB_STRING_DESCRIPTOR(L"LUFA Library");
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
* and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
/** Product descriptor string. This is a Unicode string containing the product's details in human readable 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 ProductString =
-{
- .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},
-
- .UnicodeString = L"AVR CDC Bootloader"
-};
+const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(L"LUFA CDC");
/** This function is called by the library when in device mode, and must be overridden (see LUFA library "USB Descriptors"
* documentation) by the application code so that the address and size of a requested descriptor can be given
/** This function is called by the library when in device mode, and must be overridden (see LUFA library "USB Descriptors"
* documentation) by the application code so that the address and size of a requested descriptor can be given
@@
-203,7
+199,7
@@
USB_Descriptor_String_t ProductString =
* USB host.
*/
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
* USB host.
*/
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
- const uint
8
_t wIndex,
+ const uint
16
_t wIndex,
const void** const DescriptorAddress)
{
const uint8_t DescriptorType = (wValue >> 8);
const void** const DescriptorAddress)
{
const uint8_t DescriptorType = (wValue >> 8);
@@
-223,20
+219,26
@@
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_String:
Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_String:
- if (
!(DescriptorNumber)
)
+ if (
DescriptorNumber == STRING_ID_Language
)
{
Address = &LanguageString;
Size = LanguageString.Header.Size;
}
{
Address = &LanguageString;
Size = LanguageString.Header.Size;
}
- else
+ else if (DescriptorNumber == STRING_ID_Manufacturer)
+ {
+ Address = &ManufacturerString;
+ Size = ManufacturerString.Header.Size;
+ }
+ else if (DescriptorNumber == STRING_ID_Product)
{
Address = &ProductString;
Size = ProductString.Header.Size;
}
{
Address = &ProductString;
Size = ProductString.Header.Size;
}
-
+
break;
}
break;
}
-
+
*DescriptorAddress = Address;
return Size;
}
*DescriptorAddress = Address;
return Size;
}
+
projects / pub / lufa.git / blobdiff