Fix CDC device driver not returning written character on putchar success.

[pub/USBasp.git] / Demos / Device / LowLevel / DualVirtualSerial / Descriptors.h

diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
index a5a87dc..6b84144 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2018.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  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


@@ -102,20 +102,32 @@
                        USB_Descriptor_Endpoint_t                CDC2_DataInEndpoint;
                } USB_Descriptor_Configuration_t;
 
                        USB_Descriptor_Endpoint_t                CDC2_DataInEndpoint;
                } USB_Descriptor_Configuration_t;
 

+               /** Enum for the device interface descriptor IDs within the device. Each interface descriptor
+                *  should have a unique ID index associated with it, which can be used to refer to the
+                *  interface from other descriptors.
+                */
+               enum InterfaceDescriptors_t
+               {
+                       INTERFACE_ID_CDC1_CCI = 0, /**< CDC1 CCI interface descriptor ID */
+                       INTERFACE_ID_CDC1_DCI = 1, /**< CDC1 DCI interface descriptor ID */
+                       INTERFACE_ID_CDC2_CCI = 2, /**< CDC2 CCI interface descriptor ID */
+                       INTERFACE_ID_CDC2_DCI = 3, /**< CDC2 DCI interface descriptor ID */
+               };
+

                /** Enum for the device string descriptor IDs within the device. Each string descriptor should
                 *  have a unique ID index associated with it, which can be used to refer to the string from
                 *  other descriptors.
                 */
                enum StringDescriptors_t
                {
                /** Enum for the device string descriptor IDs within the device. Each string descriptor should
                 *  have a unique ID index associated with it, which can be used to refer to the string from
                 *  other descriptors.
                 */
                enum StringDescriptors_t
                {

-                   STRING_ID_Language      = 0, /**< Supported Languages string descriptor ID (must be zero) */
-                   STRING_ID_Manufacturer  = 1, /**< Manufacturer string ID */
-                   STRING_ID_Product       = 2, /**< Product string ID */
+                       STRING_ID_Language     = 0, /**< Supported Languages string descriptor ID (must be zero) */
+                       STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */
+                       STRING_ID_Product      = 2, /**< Product string ID */

                };
 
        /* Function Prototypes: */
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                };
 
        /* Function Prototypes: */
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,

                                                    const void** const DescriptorAddress)
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
                                                    const void** const DescriptorAddress)
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);