Fixed StillImageHost not correctly freezing and unfreezing data pipes while waiting...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Common / StillImage.h

diff --git a/LUFA/Drivers/USB/Class/Common/StillImage.h b/LUFA/Drivers/USB/Class/Common/StillImage.h
index 2723aeb..804b312 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Common/StillImage.h
@@ -66,15 +66,15 @@
                 *\r
                 *  \param[in] params  Number of parameters which are to be sent in the Param field of the container\r
                 */\r
                 *\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
+               #define PIMA_COMMAND_SIZE(params)      ((sizeof(SI_PIMA_Container_t) - sizeof(((SI_PIMA_Container_t*)NULL)->Params)) + \\r
+                                                       (params * sizeof(((SI_PIMA_Container_t*)NULL)->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
                 *  \param[in] datalen  Length in bytes of the data in the container\r
                 */\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
                 *  \param[in] datalen  Length in bytes of the data in the container\r
                 */\r

-               #define PIMA_DATA_SIZE(datalen)        ((sizeof(PIMA_SendBlock) - sizeof(PIMA_SendBlock.Params)) + datalen)\r
+               #define PIMA_DATA_SIZE(datalen)        ((sizeof(SI_PIMA_Container_t) - sizeof(((SI_PIMA_Container_t*)NULL)->Params)) + datalen)\r

 \r
        /* Type defines: */\r
                /** Type define for a PIMA container, use to send commands and receive responses to and from an\r
 \r
        /* Type defines: */\r
                /** Type define for a PIMA container, use to send commands and receive responses to and from an\r


@@ -101,7 +101,15 @@
                };      \r
                \r
        /* Enums: */\r
                };      \r
                \r
        /* Enums: */\r

-       \r
+               enum SI_PIMA_ResponseCodes_t\r
+               {\r
+                       PIMA_RESPONSE_OK                     = 1,\r
+                       PIMA_RESPONSE_GeneralError           = 2,\r
+                       PIMA_RESPONSE_SessionNotOpen         = 3,\r
+                       PIMA_RESPONSE_InvalidTransaction     = 4,\r
+                       PIMA_RESPONSE_OperationNotSupported  = 5,\r
+                       PIMA_RESPONSE_ParameterNotSupported  = 6,\r
+               };\r

        \r
        /* Type Defines: */\r
        \r
        \r
        /* Type Defines: */\r
        \r