Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / Device / Incomplete / TestAndMeasurement / Descriptors.h

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
index 468a5ea..7b4fb0b 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2010.\r
+     Copyright (C) Dean Camera, 2011.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
               \r
   dean [at] fourwalledcubicle [dot] com\r

-      www.fourwalledcubicle.com\r
+           www.lufa-lib.org\r

 */\r
 \r
 /*\r
 */\r
 \r
 /*\r

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

   Copyright 2010  Peter Lawrence (majbthrd [at] gmail [dot] com)\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   Copyright 2010  Peter Lawrence (majbthrd [at] gmail [dot] com)\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r


@@ -43,15 +43,15 @@
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r

+               /** Endpoint number of the TMC notification IN endpoint. */\r
+               #define TMC_NOTIFICATION_EPNUM  2       \r
+\r

                /** Endpoint number of the TMC device-to-host data IN endpoint. */\r
                #define TMC_IN_EPNUM            3       \r
 \r
                /** Endpoint number of the TMC host-to-device data OUT endpoint. */\r
                #define TMC_OUT_EPNUM           4       \r
 \r
                /** Endpoint number of the TMC device-to-host data IN endpoint. */\r
                #define TMC_IN_EPNUM            3       \r
 \r
                /** Endpoint number of the TMC host-to-device data OUT endpoint. */\r
                #define TMC_OUT_EPNUM           4       \r
 \r

-               /** Endpoint number of the TMC notification IN endpoint. */\r
-               #define TMC_NOTIFICATION_EPNUM  2       \r
-\r

                /** Size in bytes of the TMC data endpoints. */\r
                #define TMC_IO_EPSIZE           64\r
 \r
                /** Size in bytes of the TMC data endpoints. */\r
                #define TMC_IO_EPSIZE           64\r
 \r


@@ -66,15 +66,19 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r

-                       USB_Descriptor_Interface_t            Interface;\r
-                       USB_Descriptor_Endpoint_t             DataOutEndpoint;\r
-                       USB_Descriptor_Endpoint_t             DataInEndpoint;\r
-                       USB_Descriptor_Endpoint_t             NotificationEndpoint;\r
+                       \r
+                       // Test and Measurement Interface\r
+                       USB_Descriptor_Interface_t            TM_Interface;\r
+                       USB_Descriptor_Endpoint_t             TM_DataOutEndpoint;\r
+                       USB_Descriptor_Endpoint_t             TM_DataInEndpoint;\r
+                       USB_Descriptor_Endpoint_t             TM_NotificationEndpoint;\r

                } USB_Descriptor_Configuration_t;\r
 \r
        /* Function Prototypes: */\r
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,\r
                                                    const uint8_t wIndex,\r
                } USB_Descriptor_Configuration_t;\r
 \r
        /* Function Prototypes: */\r
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,\r
                                                    const uint8_t wIndex,\r

-                                                   void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
+                                                   const void** const DescriptorAddress)\r
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r

 \r
 #endif\r
 \r
 #endif\r

+