Seperate out XMEGA and TINY NVM routines into seperate files.

[pub/USBasp.git] / Demos / Host / LowLevel / StillImageHost / Lib / StillImageCommands.h

diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h
index 6ac70fc..b38f5c1 100644 (file)
--- 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_\r
 \r
        /* Includes: */\r
 #define _STILL_IMAGE_COMMANDS_H_\r
 \r
        /* Includes: */\r

-               #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
+               #include <LUFA/Drivers/USB/USB.h>\r

                \r
                #include "PIMACodes.h"\r
 \r
                \r
                #include "PIMACodes.h"\r
 \r


@@ -55,10 +55,10 @@
                 *\r
                 *  \param[in] chars  Total number of Unicode characters in the string\r
                 */\r
                 *\r
                 *  \param[in] chars  Total number of Unicode characters in the string\r
                 */\r

-               #define UNICODE_STRING_LENGTH(chars)   (chars << 1)\r
+               #define UNICODE_STRING_LENGTH(chars)   ((chars) << 1)\r

 \r
                /** Timeout period between the issuing of a command to a device, and the reception of the first packet */\r
 \r
                /** Timeout period between the issuing of a command to a device, and the reception of the first packet */\r

-               #define COMMAND_DATA_TIMEOUT_MS        5000\r
+               #define COMMAND_DATA_TIMEOUT_MS        10000\r

                \r
                /** Used in the DataLength field of a PIMA container, to give the total container size in bytes for\r
                 *  a command container.\r
                \r
                /** Used in the DataLength field of a PIMA container, to give the total container size in bytes for\r
                 *  a command container.\r


@@ -66,7 +66,7 @@
                 *  \param[in] params  Number of parameters which are to be sent in the Param field of the container\r
                 */\r
                #define PIMA_COMMAND_SIZE(params)      ((sizeof(PIMA_SendBlock) - sizeof(PIMA_SendBlock.Params)) + \\r
                 *  \param[in] params  Number of parameters which are to be sent in the Param field of the container\r
                 */\r
                #define PIMA_COMMAND_SIZE(params)      ((sizeof(PIMA_SendBlock) - sizeof(PIMA_SendBlock.Params)) + \\r

-                                                       (params * sizeof(PIMA_SendBlock.Params[0])))\r
+                                                       ((params) * sizeof(PIMA_SendBlock.Params[0])))\r

 \r
                /** Used in the DataLength field of a PIMA container, to give the total container size in bytes for\r
                 *  a data container.\r
 \r
                /** Used in the DataLength field of a PIMA container, to give the total container size in bytes for\r
                 *  a data container.\r