Update Studio Integration DLL, to include package logging.

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

diff --git a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
index b0cd56b..d72f75c 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
@@ -1,24 +1,24 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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


@@ -33,25 +33,16 @@
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>

-               
+

                #include "PrinterHost.h"
                #include "Lib/PrinterCommands.h"
                #include "PrinterHost.h"
                #include "Lib/PrinterCommands.h"

-               
-       /* Macros: */
-               /** Interface Class value for the Printer Device class. */
-               #define PRINTER_CLASS                    0x07
-
-               /** Interface Subclass value for the Printer Device class. */
-               #define PRINTER_SUBCLASS                 0x01
-
-               /** Interface Protocol value for a Bidirectional communication encapsulation. */
-               #define PRINTER_PROTOCOL                 0x02

 
 

-               /** Pipe number of the Printer data IN pipe. */
-               #define PRINTER_DATA_IN_PIPE             1
+       /* Macros: */
+               /** Pipe address of the Printer data IN pipe. */
+               #define PRINTER_DATA_IN_PIPE             (PIPE_DIR_IN  | 1)

 
 

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

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


@@ -63,22 +54,23 @@
                        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 */
                };

-       
+

        /* External Variables: */
                /** Interface index of the Bidirectional Printer interface within the device, once the Configuration
                 *  Descriptor has been processed.
                 */
        /* External Variables: */
                /** Interface index of the Bidirectional Printer interface within the device, once the Configuration
                 *  Descriptor has been processed.
                 */

-               uint8_t PrinterInterfaceNumber;
-               
+               extern uint8_t PrinterInterfaceNumber;
+

                /** Interface Alternate Setting index of the Bidirectional Printer interface within the device, once
                 *  the Configuration Descriptor has been processed.
                 */
                /** Interface Alternate Setting index of the Bidirectional Printer interface within the device, once
                 *  the Configuration Descriptor has been processed.
                 */

-               uint8_t PrinterAltSetting;
+               extern uint8_t PrinterAltSetting;

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

-               uint8_t ProcessConfigurationDescriptor(void);   
+               uint8_t ProcessConfigurationDescriptor(void);

 
                uint8_t DComp_NextBidirectionalPrinterInterface(void* CurrentDescriptor);
                uint8_t DComp_NextPrinterInterfaceBulkDataEndpoint(void* CurrentDescriptor);
 
 #endif
 
                uint8_t DComp_NextBidirectionalPrinterInterface(void* CurrentDescriptor);
                uint8_t DComp_NextPrinterInterfaceBulkDataEndpoint(void* CurrentDescriptor);
 
 #endif

+