Added new \ref SPI_GetCurrentMode() function to the SPI peripheral driver.

[pub/USBasp.git] / Demos / Host / ClassDriver / StillImageHost / StillImageHost.c

diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
index 152639f..91c482a 100644 (file)
--- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
+++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   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 2011  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


@@ -33,7 +33,7 @@
  *  Main source file for the StillImageHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  *  Main source file for the StillImageHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */

- 
+

 #include "StillImageHost.h"
 
 /** LUFA Still Image Class driver interface configuration and state information. This structure is
 #include "StillImageHost.h"
 
 /** LUFA Still Image Class driver interface configuration and state information. This structure is


@@ -46,15 +46,16 @@ USB_ClassInfo_SI_Host_t DigitalCamera_SI_Interface =
                        {
                                .DataINPipeNumber       = 1,
                                .DataINPipeDoubleBank   = false,
                        {
                                .DataINPipeNumber       = 1,
                                .DataINPipeDoubleBank   = false,

-                               
+

                                .DataOUTPipeNumber      = 2,
                                .DataOUTPipeDoubleBank  = false,
                                .DataOUTPipeNumber      = 2,
                                .DataOUTPipeDoubleBank  = false,

-                               
+

                                .EventsPipeNumber       = 3,
                                .EventsPipeDoubleBank   = false,
                        },
        };
 
                                .EventsPipeNumber       = 3,
                                .EventsPipeDoubleBank   = false,
                        },
        };
 

+

 /** Main program entry point. This routine configures the hardware required by the application, then
  *  enters a loop to run the application tasks in sequence.
  */
 /** Main program entry point. This routine configures the hardware required by the application, then
  *  enters a loop to run the application tasks in sequence.
  */


@@ -73,7 +74,7 @@ int main(void)
                {
                        case HOST_STATE_Addressed:
                                LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
                {
                        case HOST_STATE_Addressed:
                                LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

-                       
+

                                uint16_t ConfigDescriptorSize;
                                uint8_t  ConfigDescriptorData[512];
 
                                uint16_t ConfigDescriptorSize;
                                uint8_t  ConfigDescriptorData[512];
 


@@ -86,15 +87,15 @@ int main(void)
                                        break;
                                }
 
                                        break;
                                }
 

-                               if (SImage_Host_ConfigurePipes(&DigitalCamera_SI_Interface,
-                                                              ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError)
+                               if (SI_Host_ConfigurePipes(&DigitalCamera_SI_Interface,
+                                                          ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError)

                                {
                                        puts_P(PSTR("Attached Device Not a Valid Still Image Class Device.\r\n"));
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
                                {
                                        puts_P(PSTR("Attached Device Not a Valid Still Image Class Device.\r\n"));
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }

-                               
+

                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
                                {
                                        puts_P(PSTR("Error Setting Device Configuration.\r\n"));
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
                                {
                                        puts_P(PSTR("Error Setting Device Configuration.\r\n"));


@@ -102,15 +103,15 @@ int main(void)
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }

-                               
+

                                puts_P(PSTR("Still Image Device Enumerated.\r\n"));
                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_Configured;
                                break;
                        case HOST_STATE_Configured:
                                puts_P(PSTR("Opening Session...\r\n"));
                                puts_P(PSTR("Still Image Device Enumerated.\r\n"));
                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_Configured;
                                break;
                        case HOST_STATE_Configured:
                                puts_P(PSTR("Opening Session...\r\n"));

-                               
-                               if (SImage_Host_OpenSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError)
+
+                               if (SI_Host_OpenSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError)

                                {
                                        puts_P(PSTR("Could not open PIMA session.\r\n"));
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                {
                                        puts_P(PSTR("Could not open PIMA session.\r\n"));
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;


@@ -119,31 +120,31 @@ int main(void)
 
                                puts_P(PSTR("Turning off Device...\r\n"));
 
 
                                puts_P(PSTR("Turning off Device...\r\n"));
 

-                               SImage_Host_SendCommand(&DigitalCamera_SI_Interface, 0x1013, 0, NULL);
-                               if (SImage_Host_ReceiveResponse(&DigitalCamera_SI_Interface))
+                               SI_Host_SendCommand(&DigitalCamera_SI_Interface, 0x1013, 0, NULL);
+                               if (SI_Host_ReceiveResponse(&DigitalCamera_SI_Interface))

                                {
                                        puts_P(PSTR("Could not turn off device.\r\n"));
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                {
                                        puts_P(PSTR("Could not turn off device.\r\n"));
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;

-                                       break;                                  
+                                       break;

                                }
 
                                puts_P(PSTR("Device Off.\r\n"));
 
                                puts_P(PSTR("Closing Session...\r\n"));
 
                                }
 
                                puts_P(PSTR("Device Off.\r\n"));
 
                                puts_P(PSTR("Closing Session...\r\n"));
 

-                               if (SImage_Host_CloseSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError)
+                               if (SI_Host_CloseSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError)

                                {
                                        puts_P(PSTR("Could not close PIMA session.\r\n"));
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
                                {
                                        puts_P(PSTR("Could not close PIMA session.\r\n"));
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }

-                               
+

                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                break;
                }
                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                break;
                }

-       
-               SImage_Host_USBTask(&DigitalCamera_SI_Interface);
+
+               SI_Host_USBTask(&DigitalCamera_SI_Interface);

                USB_USBTask();
        }
 }
                USB_USBTask();
        }
 }


@@ -159,9 +160,12 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */

-       SerialStream_Init(9600, false);
+       Serial_Init(9600, false);

        LEDs_Init();
        USB_Init();
        LEDs_Init();
        USB_Init();

+
+       /* Create a stdio stream for the serial port for stdin and stdout */
+       Serial_CreateStream(NULL);

 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and


@@ -193,7 +197,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {

-       USB_ShutDown();
+       USB_Disable();

 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);


@@ -212,6 +216,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
                                 " -- Error Code %d\r\n"
                                 " -- Sub Error Code %d\r\n"
                                 " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
                                 " -- Error Code %d\r\n"
                                 " -- Sub Error Code %d\r\n"
                                 " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);

-       
+

        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }

+