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/Host/LowLevel/StillImageHost | |
| 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/Host/LowLevel/StillImageHost')
| -rw-r--r-- | Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h | 2 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h | 8 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/StillImageHost/StillImageHost.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h index 24dd0664d..946edb16b 100644 --- a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h +++ b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h @@ -37,7 +37,7 @@ #define _CONFIGDESCRIPTOR_H_
/* Includes: */
- #include <LUFA/Drivers/USB/USB.h> // USB Functionality
+ #include <LUFA/Drivers/USB/USB.h>
#include "StillImageHost.h"
diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h index 6ac70fc50..b38f5c176 100644 --- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h +++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h @@ -37,7 +37,7 @@ #define _STILL_IMAGE_COMMANDS_H_
/* Includes: */
- #include <LUFA/Drivers/USB/USB.h> // USB Functionality
+ #include <LUFA/Drivers/USB/USB.h>
#include "PIMACodes.h"
@@ -55,10 +55,10 @@ *
* \param[in] chars Total number of Unicode characters in the string
*/
- #define UNICODE_STRING_LENGTH(chars) (chars << 1)
+ #define UNICODE_STRING_LENGTH(chars) ((chars) << 1)
/** Timeout period between the issuing of a command to a device, and the reception of the first packet */
- #define COMMAND_DATA_TIMEOUT_MS 5000
+ #define COMMAND_DATA_TIMEOUT_MS 10000
/** Used in the DataLength field of a PIMA container, to give the total container size in bytes for
* a command container.
@@ -66,7 +66,7 @@ * \param[in] params Number of parameters which are to be sent in the Param field of the container
*/
#define PIMA_COMMAND_SIZE(params) ((sizeof(PIMA_SendBlock) - sizeof(PIMA_SendBlock.Params)) + \
- (params * sizeof(PIMA_SendBlock.Params[0])))
+ ((params) * sizeof(PIMA_SendBlock.Params[0])))
/** Used in the DataLength field of a PIMA container, to give the total container size in bytes for
* a data container.
diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h index 89956e0f5..23077c44c 100644 --- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h +++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h @@ -66,7 +66,7 @@ #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
- #define LEDMASK_USB_BUSY (LEDS_LED2)
+ #define LEDMASK_USB_BUSY LEDS_LED2
/* Function Prototypes: */
void StillImage_Task(void);
|