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/MouseHostWithParser | |
| 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/MouseHostWithParser')
| -rw-r--r-- | Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c | 5 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.h | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c b/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c index eb85e4a47..033c8ac7f 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c +++ b/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.c @@ -133,9 +133,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)) + /* Check the HID descriptor class, break out if correct class interface found */ + if (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class == HID_CSCP_HIDClass) { return DESCRIPTOR_SEARCH_Found; } diff --git a/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.h b/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.h index 2e44b4068..b9d11ad65 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.h +++ b/Demos/Host/LowLevel/MouseHostWithParser/ConfigDescriptor.h @@ -42,12 +42,6 @@ #include "HIDReport.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 report data pipe. */ #define MOUSE_DATA_IN_PIPE 1 |