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 /LUFA/Drivers/USB/Class | |
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 'LUFA/Drivers/USB/Class')
-rw-r--r-- | LUFA/Drivers/USB/Class/Host/MassStorage.h | 2 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Host/StillImage.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h index 584172fe8..aa70733f5 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorage.h +++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h @@ -267,7 +267,7 @@ #define COMMAND_DIRECTION_DATA_OUT (0 << 7)
#define COMMAND_DIRECTION_DATA_IN (1 << 7)
- #define COMMAND_DATA_TIMEOUT_MS 2000
+ #define COMMAND_DATA_TIMEOUT_MS 10000
#define MS_FOUND_DATAPIPE_IN (1 << 0)
#define MS_FOUND_DATAPIPE_OUT (1 << 1)
diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h index 4478931e0..f89b59ec6 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.h +++ b/LUFA/Drivers/USB/Class/Host/StillImage.h @@ -230,7 +230,7 @@ #define SI_FOUND_DATAPIPE_IN (1 << 1)
#define SI_FOUND_DATAPIPE_OUT (1 << 2)
- #define COMMAND_DATA_TIMEOUT_MS 5000
+ #define COMMAND_DATA_TIMEOUT_MS 10000
/* Function Prototypes: */
#if defined(INCLUDE_FROM_SI_CLASS_HOST_C)
|