projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove outdated known issue from the Known Issues list of the documentation.
[pub/USBasp.git]
/
Bootloaders
/
DFU
/
Descriptors.c
diff --git
a/Bootloaders/DFU/Descriptors.c
b/Bootloaders/DFU/Descriptors.c
index
c36a20c
..
5901dad
100644
(file)
--- a/
Bootloaders/DFU/Descriptors.c
+++ b/
Bootloaders/DFU/Descriptors.c
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
2
.
+ Copyright (C) Dean Camera, 201
3
.
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
3
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
@@
-57,8
+57,8
@@
const USB_Descriptor_Device_t DeviceDescriptor =
.ProductID = PRODUCT_ID_CODE,
.ReleaseNumber = VERSION_BCD(00.00),
.ProductID = PRODUCT_ID_CODE,
.ReleaseNumber = VERSION_BCD(00.00),
- .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
@@
-175,17
+175,17
@@
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 if (DescriptorNumber ==
0x01
)
+ else if (DescriptorNumber ==
STRING_ID_Manufacturer
)
{
Address = &ManufacturerString;
Size = ManufacturerString.Header.Size;
}
{
Address = &ManufacturerString;
Size = ManufacturerString.Header.Size;
}
- else if (DescriptorNumber ==
0x02
)
+ else if (DescriptorNumber ==
STRING_ID_Product
)
{
Address = &ProductString;
Size = ProductString.Header.Size;
{
Address = &ProductString;
Size = ProductString.Header.Size;