aboutsummaryrefslogtreecommitdiff
path: root/Demos/DualRole
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-10-25 12:42:55 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-10-25 12:42:55 +0000
commitbcb4aef5ee2ef8ac6c28092d55ee9ea72b75b7dc (patch)
treef047601bd6ab339511e24acb00801de8fdebc19c /Demos/DualRole
parenta603506166b05dce54201b9931e20bfc87903b17 (diff)
Add descriptor class, subclass and protocol constants to the class drivers, modify all demos to use them where possible.
Move out private/internal host class driver constants to the common class driver headers, so that they can be used in the Low Level host mode demos. Ensure all demos, projects and bootloaders use the class driver constants where possible to minimise code repetition. git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1538 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/DualRole')
-rw-r--r--Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c12
-rw-r--r--Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
index eec1c931..ffa3508f 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
@@ -83,9 +83,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
.USBSpecification = VERSION_BCD(01.10),
- .Class = 0x00,
- .SubClass = 0x00,
- .Protocol = 0x00,
+ .Class = USB_CSCP_NoDeviceClass,
+ .SubClass = USB_CSCP_NoDeviceSubclass,
+ .Protocol = USB_CSCP_NoDeviceProtocol,
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
@@ -131,9 +131,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalEndpoints = 1,
- .Class = 0x03,
- .SubClass = 0x01,
- .Protocol = HID_BOOTP_MouseBootProtocol,
+ .Class = HID_CSCP_HIDClass,
+ .SubClass = HID_CSCP_BootSubclass,
+ .Protocol = HID_CSCP_MouseBootProtocol,
.InterfaceStrIndex = NO_DESCRIPTOR
},
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
index 786713ac..338d8d65 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
@@ -47,7 +47,7 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Host_Interface =
.DataINPipeNumber = 1,
.DataOUTPipeNumber = 2,
- .HIDInterfaceProtocol = HID_BOOTP_MouseBootProtocol,
+ .HIDInterfaceProtocol = HID_CSCP_MouseBootProtocol,
},
};