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

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

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
index f069e8e..53f32a2 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2010.\r
+     Copyright (C) Dean Camera, 2011.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
+           www.lufa-lib.org\r
 */\r
 \r
 /*\r
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
@@ -90,16 +90,16 @@
                        \r
                        struct\r
                        {\r
-                               unsigned char ListenOnly             : 1;\r
-                               unsigned char TalkOnly               : 1;\r
-                               unsigned char PulseIndicateSupported : 1;\r
-                               unsigned char Reserved               : 5;\r
+                               unsigned ListenOnly             : 1;\r
+                               unsigned TalkOnly               : 1;\r
+                               unsigned PulseIndicateSupported : 1;\r
+                               unsigned Reserved               : 5;\r
                        } Interface;\r
                        \r
                        struct\r
                        {\r
-                               unsigned char SupportsAbortINOnMatch : 1;\r
-                               unsigned char Reserved               : 7;\r
+                               unsigned SupportsAbortINOnMatch : 1;\r
+                               unsigned Reserved               : 7;\r
                        } Device;\r
                        \r
                        uint8_t Reserved2[6];\r
@@ -108,16 +108,16 @@
                \r
                typedef struct\r
                {\r
-                       unsigned char LastMessageTransaction : 1;\r
-                       unsigned char Reserved               : 7;\r
+                       unsigned LastMessageTransaction     : 1;\r
+                       unsigned Reserved                   : 7;\r
 \r
                        uint8_t Reserved2[3];\r
                } TMC_DevOUTMessageHeader_t;\r
 \r
                typedef struct\r
                {\r
-                       unsigned char TermCharEnabled        : 1;\r
-                       unsigned char Reserved               : 7;\r
+                       unsigned TermCharEnabled            : 1;\r
+                       unsigned Reserved                   : 7;\r
 \r
                        uint8_t TermChar;\r
                        uint8_t Reserved2[2];\r
@@ -148,10 +148,7 @@
                void EVENT_USB_Device_Connect(void);\r
                void EVENT_USB_Device_Disconnect(void);\r
                void EVENT_USB_Device_ConfigurationChanged(void);\r
-               void EVENT_USB_Device_UnhandledControlRequest(void);\r
-\r
-               uint8_t StreamCallback_AbortINOnRequest(void);\r
-               uint8_t StreamCallback_AbortOUTOnRequest(void);\r
+               void EVENT_USB_Device_ControlRequest(void);\r
 \r
 #endif\r