projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add demos/bootloaders/projects overview to the manual.
[pub/USBasp.git]
/
Projects
/
Magstripe
/
Descriptors.c
diff --git
a/Projects/Magstripe/Descriptors.c
b/Projects/Magstripe/Descriptors.c
index
3d9dd08
..
52b2c09
100644
(file)
--- a/
Projects/Magstripe/Descriptors.c
+++ b/
Projects/Magstripe/Descriptors.c
@@
-142,7
+142,7
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
\r
.HIDSpec = VERSION_BCD(01.11),
\r
.CountryCode = 0x00,
\r
\r
.HIDSpec = VERSION_BCD(01.11),
\r
.CountryCode = 0x00,
\r
- .Total
HIDDescriptors
= 1,
\r
+ .Total
ReportDescriptors
= 1,
\r
.HIDReportType = DTYPE_Report,
\r
.HIDReportLength = sizeof(KeyboardReport)
\r
},
\r
.HIDReportType = DTYPE_Report,
\r
.HIDReportLength = sizeof(KeyboardReport)
\r
},
\r
@@
-196,7
+196,7
@@
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
\r
* USB host.
\r
*/
\r
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
\r
* USB host.
\r
*/
\r
-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
\r
+uint16_t
CALLBACK_
USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
\r
{
\r
const uint8_t DescriptorType = (wValue >> 8);
\r
const uint8_t DescriptorNumber = (wValue & 0xFF);
\r
{
\r
const uint8_t DescriptorType = (wValue >> 8);
\r
const uint8_t DescriptorNumber = (wValue & 0xFF);
\r