Update Studio Integration DLL, to include package logging.

[pub/USBasp.git] / Projects / AVRISP-MKII / AVRISPDescriptors.h

diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.h b/Projects/AVRISP-MKII/AVRISPDescriptors.h
index 20fce99..b9ce100 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISPDescriptors.h
+++ b/Projects/AVRISP-MKII/AVRISPDescriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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

-  Copyright 2012  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


@@ -41,7 +41,7 @@
 
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/LEDs.h>
 
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/LEDs.h>

-               
+

                #include "Config/AppConfig.h"
 
        /* Preprocessor Checks: */
                #include "Config/AppConfig.h"
 
        /* Preprocessor Checks: */


@@ -67,7 +67,7 @@
                        /** Endpoint address of the AVRISP data IN endpoint. */
                        #define AVRISP_DATA_IN_EPADDR      AVRISP_DATA_IN_EPADDR_JUNGO
                #endif
                        /** Endpoint address of the AVRISP data IN endpoint. */
                        #define AVRISP_DATA_IN_EPADDR      AVRISP_DATA_IN_EPADDR_JUNGO
                #endif

-               
+

                /** Size in bytes of the AVRISP data endpoint. */
                #define AVRISP_DATA_EPSIZE             64
 
                /** Size in bytes of the AVRISP data endpoint. */
                #define AVRISP_DATA_EPSIZE             64
 


@@ -86,11 +86,32 @@
                        USB_Descriptor_Endpoint_t                AVRISP_DataOutEndpoint;
                } AVRISP_USB_Descriptor_Configuration_t;
 
                        USB_Descriptor_Endpoint_t                AVRISP_DataOutEndpoint;
                } AVRISP_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_AVRISP = 0, /**< AVRISP 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 AVRISP_StringDescriptors_t
+               {
+                       AVRISP_STRING_ID_Language     = 0, /**< Supported Languages string descriptor ID (must be zero) */
+                       AVRISP_STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */
+                       AVRISP_STRING_ID_Product      = 2, /**< Product string ID */
+                       AVRISP_STRING_ID_Serial       = 3, /**< Serial number string ID */
+               };
+

        /* External Variables: */
                #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
                        extern uint8_t AVRISP_CurrDataINEndpointAddress;
                #endif
        /* External Variables: */
                #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
                        extern uint8_t AVRISP_CurrDataINEndpointAddress;
                #endif

-               
+

        /* Function Prototypes: */
                uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                                              const uint8_t wIndex,
        /* Function Prototypes: */
                uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                                              const uint8_t wIndex,