projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add branch for the conversion of demos to use standard C header files for configurati...
[pub/USBasp.git]
/
Demos
/
Device
/
ClassDriver
/
MassStorageKeyboard
/
Descriptors.c
diff --git
a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
index
2790903
..
6818a7a
100644
(file)
--- a/
Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
+++ b/
Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
@@
-133,20
+133,20
@@
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_DIR_IN | MASS_STORAGE_IN_EPNUM)
,
+ .EndpointAddress =
MASS_STORAGE_IN_EPADDR
,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MASS_STORAGE_IO_EPSIZE,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MASS_STORAGE_IO_EPSIZE,
- .PollingIntervalMS = 0x0
1
+ .PollingIntervalMS = 0x0
5
},
.MS_DataOutEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
},
.MS_DataOutEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
- .EndpointAddress =
(ENDPOINT_DIR_OUT | MASS_STORAGE_OUT_EPNUM)
,
+ .EndpointAddress =
MASS_STORAGE_OUT_EPADDR
,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MASS_STORAGE_IO_EPSIZE,
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MASS_STORAGE_IO_EPSIZE,
- .PollingIntervalMS = 0x0
1
+ .PollingIntervalMS = 0x0
5
},
.HID_KeyboardInterface =
},
.HID_KeyboardInterface =
@@
-180,10
+180,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_DIR_IN | KEYBOARD_EPNUM)
,
+ .EndpointAddress =
KEYBOARD_EPADDR
,
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = KEYBOARD_EPSIZE,
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = KEYBOARD_EPSIZE,
- .PollingIntervalMS = 0x0
1
+ .PollingIntervalMS = 0x0
5
},
};
},
};