diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-09 00:50:55 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-09 00:50:55 +0000 |
| commit | 7ace314cc12f24c1c3108311bdfb3a2ed484ab37 (patch) | |
| tree | 5ff719df1d93ea5cfc6393999e42468e0b727d1d /Demos/Device/Incomplete | |
| parent | 2281750b5fdf046ed606e567eb60cf4e647015dd (diff) | |
| download | lufa-7ace314cc12f24c1c3108311bdfb3a2ed484ab37.tar.gz lufa-7ace314cc12f24c1c3108311bdfb3a2ed484ab37.tar.bz2 lufa-7ace314cc12f24c1c3108311bdfb3a2ed484ab37.zip | |
Increase timeout of Mass Storage and Still Image host commands to 10 seconds (up from 5) to account for slow-processing devices.
Added brace guards to macros with parameters to prevent unintended changed evaluation of the macro expression.
Minor code cleanups (remove redundant comments, fix spacing, etc.).
Diffstat (limited to 'Demos/Device/Incomplete')
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Descriptors.c | 8 | ||||
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Sideshow.h | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c index 647e0b4f9..ed5853f90 100644 --- a/Demos/Device/Incomplete/Sideshow/Descriptors.c +++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c @@ -192,11 +192,9 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, Size = pgm_read_byte(&SerialNumberString.Header.Size);
break;
case 0xEE:
- /* Great, another Microsoft-proprietary extention. String address 0xEE is used
- by Windows for "OS Descriptors", which in this case allows us to indicate that
- our device is Sideshow compatible. Most people would be happy using the normal
- 0xFF 0x?? 0x?? Class/Subclass/Protocol values like the USBIF intended. */
-
+ /* A Microsoft-proprietary extention. String address 0xEE is used by Windows for
+ "OS Descriptors", which in this case allows us to indicate that our device is
+ Sideshow compatible regardless of VID/PID values. */
Address = (void*)&OSDescriptorString;
Size = pgm_read_byte(&OSDescriptorString.Header.Size);
break;
diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.h b/Demos/Device/Incomplete/Sideshow/Sideshow.h index f2890ef21..6369036e6 100644 --- a/Demos/Device/Incomplete/Sideshow/Sideshow.h +++ b/Demos/Device/Incomplete/Sideshow/Sideshow.h @@ -45,21 +45,25 @@ #include <LUFA/Drivers/Peripheral/SerialStream.h>
/* Macros: */
+ /** Device control request for used in the Microsoft OS Descriptor for retrieving the OS Feature
+ * descriptors of the device
+ */
#define REQ_GetOSFeatureDescriptor 0x01
+ /** Descriptor index for a Microsoft Proprietary Extended Device Compatibility descriptor */
#define EXTENDED_COMPAT_ID_DESCRIPTOR 0x0004
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
- #define LEDMASK_USB_NOTREADY LEDS_LED1
+ #define LEDMASK_USB_NOTREADY LEDS_LED1
/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
- #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
+ #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
- #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
+ #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
- #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
+ #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/* Function Prototypes: */
void SetupHardware(void);
|