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/StillImageHost | |
| 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/StillImageHost')
| -rw-r--r-- | Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c | 8 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c index 2a00a7361..ebb4002b9 100644 --- a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c +++ b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c @@ -143,10 +143,10 @@ uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { - /* Check the descriptor class and protocol, break out if correct class/protocol interface found */ - if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class == SIMAGE_CLASS) && - (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == SIMAGE_SUBCLASS) && - (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == SIMAGE_PROTOCOL)) + /* Check the descriptor class, subclass and protocol, break out if correct interface found */ + if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class == SI_CSCP_StillImageClass) && + (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == SI_CSCP_StillImageSubclass) && + (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == SI_CSCP_BulkOnlyProtocol)) { return DESCRIPTOR_SEARCH_Found; } diff --git a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h index bd31c6bf2..082e75e76 100644 --- a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h +++ b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h @@ -42,15 +42,6 @@ #include "StillImageHost.h" /* Macros: */ - /** Interface Class value for the Still Image Device class. */ - #define SIMAGE_CLASS 0x06 - - /** Interface Class value for the Still Image Device subclass. */ - #define SIMAGE_SUBCLASS 0x01 - - /** Interface Class value for the Still Image Device protocol. */ - #define SIMAGE_PROTOCOL 0x01 - /** Pipe number of the Still Image data IN pipe. */ #define SIMAGE_DATA_IN_PIPE 1 |