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 /Projects | |
| 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 'Projects')
| -rw-r--r-- | Projects/AVRISP/Lib/V2Protocol.h | 2 | ||||
| -rw-r--r-- | Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h | 2 | ||||
| -rw-r--r-- | Projects/MissileLauncher/MissileLauncher.c | 2 | ||||
| -rw-r--r-- | Projects/MissileLauncher/MissileLauncher.h | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h index d40f951f9..c6203004f 100644 --- a/Projects/AVRISP/Lib/V2Protocol.h +++ b/Projects/AVRISP/Lib/V2Protocol.h @@ -57,7 +57,7 @@ /* Macros: */
/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */ - #define PROGRAMMER_ID "AVRISP_MK2"
+ #define PROGRAMMER_ID "AVRISP_MK2"
/** Timeout in milliseconds of target busy-wait loops waiting for a command to complete */
#define TARGET_BUSY_TIMEOUT_MS 240
diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h index 744ad01bf..828e3ea50 100644 --- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h +++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h @@ -68,7 +68,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
/* External Variables: */
extern FILE DiskStream;
diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c index a16d3132b..26dd077cd 100644 --- a/Projects/MissileLauncher/MissileLauncher.c +++ b/Projects/MissileLauncher/MissileLauncher.c @@ -287,7 +287,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength) USB_ControlRequest = (USB_Request_Header_t)
{
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
- .bRequest = 0x09,
+ .bRequest = REQ_SetReport,
.wValue = 0x02,
.wIndex = 0x01,
.wLength = ReportLength,
diff --git a/Projects/MissileLauncher/MissileLauncher.h b/Projects/MissileLauncher/MissileLauncher.h index 86fbe8602..e92fe743c 100644 --- a/Projects/MissileLauncher/MissileLauncher.h +++ b/Projects/MissileLauncher/MissileLauncher.h @@ -55,13 +55,13 @@ /* Macros: */
/** Pipe number for the HID data IN pipe */
- #define HID_DATA_IN_PIPE 1
+ #define HID_DATA_IN_PIPE 1
/** Pipe number for the HID data OUT pipe */
- #define HID_DATA_OUT_PIPE 2
+ #define HID_DATA_OUT_PIPE 2
/** HID Class specific request to send a HID report to the device. */
- #define REQ_SetReport 0x09
+ #define REQ_SetReport 0x09
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
|