diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-10-25 12:42:55 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-10-25 12:42:55 +0000 |
| commit | 55538dcef34bc3c0f2ada4767c51d11202ac0678 (patch) | |
| tree | f047601bd6ab339511e24acb00801de8fdebc19c /Demos/Host/LowLevel/MouseHost | |
| parent | b37d77eab32d171ad7b28157a924a4026e2aebd1 (diff) | |
| download | lufa-55538dcef34bc3c0f2ada4767c51d11202ac0678.tar.gz lufa-55538dcef34bc3c0f2ada4767c51d11202ac0678.tar.bz2 lufa-55538dcef34bc3c0f2ada4767c51d11202ac0678.zip | |
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.
Diffstat (limited to 'Demos/Host/LowLevel/MouseHost')
| -rw-r--r-- | Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c | 4 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/MouseHost/ConfigDescriptor.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c index 83e0c5338..3a28802e2 100644 --- a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c +++ b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.c @@ -120,8 +120,8 @@ uint8_t DComp_NextMouseInterface(void* CurrentDescriptor) if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { /* Check the HID descriptor class and protocol, break out if correct class/protocol interface found */ - if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class == MOUSE_CLASS) && - (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == MOUSE_PROTOCOL)) + if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class == HID_CSCP_HIDClass) && + (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == HID_CSCP_MouseBootProtocol)) { /* Indicate that the descriptor being searched for has been found */ return DESCRIPTOR_SEARCH_Found; diff --git a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.h b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.h index 57d71e692..d482ad600 100644 --- a/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.h +++ b/Demos/Host/LowLevel/MouseHost/ConfigDescriptor.h @@ -42,12 +42,6 @@ #include "MouseHost.h" /* Macros: */ - /** Interface Class value for the Human Interface Device class. */ - #define MOUSE_CLASS 0x03 - - /** Interface Protocol value for a Boot Protocol Mouse compliant device. */ - #define MOUSE_PROTOCOL 0x02 - /** Pipe number for the mouse data IN pipe. */ #define MOUSE_DATA_IN_PIPE 1 |