Added new Benito project, a simple modified USB-to-Serial bridge for the...

Added new Benito project, a simple modified USB-to-Serial bridge for the programming of AVRs using the official Arduino bootloader.

Bootloaders/TeensyHID/makefile

@@ -54,7 +54,7 @@ MCU = at90usb162
 # Target board (see library "Board Types" documentation, USER or blank for projects not requiring
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
 # "Board" inside the application directory.
-BOARD  = USBKEY
+BOARD  = 
 
 
 # Processor frequency.

Demos/Device/ClassDriver/CDC/CDC.c

@@ -75,8 +75,7 @@ int main(void)
 	{
 		CheckJoystickMovement();
 		
-		uint16_t BytesToDiscard = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);
-		while (BytesToDiscard--)
+		while (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))
 		  CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
 
 		CDC_Device_USBTask(&VirtualSerial_CDC_Interface);

Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c

@@ -95,7 +95,7 @@ int main(void)
 		if (Tx_Buffer.Elements)
 		  CDC_Device_SendByte(&VirtualSerial_CDC_Interface, Buffer_GetElement(&Tx_Buffer));
 		
-		/* Read bytes from the USART transmit buffer into the USART */
+		/* Load bytes from the USART transmit buffer into the USART */
 		if (Rx_Buffer.Elements)
 		  Serial_TxByte(Buffer_GetElement(&Rx_Buffer));
 		

LUFA/ManPages/ChangeLog.txt

@@ -31,6 +31,7 @@
   *  - Added new PrinterHost demo (thanks to John Andrews)
   *  - Added new USB_DeviceState variable to keep track of the current Device mode USB state
   *  - Added new Endpoint_ClearStatusStage() convenience function to assist with the status stages of control transfers
+  *  - Added new Benito Arduino Programmer project
   *  
   *  <b>Changed:</b>
   *  - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)

LUFA/ManPages/LibraryApps.txt

@@ -91,6 +91,7 @@
  *    - <b>CDC</b> - CDC Class USB bootloader, compatible with any AVR910 protocol programming software such as AVRDude
  *    - <b>TeensyHID</b> - HID Class bootloader, compatible with the PJRC TeensyLoader software
  *  - <b>Projects</b>
+ *    - <b>Benito</b> - Benito Board Arduino Programmer project
  *    - <b>Magstripe</b> - Magnetic Stripe Card Reader project
  *    - <b>MissileLaucher</b> - Toy Missile Launcher Host project
  *

