Update Studio Integration DLL, to include package logging.

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

diff --git a/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h b/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h
index 2e4730c..392abd1 100644 (file)
--- a/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/VirtualSerialHost/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


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

-               
-               #include "VirtualSerialHost.h"
-               
-       /* Macros: */
-               /** Interface Class value for the CDC class. */
-               #define CDC_CONTROL_CLASS              0x02
-
-               /** Interface Class value for the CDC Communication Interface subclass. */
-               #define CDC_CONTROL_SUBCLASS           0x02
-
-               /** Interface Class value for the CDC protocol. */
-               #define CDC_CONTROL_PROTOCOL           0x01
-               
-               /** Interface Class value for the CDC data class. */
-               #define CDC_DATA_CLASS                 0x0A

 
 

-               /** Interface Class value for the CDC data subclass. */
-               #define CDC_DATA_SUBCLASS              0x00
+               #include "VirtualSerialHost.h"

 
 

-               /** Interface Class value for the CDC data protocol. */
-               #define CDC_DATA_PROTOCOL              0x00
-       
-               /** Pipe number for the CDC data IN pipe. */
-               #define CDC_DATA_IN_PIPE               1
+       /* Macros: */
+               /** Pipe address for the CDC data IN pipe. */
+               #define CDC_DATA_IN_PIPE               (PIPE_DIR_IN  | 1)

 
 

-               /** Pipe number for the CDC data OUT pipe. */
-               #define CDC_DATA_OUT_PIPE              2
+               /** Pipe address for the CDC data OUT pipe. */
+               #define CDC_DATA_OUT_PIPE              (PIPE_DIR_OUT | 2)

 
 

-               /** Pipe number for the CDC notification pipe. */
-               #define CDC_NOTIFICATION_PIPE          3
+               /** Pipe address for the CDC notification IN pipe. */
+               #define CDC_NOTIFICATION_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. */


@@ -81,10 +63,11 @@
                };
 
        /* Function Prototypes: */
                };
 
        /* Function Prototypes: */

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

                uint8_t DComp_NextCDCControlInterface(void* CurrentDescriptor);
                uint8_t DComp_NextCDCDataInterface(void* CurrentDescriptor);
                uint8_t DComp_NextCDCDataInterfaceEndpoint(void* CurrentDescriptor);
                uint8_t DComp_NextCDCControlInterface(void* CurrentDescriptor);
                uint8_t DComp_NextCDCDataInterface(void* CurrentDescriptor);
                uint8_t DComp_NextCDCDataInterfaceEndpoint(void* CurrentDescriptor);

-               
+

 #endif
 #endif

+