Tag for the LUFA-120730-BETA release.LUFA-120730-BETA

git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-120730-BETA@2407 d5102386-fcda-11dd-9fdb-3debd5008f28

4 files changed, 246 insertions, 243 deletions

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
index e45654a2..17f68f3a 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
@@ -1,84 +1,84 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-  Copyright 2010  Peter Lawrence (majbthrd [at] gmail [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim 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

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *

- *  Header file for Descriptors.c.

- */

- 

-#ifndef _DESCRIPTORS_H_

-#define _DESCRIPTORS_H_

-

-	/* Includes: */

-		#include <avr/pgmspace.h>

-

-		#include <LUFA/Drivers/USB/USB.h>

-

-	/* Macros: */

-		/** Endpoint address of the TMC notification IN endpoint. */

-		#define TMC_NOTIFICATION_EPADDR  (ENDPOINT_DIR_IN  | 2)

-

-		/** Endpoint address of the TMC device-to-host data IN endpoint. */

-		#define TMC_IN_EPADDR            (ENDPOINT_DIR_IN  | 3)

-

-		/** Endpoint address of the TMC host-to-device data OUT endpoint. */

-		#define TMC_OUT_EPADDR           (ENDPOINT_DIR_OUT | 4)

-

-		/** Size in bytes of the TMC data endpoints. */

-		#define TMC_IO_EPSIZE            64

-

-		/** Size in bytes of the TMC notification endpoint. */

-		#define TMC_NOTIFICATION_EPSIZE  8

-

-	/* 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;

-			

-			// Test and Measurement Interface

-			USB_Descriptor_Interface_t            TM_Interface;

-			USB_Descriptor_Endpoint_t             TM_DataOutEndpoint;

-			USB_Descriptor_Endpoint_t             TM_DataInEndpoint;

-			USB_Descriptor_Endpoint_t             TM_NotificationEndpoint;

-		} USB_Descriptor_Configuration_t;

-

-	/* Function Prototypes: */

-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-		                                    const uint8_t wIndex,

-		                                    const void** const DescriptorAddress)

-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

-

-#endif

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Peter Lawrence (majbthrd [at] gmail [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim 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
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Header file for Descriptors.c.
+ */
+ 
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+	/* Includes: */
+		#include <avr/pgmspace.h>
+
+		#include <LUFA/Drivers/USB/USB.h>
+
+	/* Macros: */
+		/** Endpoint address of the TMC notification IN endpoint. */
+		#define TMC_NOTIFICATION_EPADDR  (ENDPOINT_DIR_IN  | 2)
+
+		/** Endpoint address of the TMC device-to-host data IN endpoint. */
+		#define TMC_IN_EPADDR            (ENDPOINT_DIR_IN  | 3)
+
+		/** Endpoint address of the TMC host-to-device data OUT endpoint. */
+		#define TMC_OUT_EPADDR           (ENDPOINT_DIR_OUT | 4)
+
+		/** Size in bytes of the TMC data endpoints. */
+		#define TMC_IO_EPSIZE            64
+
+		/** Size in bytes of the TMC notification endpoint. */
+		#define TMC_NOTIFICATION_EPSIZE  8
+
+	/* 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;
+			
+			// Test and Measurement Interface
+			USB_Descriptor_Interface_t            TM_Interface;
+			USB_Descriptor_Endpoint_t             TM_DataOutEndpoint;
+			USB_Descriptor_Endpoint_t             TM_DataInEndpoint;
+			USB_Descriptor_Endpoint_t             TM_NotificationEndpoint;
+		} USB_Descriptor_Configuration_t;
+
+	/* Function Prototypes: */
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+		                                    const uint8_t wIndex,
+		                                    const void** const DescriptorAddress)
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
 
diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
index 5102f101..027264ab 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
@@ -71,7 +71,7 @@ static uint16_t LastTransferLength = 0;
 static uint8_t NextResponseBuffer[64];
 
 /** Indicates the length of the next response to send */
-static uint8_t NextReponseLen;
+static uint8_t NextResponseLen;
 
 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
@@ -326,16 +326,16 @@ void ProcessSentMessage(uint8_t* const Data, const uint8_t Length)
 	if (strncmp((char*)Data, "*IDN?", 5) == 0)
 	  strcpy((char*)NextResponseBuffer, "LUFA TMC DEMO");
 
-	NextReponseLen = strlen((char*)NextResponseBuffer);
+	NextResponseLen = strlen((char*)NextResponseBuffer);
 }
 
 uint8_t GetNextMessage(uint8_t* const Data)
 {
 	  strcpy((char*)NextResponseBuffer, "LUFA TMC DEMO");
 
-	NextReponseLen = strlen((char*)NextResponseBuffer);
+	NextResponseLen = strlen((char*)NextResponseBuffer);
 // ---
-	uint8_t DataLen = MIN(NextReponseLen, 64);
+	uint8_t DataLen = MIN(NextResponseLen, 64);
 
 	strlcpy((char*)Data, (char*)NextResponseBuffer, DataLen);
 
diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
index bd93154f..9fa9f23d 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
@@ -1,149 +1,149 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

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

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim 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

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-#ifndef _TESTANDMEASUREMENT_H_

-#define _TESTANDMEASUREMENT_H_

-

-	/* Includes: */

-		#include <avr/io.h>

-		#include <avr/wdt.h>

-		#include <avr/power.h>

-		#include <avr/interrupt.h>

-

-		#include "Descriptors.h"

-

-		#include <LUFA/Drivers/USB/USB.h>

-		#include <LUFA/Drivers/Board/LEDs.h>

-

-	/* Macros: */

-		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */

-		#define LEDMASK_USB_NOTREADY                  LEDS_LED1

-

-		/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */

-		#define LEDMASK_USB_ENUMERATING              (LEDS_LED2 | LEDS_LED3)

-

-		/** LED mask for the library LED driver, to indicate that the USB interface is ready. */

-		#define LEDMASK_USB_READY                    (LEDS_LED2 | LEDS_LED4)

-

-		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */

-		#define LEDMASK_USB_ERROR                    (LEDS_LED1 | LEDS_LED3)

-		

-		/** LED mask for the library LED driver, to indicate that the USB interface is busy. */

-		#define LEDMASK_USB_BUSY                      LEDS_LED2

-

-		#define Req_InitiateAbortBulkOut              0x01

-		#define Req_CheckAbortBulkOutStatus           0x02

-		#define Req_InitiateAbortBulkIn               0x03

-		#define Req_CheckAbortBulkInStatus            0x04

-		#define Req_InitiateClear                     0x05

-		#define Req_CheckClearStatus                  0x06

-		#define Req_GetCapabilities                   0x07

-		#define Req_IndicatorPulse                    0x40

-		

-		#define TMC_STATUS_SUCCESS                    0x01

-		#define TMC_STATUS_PENDING                    0x02

-		#define TMC_STATUS_FAILED                     0x80

-		#define TMC_STATUS_TRANSFER_NOT_IN_PROGRESS   0x81

-		#define TMC_STATUS_SPLIT_NOT_IN_PROGRESS      0x82

-		#define TMC_STATUS_SPLIT_IN_PROGRESS          0x83

-		

-		#define TMC_MESSAGEID_DEV_DEP_MSG_OUT         0x01

-		#define TMC_MESSAGEID_DEV_DEP_MSG_IN          0x02

-		#define TMC_MESSAGEID_DEV_VENDOR_OUT          0x7E

-		#define TMC_MESSAGEID_DEV_VENDOR_IN           0x7F

-

-	/* Type Defines */

-		typedef struct

-		{

-			uint8_t  Status;

-			uint8_t  Reserved;

-

-			uint16_t TMCVersion;

-			

-			struct

-			{

-				unsigned ListenOnly             : 1;

-				unsigned TalkOnly               : 1;

-				unsigned PulseIndicateSupported : 1;

-				unsigned Reserved               : 5;

-			} Interface;

-			

-			struct

-			{

-				unsigned SupportsAbortINOnMatch : 1;

-				unsigned Reserved               : 7;

-			} Device;

-			

-			uint8_t Reserved2[6];

-			uint8_t Reserved3[12];			

-		} TMC_Capabilities_t;

-		

-		typedef struct

-		{

-			uint8_t LastMessageTransaction;

-			uint8_t TermChar;

-			uint8_t Reserved[2];

-		} TMC_DevOUTMessageHeader_t;

-

-		typedef struct

-		{

-			uint8_t LastMessageTransaction;

-			uint8_t Reserved[3];

-		} TMC_DevINMessageHeader_t;

-

-		typedef struct

-		{

-			uint8_t  MessageID;

-			uint8_t  Tag;

-			uint8_t  InverseTag;

-			uint8_t  Reserved;

-			uint32_t TransferSize;

-			

-			union

-			{

-				TMC_DevOUTMessageHeader_t DeviceOUT;

-				TMC_DevINMessageHeader_t  DeviceIN;

-				uint32_t                  VendorSpecific;

-			} MessageIDSpecific;

-		} TMC_MessageHeader_t;

-

-	/* Function Prototypes: */

-		void SetupHardware(void);

-		void TMC_Task(void);

-		bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader);

-		bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader);