Projects/Benito/Benito.c

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, 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
+ *
+ *  Main source file for the Benito project. This file contains the main tasks of
+ *  the demo and is responsible for the initial application hardware configuration.
+ */
+
+#include "Benito.h"
+
+volatile uint8_t ResetPulseMSRemaining = 0;
+volatile uint8_t TxPulseMSRemaining    = 0;
+volatile uint8_t RxPulseMSRemaining    = 0;
+
+/** LUFA CDC Class driver interface configuration and state information. This structure is
+ *  passed to all CDC Class driver functions, so that multiple instances of the same class
+ *  within a device can be differentiated from one another.
+ */
+USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
+	{
+		.Config = 
+			{
+				.ControlInterfaceNumber     = 0,
+
+				.DataINEndpointNumber       = CDC_TX_EPNUM,
+				.DataINEndpointSize         = CDC_TXRX_EPSIZE,
+
+				.DataOUTEndpointNumber      = CDC_RX_EPNUM,
+				.DataOUTEndpointSize        = CDC_TXRX_EPSIZE,
+
+				.NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM,
+				.NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,
+			},
+		
+		.State =
+			{
+				// Leave all state values to their defaults
+			}
+	};
+
+/** Main program entry point. This routine contains the overall program flow, including initial
+ *  setup of all components and the main program loop.
+ */
+int main(void)
+{
+	SetupHardware();
+
+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+
+	for (;;)
+	{
+		/* Echo bytes from the host to the target via the hardware USART */
+		if (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))
+		{
+			Serial_TxByte(CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
+
+			LEDs_TurnOnLEDs(LEDMASK_TX);
+			TxPulseMSRemaining = TX_RX_LED_PULSE_MS;			
+		}
+		
+		/* Echo bytes from the target to the host via the virtual serial port */
+		if (Serial_IsCharReceived())
+		{
+			CDC_Device_SendByte(&VirtualSerial_CDC_Interface, Serial_RxByte());
+
+			LEDs_TurnOnLEDs(LEDMASK_RX);
+			RxPulseMSRemaining = TX_RX_LED_PULSE_MS;
+		}
+		
+		/* Check if the millisecond timer has elapsed */
+		if (TIFR0 & (1 << OCF0A))
+		{
+			/* Check if the reset pulse period has elapsed, if so tristate the target reset line */
+			if (ResetPulseMSRemaining && !(--ResetPulseMSRemaining))
+			{
+				AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
+				AVR_RESET_LINE_DDR  &= ~AVR_RESET_LINE_MASK;
+			}
+
+			/* Turn off TX LED(s) once the TX pulse period has elapsed */
+			if (TxPulseMSRemaining && !(--TxPulseMSRemaining))
+			  LEDs_TurnOffLEDs(LEDMASK_TX);
+
+			/* Turn off RX LED(s) once the RX pulse period has elapsed */
+			if (RxPulseMSRemaining && !(--RxPulseMSRemaining))
+			  LEDs_TurnOffLEDs(LEDMASK_RX);
+
+			/* Clear the millisecond timer CTC flag (cleared by writing logic one to the register) */
+			TIFR0 |= (1 << OCF0A);		
+		}
+		
+		CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
+		USB_USBTask();
+	}
+}
+
+/** Configures the board hardware and chip peripherals for the demo's functionality. */
+void SetupHardware(void)
+{
+	/* Disable watchdog if enabled by bootloader/fuses */
+	MCUSR &= ~(1 << WDRF);
+	wdt_disable();
+
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
+
+	/* Hardware Initialization */
+	LEDs_Init();
+	USB_Init();
+
+	/* Millisecond Timer Interrupt */
+	OCR0A  = (F_CPU / 64 / 1000);
+	TCCR0A = (1 << WGM01);
+	TCCR0B = ((1 << CS01) | (1 << CS00));
+	
+	/* Tristate target /RESET Line */
+	AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
+	AVR_RESET_LINE_DDR  &= ~AVR_RESET_LINE_MASK;
+}
+
+/** Event handler for the library USB Connection event. */
+void EVENT_USB_Connect(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+}
+
+/** Event handler for the library USB Disconnection event. */
+void EVENT_USB_Disconnect(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+}
+
+/** Event handler for the library USB Configuration Changed event. */
+void EVENT_USB_ConfigurationChanged(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_READY);
+
+	if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface)))
+	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+}
+
+/** Event handler for the library USB Unhandled Control Packet event. */
+void EVENT_USB_UnhandledControlPacket(void)
+{
+	CDC_Device_ProcessControlPacket(&VirtualSerial_CDC_Interface);
+}
+
+/** Event handler for the CDC Class driver Line Encoding Changed event.
+ *
+ *  \param[in] CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced
+ */
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+	uint8_t ConfigMask = 0;
+
+	switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
+	{
+		case CDC_PARITY_Odd:
+			ConfigMask = ((1 << UPM11) | (1 << UPM10));		
+			break;
+		case CDC_PARITY_Even:
+			ConfigMask = (1 << UPM11);		
+			break;
+	}
+
+	if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)
+	  ConfigMask |= (1 << USBS1);
+
+	switch (CDCInterfaceInfo->State.LineEncoding.DataBits)
+	{
+		case 6:
+			ConfigMask |= (1 << UCSZ10);
+			break;
+		case 7:
+			ConfigMask |= (1 << UCSZ11);
+			break;
+		case 8:
+			ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
+			break;
+	}
+	
+	UCSR1A = (1 << U2X1);	
+	UCSR1B = ((1 << TXEN1) | (1 << RXEN1));
+	UCSR1C = ConfigMask;	
+	UBRR1  = SERIAL_2X_UBBRVAL((uint16_t)CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
+}
+
+/** Event handler for the CDC Class driver Host-to-Device Line Encoding Changed event.
+ *
+ *  \param[in] CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced
+ */
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+	/* Check if the DTR line has been asserted - if so, start the target AVR's reset pulse */
+	if (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)
+	{
+		AVR_RESET_LINE_DDR  |= AVR_RESET_LINE_MASK;
+		AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
+
+		ResetPulseMSRemaining = AVR_RESET_PULSE_MS;
+	}
+}

