Oops - fix broken SPI driver due to missing bit inversion on a port mask.

[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 f309abf..2ab36c2 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h
+++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */


@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -32,34 +32,26 @@
  *
  *  Header file for StillImageCommands.c.
  */
  *
  *  Header file for StillImageCommands.c.
  */

- 
+

 #ifndef _STILL_IMAGE_COMMANDS_H_
 #define _STILL_IMAGE_COMMANDS_H_
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 #ifndef _STILL_IMAGE_COMMANDS_H_
 #define _STILL_IMAGE_COMMANDS_H_
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>

-               
+

                #include "PIMACodes.h"
                #include "PIMACodes.h"

+               #include "../StillImageHost.h"

 
        /* Macros: */
 
        /* Macros: */

-               /** Pipe number of the Still Image data IN pipe */
-               #define SIMAGE_DATA_IN_PIPE            0x01
-
-               /** Pipe number of the Still Image data OUT pipe */
-               #define SIMAGE_DATA_OUT_PIPE           0x02
-
-               /** Pipe number of the Still Image events pipe */
-               #define SIMAGE_EVENTS_PIPE             0x03
-               
-               /** Length in bytes of a given Unicode string's character length
+               /** Length in bytes of a given Unicode string's character length.

                 *
                 *  \param[in] chars  Total number of Unicode characters in the string
                 */
                #define UNICODE_STRING_LENGTH(chars)   ((chars) << 1)
 
                 *
                 *  \param[in] chars  Total number of Unicode characters in the string
                 */
                #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 */
+               /** Timeout period between the issuing of a command to a device, and the reception of the first packet. */

                #define COMMAND_DATA_TIMEOUT_MS        10000
                #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.
                 *
                /** Used in the DataLength field of a PIMA container, to give the total container size in bytes for
                 *  a command container.
                 *


@@ -87,7 +79,7 @@
                        uint32_t TransactionID; /**< Unique container ID to link blocks together */
                        uint32_t Params[3]; /**< Block parameters to be issued along with the block code (command blocks only) */
                } PIMA_Container_t;
                        uint32_t TransactionID; /**< Unique container ID to link blocks together */
                        uint32_t Params[3]; /**< Block parameters to be issued along with the block code (command blocks only) */
                } PIMA_Container_t;

-       
+

        /* Enums: */
                /** Enum for the possible PIMA contains types. */
                enum PIMA_Container_Types_t
        /* Enums: */
                /** Enum for the possible PIMA contains types. */
                enum PIMA_Container_Types_t


@@ -98,18 +90,21 @@
                        CType_ResponseBlock     = 3, /**< Response container type */
                        CType_EventBlock        = 4, /**< Event Block container type */
                };
                        CType_ResponseBlock     = 3, /**< Response container type */
                        CType_EventBlock        = 4, /**< Event Block container type */
                };

-       
+

        /* External Variables: */
                extern PIMA_Container_t PIMA_SendBlock;
                extern PIMA_Container_t PIMA_ReceivedBlock;
                extern PIMA_Container_t PIMA_EventBlock;
        /* External Variables: */
                extern PIMA_Container_t PIMA_SendBlock;
                extern PIMA_Container_t PIMA_ReceivedBlock;
                extern PIMA_Container_t PIMA_EventBlock;

-       
+

        /* Function Prototypes: */
                void    SImage_SendBlockHeader(void);
                uint8_t SImage_ReceiveBlockHeader(void);
                uint8_t SImage_ReceiveEventHeader(void);
        /* Function Prototypes: */
                void    SImage_SendBlockHeader(void);
                uint8_t SImage_ReceiveBlockHeader(void);
                uint8_t SImage_ReceiveEventHeader(void);

-               uint8_t SImage_SendData(void* const Buffer, const uint16_t Bytes);
-               uint8_t SImage_ReadData(void* const Buffer, const uint16_t Bytes);
+               uint8_t SImage_SendData(void* const Buffer,
+                                       const uint16_t Bytes);
+               uint8_t SImage_ReadData(void* const Buffer,
+                                       const uint16_t Bytes);

                bool    SImage_IsEventReceived(void);
 
 #endif
                bool    SImage_IsEventReceived(void);
 
 #endif

+