projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor documentation improvements.
[pub/USBasp.git]
/
Demos
/
Device
/
ClassDriver
/
GenericHID
/
Descriptors.c
diff --git
a/Demos/Device/ClassDriver/GenericHID/Descriptors.c
b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
index
d36ee49
..
2379de9
100644
(file)
--- a/
Demos/Device/ClassDriver/GenericHID/Descriptors.c
+++ b/
Demos/Device/ClassDriver/GenericHID/Descriptors.c
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
1
.
+ Copyright (C) Dean Camera, 201
4
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
1
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
4
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-18,7
+18,7
@@
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
advertising or publicity pertaining to distribution of the
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
@@
-46,7
+46,7
@@
const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
{
/* Use the HID class driver's standard Vendor HID report.
const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
{
/* Use the HID class driver's standard Vendor HID report.
- * Vendor Usage Page:
1
+ * Vendor Usage Page:
0
* Vendor Collection Usage: 1
* Vendor Report IN Usage: 2
* Vendor Report OUT Usage: 3
* Vendor Collection Usage: 1
* Vendor Report IN Usage: 2
* Vendor Report OUT Usage: 3
@@
-64,7
+64,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 = USB_CSCP_NoDeviceClass,
.SubClass = USB_CSCP_NoDeviceSubclass,
.Protocol = USB_CSCP_NoDeviceProtocol,
.Class = USB_CSCP_NoDeviceClass,
.SubClass = USB_CSCP_NoDeviceSubclass,
.Protocol = USB_CSCP_NoDeviceProtocol,
@@
-73,10
+73,10
@@
const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.VendorID = 0x03EB,
.ProductID = 0x204F,
.VendorID = 0x03EB,
.ProductID = 0x204F,
- .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 = NO_DESCRIPTOR,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
.SerialNumStrIndex = NO_DESCRIPTOR,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
@@
-99,7
+99,7
@@
const 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)
},
@@
-108,7
+108,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 =
0x00
,
+ .InterfaceNumber =
INTERFACE_ID_GenericHID
,
.AlternateSetting = 0x00,
.TotalEndpoints = 1,
.AlternateSetting = 0x00,
.TotalEndpoints = 1,
@@
-124,7
+124,7
@@
const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
{
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
- .HIDSpec = VERSION_BCD(
01.1
1),
+ .HIDSpec = VERSION_BCD(
1,1,
1),
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
@@
-135,10
+135,10
@@
const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.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 | GENERIC_IN_EPNUM)
,
+ .EndpointAddress =
GENERIC_IN_EPADDR
,
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = GENERIC_EPSIZE,
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = GENERIC_EPSIZE,
- .PollingIntervalMS = 0x0
1
+ .PollingIntervalMS = 0x0
5
},
};
},
};
@@
-204,15
+204,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;