Re-add in old Endpoint/Pipe workaround for unordered pipes - add new ORDERED_EP_CONFI...

[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..9b11bd6 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
@@ -3,7 +3,7 @@
      Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
      Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r

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

 */\r
 \r
 /*\r
 */\r
 \r
 /*\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


@@ -75,6 +75,8 @@
        /* Function Prototypes: */\r
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,\r
                                                    const uint8_t wIndex,\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

+