X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2793c88fc601dcc7ec4961326dd9748a20f3ec83..33a018474913701fa9ef8e962acf58accd1184d2:/Demos/Device/LowLevel/DualCDC/DualCDC.h

diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.h b/Demos/Device/LowLevel/DualCDC/DualCDC.h
index 117af601e..d6f09e643 100644
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.h
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.h
@@ -44,11 +44,10 @@
 
 		#include "Descriptors.h"
 
-		#include <LUFA/Version.h>                        // Library Version Information
-		#include <LUFA/Drivers/USB/USB.h>                // USB Functionality
-		#include <LUFA/Drivers/Board/Joystick.h>         // Joystick driver
-		#include <LUFA/Drivers/Board/LEDs.h>             // LEDs driver
-		#include <LUFA/Scheduler/Scheduler.h>            // Simple scheduler for task management
+		#include <LUFA/Version.h>
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/Board/Joystick.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
 
 	/* Macros: */
 		/** CDC Class specific request to get the current virtual serial port configuration settings. */
@@ -60,6 +59,18 @@
 		/** CDC Class specific request to set the current virtual serial port handshake line states. */
 		#define REQ_SetControlLineState      0x22
 
+		/** 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)
+
 	/* Type Defines: */
 		/** Type define for the virtual serial port line encoding settings, for storing the current USART configuration
 		 *  as set by the host via a class specific request.
@@ -95,24 +106,14 @@
 			Parity_Space        = 4, /**< Space parity bit mode on each frame */
 		};
 
-		/** Enum for the possible status codes for passing to the UpdateStatus() function. */
-		enum DualCDC_StatusCodes_t
-		{
-			Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */
-			Status_USBEnumerating = 1, /**< USB interface is enumerating */
-			Status_USBReady       = 2, /**< USB interface is connected and ready */
-		};
-
-	/* Tasks: */
-		TASK(CDC1_Task);
-		TASK(CDC2_Task);
-
 	/* Function Prototypes: */
+		void CDC1_Task(void);
+		void CDC2_Task(void);
+		void SetupHardware(void);
+
 		void EVENT_USB_Connect(void);
 		void EVENT_USB_Disconnect(void);
 		void EVENT_USB_ConfigurationChanged(void);
 		void EVENT_USB_UnhandledControlPacket(void);
-
-		void UpdateStatus(uint8_t CurrentStatus);
 		
 #endif