X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cb779e3d7d32d7c43e0a45bb526de0a04135b0c7..c7344c22ac700dacf55a8dc729111dd7781c5fed:/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
index b87618fa8..bd93154f8 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.
               
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  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
@@ -39,7 +39,6 @@
 
 		#include "Descriptors.h"
 
-		#include <LUFA/Version.h>
 		#include <LUFA/Drivers/USB/USB.h>
 		#include <LUFA/Drivers/Board/LEDs.h>
 
@@ -90,16 +89,16 @@
 			
 			struct
 			{
-				unsigned char ListenOnly             : 1;
-				unsigned char TalkOnly               : 1;
-				unsigned char PulseIndicateSupported : 1;
-				unsigned char Reserved               : 5;
+				unsigned ListenOnly             : 1;
+				unsigned TalkOnly               : 1;
+				unsigned PulseIndicateSupported : 1;
+				unsigned Reserved               : 5;
 			} Interface;
 			
 			struct
 			{
-				unsigned char SupportsAbortINOnMatch : 1;
-				unsigned char Reserved               : 7;
+				unsigned SupportsAbortINOnMatch : 1;
+				unsigned Reserved               : 7;
 			} Device;
 			
 			uint8_t Reserved2[6];
@@ -108,19 +107,15 @@
 		
 		typedef struct
 		{
-			unsigned char LastMessageTransaction : 1;
-			unsigned char Reserved               : 7;
-
-			uint8_t Reserved2[3];
+			uint8_t LastMessageTransaction;
+			uint8_t TermChar;
+			uint8_t Reserved[2];
 		} TMC_DevOUTMessageHeader_t;
 
 		typedef struct
 		{
-			unsigned char TermCharEnabled        : 1;
-			unsigned char Reserved               : 7;
-
-			uint8_t TermChar;
-			uint8_t Reserved2[2];
+			uint8_t LastMessageTransaction;
+			uint8_t Reserved[3];
 		} TMC_DevINMessageHeader_t;
 
 		typedef struct
@@ -148,10 +143,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_UnhandledControlRequest(void);
-
-		uint8_t StreamCallback_AbortINOnRequest(void);
-		uint8_t StreamCallback_AbortOUTOnRequest(void);
+		void EVENT_USB_Device_ControlRequest(void);
 
 #endif