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 b25f3bd..d72f75c 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
@@ -1,13 +1,13 @@
 /*
              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
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   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,20 +38,11 @@
                #include "Lib/PrinterCommands.h"
 
        /* Macros: */
                #include "Lib/PrinterCommands.h"
 
        /* Macros: */

-               /** Interface Class value for the Printer Device class. */
-               #define PRINTER_CLASS                    0x07
+               /** Pipe address of the Printer data IN pipe. */
+               #define PRINTER_DATA_IN_PIPE             (PIPE_DIR_IN  | 1)

 
 

-               /** 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
-
-               /** 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. */


@@ -68,12 +59,12 @@
                /** Interface index of the Bidirectional Printer interface within the device, once the Configuration
                 *  Descriptor has been processed.
                 */
                /** 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: */
                uint8_t ProcessConfigurationDescriptor(void);
 
        /* Function Prototypes: */
                uint8_t ProcessConfigurationDescriptor(void);