Extend bootloader build test to include all supported configurations including the...

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

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h
index d7b893e..505d6b9 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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


@@ -42,17 +42,16 @@
                #include <avr/power.h>
                #include <avr/interrupt.h>
                #include <stdio.h>
                #include <avr/power.h>
                #include <avr/interrupt.h>
                #include <stdio.h>

-               
+

                #include "ConfigDescriptor.h"
 
                #include "ConfigDescriptor.h"
 

-               #include "Lib/PIMACodes.h"

                #include "Lib/StillImageCommands.h"
 
                #include <LUFA/Drivers/Misc/TerminalCodes.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include "Lib/StillImageCommands.h"
 
                #include <LUFA/Drivers/Misc/TerminalCodes.h>
                #include <LUFA/Drivers/USB/USB.h>

-               #include <LUFA/Drivers/Peripheral/SerialStream.h>
+               #include <LUFA/Drivers/Peripheral/Serial.h>

                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/LEDs.h>

-               
+

        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
                #define LEDMASK_USB_NOTREADY      LEDS_LED1
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
                #define LEDMASK_USB_NOTREADY      LEDS_LED1


@@ -68,18 +67,22 @@
 
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY          LEDS_LED2
 
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY          LEDS_LED2

-               
+

        /* Function Prototypes: */
        /* Function Prototypes: */

-               void StillImage_Task(void);

                void SetupHardware(void);
                void SetupHardware(void);

-       
+               void StillImageHost_Task(void);
+

                void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
                void EVENT_USB_Host_DeviceAttached(void);
                void EVENT_USB_Host_DeviceUnattached(void);
                void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
                void EVENT_USB_Host_DeviceAttached(void);
                void EVENT_USB_Host_DeviceUnattached(void);

-               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
+               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
+                                                           const uint8_t SubErrorCode);

                void EVENT_USB_Host_DeviceEnumerationComplete(void);
 
                void EVENT_USB_Host_DeviceEnumerationComplete(void);
 

-               void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer);
-               void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError);
-               
+               void UnicodeToASCII(uint8_t* UnicodeString,
+                                   char* Buffer);
+               void ShowCommandError(uint8_t ErrorCode,
+                                     bool ResponseCodeError);
+

 #endif
 #endif

+