Projects/Benito/Benito.h

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, 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 Benito.c.
+ */
+
+#ifndef _BENITO_H_
+#define _BENITO_H_
+
+	/* Includes: */
+		#include <avr/io.h>
+		#include <avr/wdt.h>
+		#include <avr/interrupt.h>
+		#include <avr/power.h>
+
+		#include "Descriptors.h"
+
+		#include <LUFA/Version.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
+		#include <LUFA/Drivers/Peripheral/Serial.h>
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/CDC.h>
+
+	/* Macros: */
+		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
+		#define LEDMASK_USB_NOTREADY      LEDS_NO_LEDS
+
+		/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
+		#define LEDMASK_USB_ENUMERATING  (LEDS_LED1 | LEDS_LED2)
+
+		/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
+		#define LEDMASK_USB_READY        LEDS_NO_LEDS
+
+		#define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED2)
+		
+		#define LEDMASK_TX               LEDS_LED1
+		#define LEDMASK_RX               LEDS_LED2
+		
+	/* Function Prototypes: */
+		void SetupHardware(void);
+
+		void EVENT_USB_Connect(void);
+		void EVENT_USB_Disconnect(void);
+		void EVENT_USB_ConfigurationChanged(void);
+		void EVENT_USB_UnhandledControlPacket(void);
+		
+		void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
+		void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
+		
+#endif

Projects/Benito/Benito.txt

+/** \file
+ *
+ *  This file contains special DoxyGen information for the generation of the main page and other special
+ *  documentation pages. It is not a project source file.
+ */
+ 
+/** \mainpage Benito Arduino Programmer Project
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
+ *
+ *  \section SSec_Info USB Information:
+ *
+ *  The following table gives a rundown of the USB utilization of this demo.
+ *
+ * <table>
+ *  <tr>
+ *   <td><b>USB Mode:</b></td>
+ *   <td>Device</td>
+ *  </tr>
+ *  <tr>
+ *   <td><b>USB Class:</b></td>
+ *   <td>Human Interface Device (HID)</td>
+ *  </tr>
+ *  <tr> 
+ *   <td><b>USB Subclass:</b></td>
+ *   <td>Keyboard</td>
+ *  </tr>
+ *  <tr>
+ *   <td><b>Relevant Standards:</b></td>
+ *   <td>USBIF HID Standard, USBIF HID Usage Tables</td>
+ *  </tr>
+ *  <tr>
+ *   <td><b>Usable Speeds:</b></td>
+ *   <td>Low Speed Mode, Full Speed Mode</td>
+ *  </tr>
+ * </table>
+ *
+ *  \section SSec_Description Project Description: 
+ *
+ *  Firmware for a USB AVR powered programmer for Arduino boards using the official Arduino bootloader. This
+ *  project acts like a regular USB to Serial bridge, except that asserting the DTR line will cause a pulse
+ *  to appear on a given port pin, to control the target's /RESET pin.
+ *
+ *  This is primarily designed to fit the Benito board from www.dorkbotpdx.org, but will suit all USB AVRs.
+ *
+ *  \section SSec_Options Project Options
+ *
+ *  The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
+ *
+ *  <table>
+ *   <tr>
+ *    <td><b>Define Name:</b></td>
+ *    <td><b>Location:</b></td>
+ *    <td><b>Description:</b></td>
+ *   </tr>
+ *   <tr>
+ *    <td>AVR_RESET_LINE_PORT</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Indicates the PORT register of the pin used to generate the target /RESET line pulse.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>AVR_RESET_LINE_DDR</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Indicates the DDR register of the pin used to generate the target /RESET line pulse.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>AVR_RESET_LINE_MASK</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Indicates the mask of the pin used to generate the target /RESET line pulse.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>AVR_RESET_PULSE_MS</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Pulse length in milliseconds for the target /RESET pulse.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>TX_RX_LED_PULSE_MS</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Pulse length in milliseconds for the activity Tx/Rx LEDs.</td>
+ *   </tr>
+ *  </table>
+ */

Projects/Benito/Descriptors.c

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, 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
+ *
+ *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special 
+ *  computer-readable structures which the host requests upon device enumeration, to determine
+ *  the device's capabilities and functions.  
+ */
+
+#include "Descriptors.h"
+
+/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
+ *  device characteristics, including the supported USB version, control endpoint size and the
+ *  number of device configurations. The descriptor is read out by the USB host when the enumeration
+ *  process begins.
+ */
+USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+{
+	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
+		
+	.USBSpecification       = VERSION_BCD(01.10),
+	.Class                  = 0x02,
+	.SubClass               = 0x00,
+	.Protocol               = 0x00,
+				
+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
+		
+	.VendorID               = 0x03EB,
+	.ProductID              = 0x204B,
+	.ReleaseNumber          = 0x0001,
+		
+	.ManufacturerStrIndex   = 0x01,
+	.ProductStrIndex        = 0x02,
+	.SerialNumStrIndex      = USE_INTERNAL_SERIAL,
+		
+	.NumberOfConfigurations = 1
+};
+
+/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
+ *  of the device in one of its supported configurations, including information about any device interfaces
+ *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
+ *  a configuration so that the host may correctly communicate with the USB device.
+ */
+USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+{
+	.Config = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
+
+			.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
+			.TotalInterfaces        = 2,
+				
+			.ConfigurationNumber    = 1,
+			.ConfigurationStrIndex  = NO_DESCRIPTOR,
+				
+			.ConfigAttributes       = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
+			
+			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
+		},
+		
+	.CCI_Interface = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 0,
+			.AlternateSetting       = 0,
+			
+			.TotalEndpoints         = 1,
+				
+			.Class                  = 0x02,
+			.SubClass               = 0x02,
+			.Protocol               = 0x01,
+				
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC_Functional_IntHeader = 
+		{
+			.Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+			.SubType                = 0x00,
+			
+			.Data                   = {0x01, 0x10}
+		},
+
+	.CDC_Functional_CallManagement = 
+		{
+			.Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+			.SubType                = 0x01,
+			
+			.Data                   = {0x03, 0x01}
+		},
+
+	.CDC_Functional_AbstractControlManagement = 
+		{
+			.Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},
+			.SubType                = 0x02,
+			
+			.Data                   = {0x06}
+		},
+		
+	.CDC_Functional_Union= 
+		{
+			.Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+			.SubType                = 0x06,
+			
+			.Data                   = {0x00, 0x01}
+		},
+
+	.ManagementEndpoint = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+			
+			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),
+			.Attributes             = EP_TYPE_INTERRUPT,
+			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,
+			.PollingIntervalMS      = 0xFF
+		},
+
+	.DCI_Interface = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 1,
+			.AlternateSetting       = 0,
+			
+			.TotalEndpoints         = 2,
+				
+			.Class                  = 0x0A,
+			.SubClass               = 0x00,
+			.Protocol               = 0x00,
+				
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.DataOutEndpoint = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+			
+			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),
+			.Attributes             = EP_TYPE_BULK,
+			.EndpointSize           = CDC_TXRX_EPSIZE,
+			.PollingIntervalMS      = 0x00
+		},
+		
+	.DataInEndpoint = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+			
+			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),