Only deque from the USBtoSerial's USB->USART buffer when the USART is idle.

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

diff --git a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h
index 929d658..7a00f40 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.h
@@ -1,24 +1,24 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   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 2014  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.
 
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -38,27 +38,18 @@
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>

-               
-               #include "StillImageHost.h"
-               
-       /* Macros: */
-               /** Interface Class value for the Still Image Device class. */
-               #define SIMAGE_CLASS                   0x06

 
 

-               /** Interface Class value for the Still Image Device subclass. */
-               #define SIMAGE_SUBCLASS                0x01
+               #include "StillImageHost.h"

 
 

-               /** Interface Class value for the Still Image Device protocol. */
-               #define SIMAGE_PROTOCOL                0x01
-       
-               /** Pipe number of the Still Image data IN pipe. */
-               #define SIMAGE_DATA_IN_PIPE            1
+       /* Macros: */
+               /** Pipe address of the Still Image data IN pipe. */
+               #define SIMAGE_DATA_IN_PIPE            (PIPE_DIR_IN  | 1)

 
 

-               /** Pipe number of the Still Image data OUT pipe. */
-               #define SIMAGE_DATA_OUT_PIPE           2
+               /** Pipe address of the Still Image data OUT pipe. */
+               #define SIMAGE_DATA_OUT_PIPE           (PIPE_DIR_OUT | 2)

 
 

-               /** Pipe number of the Still Image events pipe. */
-               #define SIMAGE_EVENTS_PIPE             3
+               /** Pipe address of the Still Image events IN pipe. */
+               #define SIMAGE_EVENTS_PIPE             (PIPE_DIR_IN  | 3)

 
        /* Enums: */
                /** Enum for the possible return codes of the \ref ProcessConfigurationDescriptor() function. */
 
        /* Enums: */
                /** Enum for the possible return codes of the \ref ProcessConfigurationDescriptor() function. */


@@ -70,7 +61,7 @@
                        InvalidConfigDataReturned       = 3, /**< The device returned an invalid Configuration Descriptor */
                        NoCompatibleInterfaceFound      = 4, /**< A compatible interface with the required endpoints was not found */
                };
                        InvalidConfigDataReturned       = 3, /**< The device returned an invalid Configuration Descriptor */
                        NoCompatibleInterfaceFound      = 4, /**< A compatible interface with the required endpoints was not found */
                };

-       
+

        /* Function Prototypes: */
                uint8_t ProcessConfigurationDescriptor(void);
 
        /* Function Prototypes: */
                uint8_t ProcessConfigurationDescriptor(void);
 


@@ -78,3 +69,4 @@
                uint8_t DComp_NextStillImageInterfaceDataEndpoint(void* CurrentDescriptor);
 
 #endif
                uint8_t DComp_NextStillImageInterfaceDataEndpoint(void* CurrentDescriptor);
 
 #endif

+