projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Studio Integration DLL, to include package logging.
[pub/USBasp.git]
/
Projects
/
SerialToLCD
/
Descriptors.c
diff --git
a/Projects/SerialToLCD/Descriptors.c
b/Projects/SerialToLCD/Descriptors.c
index
1e6e922
..
d381c1d
100644
(file)
--- a/
Projects/SerialToLCD/Descriptors.c
+++ b/
Projects/SerialToLCD/Descriptors.c
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
2
.
+ Copyright (C) Dean Camera, 201
5
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
5
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Copyright 2012 Simon Foster (simon.foster [at] inbox [dot] com)
Permission to use, copy, modify, distribute, and sell this
Copyright 2012 Simon Foster (simon.foster [at] inbox [dot] com)
Permission to use, copy, modify, distribute, and sell this
@@
-59,7
+59,7
@@
const USB_Descriptor_Device_t PROGMEM 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),
+ .USBSpecification = VERSION_BCD(
1,1,
0),
.Class = CDC_CSCP_CDCClass,
.SubClass = CDC_CSCP_NoSpecificSubclass,
.Protocol = CDC_CSCP_NoSpecificProtocol,
.Class = CDC_CSCP_CDCClass,
.SubClass = CDC_CSCP_NoSpecificSubclass,
.Protocol = CDC_CSCP_NoSpecificProtocol,
@@
-68,10
+68,10
@@
const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.VendorID = 0x03EB,
.ProductID = 0x204B,
.VendorID = 0x03EB,
.ProductID = 0x204B,
- .ReleaseNumber = VERSION_BCD(0
0.0
1),
+ .ReleaseNumber = VERSION_BCD(0
,0,
1),
- .ManufacturerStrIndex =
0x01
,
- .ProductStrIndex =
0x02
,
+ .ManufacturerStrIndex =
STRING_ID_Manufacturer
,
+ .ProductStrIndex =
STRING_ID_Product
,
.SerialNumStrIndex = USE_INTERNAL_SERIAL,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
.SerialNumStrIndex = USE_INTERNAL_SERIAL,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
@@
-103,7
+103,7
@@
const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.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,
.TotalEndpoints = 1,
.AlternateSetting = 0,
.TotalEndpoints = 1,
@@
-120,7
+120,7
@@
const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Header,
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Header,
- .CDCSpecification = VERSION_BCD(
01.1
0),
+ .CDCSpecification = VERSION_BCD(
1,1,
0),
},
.CDC_Functional_ACM =
},
.CDC_Functional_ACM =
@@
-136,8
+136,8
@@
const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union,
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union,
- .MasterInterfaceNumber =
0
,
- .SlaveInterfaceNumber =
1
,
+ .MasterInterfaceNumber =
INTERFACE_ID_CDC_CCI
,
+ .SlaveInterfaceNumber =
INTERFACE_ID_CDC_DCI
,
},
.CDC_NotificationEndpoint =
},
.CDC_NotificationEndpoint =
@@
-154,7
+154,7
@@
const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.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,
.TotalEndpoints = 2,
.AlternateSetting = 0,
.TotalEndpoints = 2,
@@
-191,34
+191,19
@@
const 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.
*/
-const USB_Descriptor_String_t PROGMEM LanguageString =
-{
- .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
-
- .UnicodeString = {LANGUAGE_ID_ENG}
-};
+const USB_Descriptor_String_t PROGMEM 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.
*/
/** 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 PROGMEM ManufacturerString =
-{
- .Header = {.Size = USB_STRING_LEN(12), .Type = DTYPE_String},
-
- .UnicodeString = L"Simon Foster"
-};
+const USB_Descriptor_String_t PROGMEM ManufacturerString = USB_STRING_DESCRIPTOR(L"Simon Foster");
/** 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.
*/
-const USB_Descriptor_String_t PROGMEM ProductString =
-{
- .Header = {.Size = USB_STRING_LEN(19), .Type = DTYPE_String},
-
- .UnicodeString = L"USB-HD44780 Adapter"
-};
+const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"USB-HD44780 Adapter");
/** This function is called by the library when in device mode, and must be overridden (see 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 library "USB Descriptors"
* documentation) by the application code so that the address and size of a requested descriptor can be given
@@
-249,15
+234,15
@@
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
case DTYPE_String:
switch (DescriptorNumber)
{
case DTYPE_String:
switch (DescriptorNumber)
{
- case
0x00
:
+ case
STRING_ID_Language
:
Address = &LanguageString;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
Address = &LanguageString;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
- case
0x01
:
+ case
STRING_ID_Manufacturer
:
Address = &ManufacturerString;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
Address = &ManufacturerString;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
- case
0x02
:
+ case
STRING_ID_Product
:
Address = &ProductString;
Size = pgm_read_byte(&ProductString.Header.Size);
break;
Address = &ProductString;
Size = pgm_read_byte(&ProductString.Header.Size);
break;
projects / pub / USBasp.git / blobdiff