Fixed AVRISP project not sending a full erase-and-write EEPROM command to XMEGA targe...

[pub/USBasp.git] / Projects / TemperatureDataLogger / Descriptors.h

diff --git a/Projects/TemperatureDataLogger/Descriptors.h b/Projects/TemperatureDataLogger/Descriptors.h
index a0f03c3..a2ab585 100644 (file)
--- a/Projects/TemperatureDataLogger/Descriptors.h
+++ b/Projects/TemperatureDataLogger/Descriptors.h
@@ -1,60 +1,60 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2010.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
- \r
-#ifndef _DESCRIPTORS_H_\r
-#define _DESCRIPTORS_H_\r
-\r
-       /* Includes: */\r
-               #include <avr/pgmspace.h>\r
-\r
-               #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/MassStorage.h>\r
-               #include <LUFA/Drivers/USB/Class/HID.h>\r
-               \r
-               #include "TempDataLogger.h"\r
-\r
-       /* Macros: */\r
-               /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */\r
-               #define MASS_STORAGE_IN_EPNUM          3        \r
-\r
-               /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */\r
-               #define MASS_STORAGE_OUT_EPNUM         4        \r
-\r
-               /** Size in bytes of the Mass Storage data endpoints. */\r
-               #define MASS_STORAGE_IO_EPSIZE         64\r
-\r
-               /** Endpoint number of the Generic HID reporting IN endpoint. */\r
-               #define GENERIC_IN_EPNUM               1\r
-\r
-               /** Size in bytes of the Generic HID reporting endpoint. */\r
-               #define GENERIC_EPSIZE                 16\r
-               \r
-               /** Size in bytes of the Generic HID reports (including report ID byte). */\r
-               #define GENERIC_REPORT_SIZE            sizeof(Device_Report_t)\r
-               \r
-       /* Type Defines: */             \r
-               /** Type define for the device configuration descriptor structure. This must be defined in the\r
-                *  application code, as the configuration descriptor contains several sub-descriptors which\r
-                *  vary between devices, and which describe the device's usage to the host.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Configuration_Header_t Config;\r
-                       USB_Descriptor_Interface_t            MSInterface;\r
-                       USB_Descriptor_Endpoint_t             MSDataInEndpoint;\r
-                       USB_Descriptor_Endpoint_t             MSDataOutEndpoint;\r
-                       USB_Descriptor_Interface_t            HIDInterface;\r
-                       USB_HID_Descriptor_t                  HIDInfo;\r
-                       USB_Descriptor_Endpoint_t             HIDDataInEndpoint;\r
-               } USB_Descriptor_Configuration_t;\r
-               \r
-       /* Function Prototypes: */\r
-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
-\r
-#endif\r
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+ 
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+       /* Includes: */
+               #include <avr/pgmspace.h>
+
+               #include <LUFA/Drivers/USB/USB.h>
+               #include <LUFA/Drivers/USB/Class/MassStorage.h>
+               #include <LUFA/Drivers/USB/Class/HID.h>
+               
+               #include "TempDataLogger.h"
+
+       /* Macros: */
+               /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */
+               #define MASS_STORAGE_IN_EPNUM          3        
+
+               /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */
+               #define MASS_STORAGE_OUT_EPNUM         4        
+
+               /** Size in bytes of the Mass Storage data endpoints. */
+               #define MASS_STORAGE_IO_EPSIZE         64
+
+               /** Endpoint number of the Generic HID reporting IN endpoint. */
+               #define GENERIC_IN_EPNUM               1
+
+               /** Size in bytes of the Generic HID reporting endpoint. */
+               #define GENERIC_EPSIZE                 16
+               
+               /** Size in bytes of the Generic HID reports (including report ID byte). */
+               #define GENERIC_REPORT_SIZE            sizeof(Device_Report_t)
+               
+       /* Type Defines: */             
+               /** Type define for the device configuration descriptor structure. This must be defined in the
+                *  application code, as the configuration descriptor contains several sub-descriptors which
+                *  vary between devices, and which describe the device's usage to the host.
+                */
+               typedef struct
+               {
+                       USB_Descriptor_Configuration_Header_t Config;
+                       USB_Descriptor_Interface_t            MS_Interface;
+                       USB_Descriptor_Endpoint_t             MS_DataInEndpoint;
+                       USB_Descriptor_Endpoint_t             MS_DataOutEndpoint;
+                       USB_Descriptor_Interface_t            HID_Interface;
+                       USB_HID_Descriptor_t                  HID_GenericHID;
+                       USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;
+               } USB_Descriptor_Configuration_t;
+               
+       /* Function Prototypes: */
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif