X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f1199200e167a737a4676378da184387e543830c..2a0c28e6e47c8a173f32fc99cd8666a2633c5c12:/Demos/Host/LowLevel/CDCHost/CDCHost.h

diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.h b/Demos/Host/LowLevel/CDCHost/CDCHost.h
index afec780e7..9e1d63864 100644
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.h
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.h
@@ -43,12 +43,11 @@
 		#include <avr/power.h>
 		#include <stdio.h>
 
-		#include <LUFA/Version.h>                                // Library Version Information
-		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes
-		#include <LUFA/Drivers/USB/USB.h>                        // USB Functionality
-		#include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream 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/Misc/TerminalCodes.h>
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
 		
 		#include "ConfigDescriptor.h"
 		
@@ -62,27 +61,66 @@
 		/** Pipe number for the CDC notification pipe */
 		#define CDC_NOTIFICATIONPIPE           3
 
-	/* Enums: */
-		/** Enum for the possible status codes for passing to the UpdateStatus() function. */
-		enum CDCHost_StatusCodes_t
+		/** 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: */
+		/** Class state structure. An instance of this structure should be made for each CDC interface
+		 *  within the user application, and passed to each of the CDC class driver functions as the
+		 *  CDCInterfaceInfo parameter. The contents of this structure should be set to their correct
+		 *  values when used, or ommitted to force the library to use default values.
+		 */
+		typedef struct
 		{
-			Status_USBNotReady      = 0, /**< USB is not ready (disconnected from a USB device) */
-			Status_USBEnumerating   = 1, /**< USB interface is enumerating */
-			Status_USBReady         = 2, /**< USB interface is connected and ready */
-			Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */
-			Status_HardwareError    = 4, /**< Hardware error while enumerating the attached USB device */
-		};
+			const struct
+			{
+				uint8_t  ControlInterfaceNumber; /**< Interface number of the CDC control interface within the device */
 
-	/* Task Definitions: */
-		TASK(USB_CDC_Host);
+				uint8_t  DataINEndpointNumber; /**< Endpoint number of the CDC interface's IN data endpoint */
+				uint16_t DataINEndpointSize; /**< Size in bytes of the CDC interface's IN data endpoint */
 
+				uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the CDC interface's OUT data endpoint */
+				uint16_t DataOUTEndpointSize;  /**< Size in bytes of the CDC interface's OUT data endpoint */
+
+				uint8_t  NotificationEndpointNumber; /**< Endpoint number of the CDC interface's IN notification endpoint, if used */
+				uint16_t NotificationEndpointSize;  /**< Size in bytes of the CDC interface's IN notification endpoint, if used */
+			} Config;
+			
+			struct
+			{
+				uint8_t  ControlLineState; /**< Current control line states, as set by the host */
+
+				struct
+				{
+					uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */
+					uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the
+										  *   CDCDevice_CDC_LineCodingFormats_t enum
+										  */
+					uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the
+										  *   CDCDevice_LineCodingParity_t enum
+										  */
+					uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */
+				} LineEncoding;
+			} State;
+		} USB_ClassInfo_CDC_Host_t;
+		
 	/* Function Prototypes: */
+		void SetupHardware(void);
+		void CDC_Host_Task(void);
+	
 		void EVENT_USB_HostError(const uint8_t ErrorCode);
 		void EVENT_USB_DeviceAttached(void);
 		void EVENT_USB_DeviceUnattached(void);
 		void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
 		void EVENT_USB_DeviceEnumerationComplete(void);
-
-		void UpdateStatus(uint8_t CurrentStatus);
 		
 #endif