diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-12-09 00:50:55 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-12-09 00:50:55 +0000 |
| commit | fdbff950186841045950d76c4c0a961165011dc1 (patch) | |
| tree | 5ff719df1d93ea5cfc6393999e42468e0b727d1d /Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h | |
| parent | 9910fcfa3e6ee0371bbc851813d2b6dba9c0ef28 (diff) | |
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.).
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@957 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h')
| -rw-r--r-- | Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h index 6ac70fc5..b38f5c17 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.
|