-

-		void EVENT_USB_Device_Connect(void);

-		void EVENT_USB_Device_Disconnect(void);

-		void EVENT_USB_Device_ConfigurationChanged(void);

-		void EVENT_USB_Device_ControlRequest(void);

-

-#endif

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  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
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim 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
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#ifndef _TESTANDMEASUREMENT_H_
+#define _TESTANDMEASUREMENT_H_
+
+	/* Includes: */
+		#include <avr/io.h>
+		#include <avr/wdt.h>
+		#include <avr/power.h>
+		#include <avr/interrupt.h>
+
+		#include "Descriptors.h"
+
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
+
+	/* Macros: */
+		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
+		#define LEDMASK_USB_NOTREADY                  LEDS_LED1
+
+		/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
+		#define LEDMASK_USB_ENUMERATING              (LEDS_LED2 | LEDS_LED3)
+
+		/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
+		#define LEDMASK_USB_READY                    (LEDS_LED2 | LEDS_LED4)
+
+		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
+		#define LEDMASK_USB_ERROR                    (LEDS_LED1 | LEDS_LED3)
+		
+		/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
+		#define LEDMASK_USB_BUSY                      LEDS_LED2
+
+		#define Req_InitiateAbortBulkOut              0x01
+		#define Req_CheckAbortBulkOutStatus           0x02
+		#define Req_InitiateAbortBulkIn               0x03
+		#define Req_CheckAbortBulkInStatus            0x04
+		#define Req_InitiateClear                     0x05
+		#define Req_CheckClearStatus                  0x06
+		#define Req_GetCapabilities                   0x07
+		#define Req_IndicatorPulse                    0x40
+		
+		#define TMC_STATUS_SUCCESS                    0x01
+		#define TMC_STATUS_PENDING                    0x02
+		#define TMC_STATUS_FAILED                     0x80
+		#define TMC_STATUS_TRANSFER_NOT_IN_PROGRESS   0x81
+		#define TMC_STATUS_SPLIT_NOT_IN_PROGRESS      0x82
+		#define TMC_STATUS_SPLIT_IN_PROGRESS          0x83
+		
+		#define TMC_MESSAGEID_DEV_DEP_MSG_OUT         0x01
+		#define TMC_MESSAGEID_DEV_DEP_MSG_IN          0x02
+		#define TMC_MESSAGEID_DEV_VENDOR_OUT          0x7E
+		#define TMC_MESSAGEID_DEV_VENDOR_IN           0x7F
+
+	/* Type Defines */
+		typedef struct
+		{
+			uint8_t  Status;
+			uint8_t  Reserved;
+
+			uint16_t TMCVersion;
+			
+			struct
+			{
+				unsigned ListenOnly             : 1;
+				unsigned TalkOnly               : 1;
+				unsigned PulseIndicateSupported : 1;
+				unsigned Reserved               : 5;
+			} Interface;
+			
+			struct
+			{
+				unsigned SupportsAbortINOnMatch : 1;
+				unsigned Reserved               : 7;
+			} Device;
+			
+			uint8_t Reserved2[6];
+			uint8_t Reserved3[12];			
+		} TMC_Capabilities_t;
+		
+		typedef struct
+		{
+			uint8_t LastMessageTransaction;
+			uint8_t TermChar;
+			uint8_t Reserved[2];
+		} TMC_DevOUTMessageHeader_t;
+
+		typedef struct
+		{
+			uint8_t LastMessageTransaction;
+			uint8_t Reserved[3];
+		} TMC_DevINMessageHeader_t;
+
+		typedef struct
+		{
+			uint8_t  MessageID;
+			uint8_t  Tag;
+			uint8_t  InverseTag;
+			uint8_t  Reserved;
+			uint32_t TransferSize;
+			
+			union
+			{
+				TMC_DevOUTMessageHeader_t DeviceOUT;
+				TMC_DevINMessageHeader_t  DeviceIN;
+				uint32_t                  VendorSpecific;
+			} MessageIDSpecific;
+		} TMC_MessageHeader_t;
+
+	/* Function Prototypes: */
+		void SetupHardware(void);
+		void TMC_Task(void);
+		bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader);
+		bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader);
+
+		void EVENT_USB_Device_Connect(void);
+		void EVENT_USB_Device_Disconnect(void);
+		void EVENT_USB_Device_ConfigurationChanged(void);
+		void EVENT_USB_Device_ControlRequest(void);
+
+#endif
 
