ported usb-serial to new lufa version

1 files changed, 30 insertions, 9 deletions

diff --git a/lib/lufa-descriptor-usbserial.h b/lib/lufa-descriptor-usbserial.h
index 3bb021a..2c9ecaa 100644
--- a/lib/lufa-descriptor-usbserial.h
+++ b/lib/lufa-descriptor-usbserial.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2014.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  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
   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.
 
-  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
@@ -42,14 +42,14 @@
     #include <LUFA/Drivers/USB/USB.h>
 
   /* Macros: */
-    /** Endpoint number of the CDC device-to-host notification IN endpoint. */
-    #define CDC_NOTIFICATION_EPNUM         2
+    /** Endpoint address of the CDC device-to-host notification IN endpoint. */
+    #define CDC_NOTIFICATION_EPADDR        (ENDPOINT_DIR_IN  | 2)
 
-    /** Endpoint number of the CDC device-to-host data IN endpoint. */
-    #define CDC_TX_EPNUM                   3
+    /** Endpoint address of the CDC device-to-host data IN endpoint. */
+    #define CDC_TX_EPADDR                  (ENDPOINT_DIR_IN  | 3)
 
-    /** Endpoint number of the CDC host-to-device data OUT endpoint. */
-    #define CDC_RX_EPNUM                   4
+    /** Endpoint address of the CDC host-to-device data OUT endpoint. */
+    #define CDC_RX_EPADDR                  (ENDPOINT_DIR_OUT | 4)
 
     /** Size in bytes of the CDC device-to-host notification IN endpoint. */
     #define CDC_NOTIFICATION_EPSIZE        8
@@ -79,6 +79,27 @@
       USB_Descriptor_Endpoint_t                CDC_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_CDC_CCI = 0, /**< CDC CCI interface descriptor ID */
+      INTERFACE_ID_CDC_DCI = 1, /**< CDC 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
+    {
+      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,
                                         const uint8_t wIndex,