diff --git a/Demos/Device/Incomplete/TestAndMeasurement/makefile b/Demos/Device/Incomplete/TestAndMeasurement/makefile
index 43070333..13501183 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/makefile
+++ b/Demos/Device/Incomplete/TestAndMeasurement/makefile
@@ -17,17 +17,20 @@ F_USB        = $(F_CPU)
 OPTIMIZATION = s
 TARGET       = TestAndMeasurement
 SRC          = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH    = ../../../../LUFA/
+LUFA_PATH    = ../../../../LUFA
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/
-LD_FLAGS     =
+LD_FLAGS     = 
 
 # Default target
 all:
 
 # Include LUFA build script makefiles
-include $(LUFA_PATH)/Build/lufa.core.in
-include $(LUFA_PATH)/Build/lufa.sources.in
-include $(LUFA_PATH)/Build/lufa.build.in
-#include $(LUFA_PATH)/Build/lufa.doxygen.in
-include $(LUFA_PATH)/Build/lufa.dfu.in
-include $(LUFA_PATH)/Build/lufa.avrdude.in
+include $(LUFA_PATH)/Build/lufa_core.mk
+include $(LUFA_PATH)/Build/lufa_sources.mk
+include $(LUFA_PATH)/Build/lufa_build.mk
+include $(LUFA_PATH)/Build/lufa_cppcheck.mk
+include $(LUFA_PATH)/Build/lufa_doxygen.mk
+include $(LUFA_PATH)/Build/lufa_dfu.mk
+include $(LUFA_PATH)/Build/lufa_hid.mk
+include $(LUFA_PATH)/Build/lufa_avrdude.mk
+include $(LUFA_PATH)/Build/lufa_atprogram.mk