restored original non-interrupt-driven DiskLoader

Interrupt-driven version was a dead-end - too many bugs with that approach.

8 files changed, 556 insertions, 772 deletions

diff --git a/bootloaders/diskloader/src/CDC.cpp b/bootloaders/diskloader/src/CDC.cpp
deleted file mode 100644
index 4496a9c..0000000
--- a/bootloaders/diskloader/src/CDC.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-/* Copyright (c) 2011, Peter Barrett  
-**  
-** Permission to use, copy, modify, and/or distribute this software for  
-** any purpose with or without fee is hereby granted, provided that the  
-** above copyright notice and this permission notice appear in all copies.  
-** 
-** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.  
-*/
-
-#include "Platform.h"
-#include "USBAPI.h"
-#include <avr/wdt.h>
-
-#if defined(USBCON)
-
-typedef struct
-{
-	u32	dwDTERate;
-	u8	bCharFormat;
-	u8 	bParityType;
-	u8 	bDataBits;
-	u8	lineState;
-} LineInfo;
-
-static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
-
-#define WEAK __attribute__ ((weak))
-
-extern const CDCDescriptor _cdcInterface PROGMEM;
-const CDCDescriptor _cdcInterface =
-{
-	D_IAD(0,2,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,1),
-
-	//	CDC communication interface
-	D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
-	D_CDCCS(CDC_HEADER,0x10,0x01),								// Header (1.10 bcd)
-	D_CDCCS(CDC_CALL_MANAGEMENT,1,1),							// Device handles call management (not)
-	D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,6),				// SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
-	D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE),	// Communication interface is master, data interface is slave 0
-	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10,0x40),
-
-	//	CDC data interface
-	D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
-	D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),
-	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
-};
-
-int WEAK CDC_GetInterface(u8* interfaceNum)
-{
-	interfaceNum[0] += 2;	// uses 2
-	return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));
-}
-
-bool WEAK CDC_Setup(Setup& setup)
-{
-	u8 r = setup.bRequest;
-	u8 requestType = setup.bmRequestType;
-
-	if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
-	{
-		if (CDC_GET_LINE_CODING == r)
-		{
-			USB_SendControl(0,(void*)&_usbLineInfo,7);
-			return true;
-		}
-	}
-
-	if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
-	{
-		if (CDC_SET_LINE_CODING == r)
-		{
-			USB_RecvControl((void*)&_usbLineInfo,7);
-			return true;
-		}
-
-		if (CDC_SET_CONTROL_LINE_STATE == r)
-		{
-			_usbLineInfo.lineState = setup.wValueL;
-			return true;
-		}
-	}
-	return false;
-}
-#endif /* if defined(USBCON) */
diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp
index 2792bc6..6580618 100644
--- a/bootloaders/diskloader/src/DiskLoader.cpp
+++ b/bootloaders/diskloader/src/DiskLoader.cpp
@@ -1,67 +1,64 @@
-/*
- *  DiskLoader.cpp
- */
+
 
 #include "Platform.h"
 
+//	This bootloader creates a composite Serial device
+//
+//	The serial interface supports a STK500v1 protocol that is very similar to optiboot
+//
+//	The bootloader will timeout and start the firmware after a few hundred milliseconds
+//	if a usb connection is not detected.
+//	
+//	The tweakier code is to keep the bootloader below 2k (no interrupt table, for example)
+
 extern "C"
 void entrypoint(void) __attribute__ ((naked)) __attribute__ ((section (".vectors")));
 void entrypoint(void)
 {
 	asm volatile (
-				  "eor	r1,		r1\n"	// Zero register
-				  "out	0x3F,	r1\n"	// SREG
-				  "ldi	r28,	0xFF\n" // Y-register
-				  "ldi	r29,	0x0A\n"	// Y-register
-				  "out	0x3E,	r29\n"	// SPH
-				  "out	0x3D,	r28\n"	// SPL
-				  "rjmp	main"			// Stack is all set up, start the main code
-				  ::);
+		"eor	r1,		r1\n"	// Zero register
+		"out	0x3F,	r1\n"	// SREG
+		"ldi	r28,	0xFF\n"
+		"ldi	r29,	0x0A\n"
+		"out	0x3E,	r29\n"	// SPH
+		"out	0x3D,	r28\n"	// SPL
+		"rjmp	main"			// Stack is all set up, start the main code
+		::);
 }
 
 u8 _flashbuf[128];
 u8 _inSync;
 u8 _ok;
-u16 do_reset = 0;
-volatile u16 _timeout = 0;
+extern volatile u8 _ejected;
+extern volatile u16 _timeout;
 
 void Program(u8 ep, u16 page, u8 count)
 {
-	u8 write = page < 28*1024;		// Don't write over bootloader please
+	u8 write = page < 30*1024;		// Don't write over firmware please
 	if (write)
 		boot_page_erase(page);
-	
-	USB_Recv_block(ep,_flashbuf,count);	// Read while page is erasing
-	
+
+	Recv(ep,_flashbuf,count);		// Read while page is erasing
+
 	if (!write)
 		return;
-	
+
 	boot_spm_busy_wait();			// Wait until the memory is erased.
-	
+
 	count >>= 1;
 	u16* p = (u16*)page;
 	u16* b = (u16*)_flashbuf;
 	for (u8 i = 0; i < count; i++)
 		boot_page_fill(p++, b[i]);
-	
+
     boot_page_write(page);
     boot_spm_busy_wait();
     boot_rww_enable ();
 }
 
-u16 _pulse;
-void LEDPulse() 
-{
-	_pulse += 1;
-	u8 p = _pulse >> 9;
-	if (p > 63)
-		p = 127-p;
-	p += p;
-	if (((u8)_pulse) > p)
-		L_LED_OFF();
-	else
-		L_LED_ON();
-}
+
+int USBGetChar();
+#define getch USBGetChar
 
 #define HW_VER	 0x02
 #define SW_MAJOR 0x01
@@ -107,147 +104,136 @@ const u8 _consts[] =
 	0x00,		// 
 };
 
-void start_sketch()
-{
-	if (pgm_read_word(0) == -1)		// no sketch has been uploaded yet - stay in bootloader
-		return;
-	
-	L_LED_OFF();
-	RX_LED_OFF();
-	TX_LED_OFF();
-	/* move interrupts to application section:
-	 * uses inline assembly because the procedure must be completed in four cycles.
-	 */
-	cli();	// disable interrupts first
-	asm volatile (
-				  "ldi r16,	  0x01\n"		// (1<<IVCE)	/* Enable change of interrupt vectors */
-				  "out 0x35,  r16\n"		// MCUCR
-				  "ldi r16,	  0x00\n"		// (1<<IVSEL)	/* Move interrupts to application flash section */
-				  "out 0x35,  r16\n"		// MCUCR				  
-				  );							
-	UDCON = 1;		// Detatch USB
-	UDIEN = 0;
-	asm volatile (	// Reset vector to run firmware
-				  "clr r30\n"
-				  "clr r31\n"
-				  "ijmp\n"
-				  ::);
-}
 
+void USBInit(void);
 int main(void) __attribute__ ((naked));
-int main() 
-{		
+
+//	STK500v1 main loop, very similar to optiboot in protocol and implementation
+int main()
+{
 	wdt_disable();
+	TXLED0;
+	RXLED0;
+	LED0;
 	BOARD_INIT();
-	/* move interrupts to boot section:
-	 * uses inline assembly because the procedure must be completed in four cycles.
-	 * seems to fail if called before disabling WDT and calling BOARD_INIT()
-	 */
-	asm volatile (
-				  "ldi r16,	  0x01\n"		// (1<<IVCE)	/* Enable change of interrupt vectors */
-				  "out 0x35,  r16\n"		// MCUCR
-				  "ldi r16,	  0x02\n"		// (1<<IVSEL)	/* Move interrupts to boot flash section */
-				  "out 0x35,  r16\n"		// MCUCR				  
-				  );	
-	TX_LED_OFF();
-	RX_LED_OFF();
-	L_LED_OFF();
-	USB.attach();	
-	sei();
-	
+	USBInit();
+
 	_inSync = STK_INSYNC;
 	_ok = STK_OK;
-	
-	for (;;) 
+
+	if (pgm_read_word(0) != -1)
+		_ejected = 1;
+
+	for(;;)
 	{
 		u8* packet = _flashbuf;
 		u16 address = 0;
 		for (;;)
-		{		
-			if (USB_Available(CDC_RX)) 
+		{
+			u8 cmd = getch();
+
+			//	Read packet contents
+			u8 len;
+			const u8* rs = _readSize;
+			for(;;)
 			{
-				u8 cmd = USB_Recv(CDC_RX);
-				
-				// Read packet contents
-				u8 len;
-				const u8* rs = _readSize;
-				for (;;) 
-				{
-					u8 c = pgm_read_byte(rs++);
-					len = pgm_read_byte(rs++);
-					if (c == cmd || c == 0)
-						break;
-				}
-				_timeout = 0;
-				// Read params
-				USB_Recv_block(CDC_RX, packet, len);
-				
-				// Send a response
-				u8 send = 0;
-				const u8* pgm = _consts+7;
-				if (STK_GET_PARAMETER == cmd)
-				{
-					u8 i = packet[0] - 0x80;
-					if (i > 2)
-						i = (i==0x18) ? 3 : 4;	
-					pgm = _consts + i + 3;
-					send = 1;
-				} 
-				else if (STK_UNIVERSAL == cmd) 
-				{
-					if (packet[0] == 0x30)
-						pgm = _consts + packet[2];	
-					send = 1;
-				}
-				else if (STK_READ_SIGN == cmd)
-				{ 
-					pgm = _consts;
-					send = 3;
-				}
-				else if (STK_LOAD_ADDRESS == cmd) 
-				{
-					address = *((u16*)packet);	// word address
-					address += address;
-				}
-				else if (STK_PROG_PAGE == cmd)
-				{
-					Program(CDC_RX, address, packet[1]);
-				}
-				else if (STK_READ_PAGE == cmd)
-				{
-					send = packet[1];
-					pgm = (const u8*)address;
-					address += send;
-				}
-				
-				u16 countdown = 5000;
-				while (countdown-- > 10 && !USB_Available(CDC_RX)) 
-					;
-				int x = USB_Recv(CDC_RX);
-				if (x != -1 && x != ' ')
+				u8 c = pgm_read_byte(rs++);
+				len = pgm_read_byte(rs++);
+				if (c == cmd || c == 0)
 					break;
-				
-				USB_Send(CDC_TX, &_inSync, 1);
-				
-				if (send) 
-					USB_Send(CDC_TX|TRANSFER_PGM, pgm, send);
-				
-				// Send ok
-				USB_Send(CDC_TX|TRANSFER_RELEASE, &_ok, 1);
-				
-				if ('Q' == cmd) 
-				{
-					_delay_ms(100);
-					start_sketch();
-				}
 			}
-			else 
+			_timeout = 0;
+			//	Read params
+			Recv(CDC_RX,packet,len);
+
+			//	Send a response
+			u8 send = 0;
+			const u8* pgm = _consts+7;			// 0
+			if (STK_GET_PARAMETER == cmd)
+			{
+				u8 i = packet[0] - 0x80;
+				if (i > 2)
+					i = (i == 0x18) ? 3 : 4;	// 0x80:HW_VER,0x81:SW_MAJOR,0x82:SW_MINOR,0x18:3 or 0
+				pgm = _consts + i + 3;
+				send = 1;
+			}
+
+			else if (STK_UNIVERSAL == cmd)
 			{
-				LEDPulse();
-				_delay_us(100);
-				if (_timeout-- == 1)
-					start_sketch();
+				if (packet[0] == 0x30)
+					pgm = _consts + packet[2];	// read signature
+				send = 1;
 			}
+			
+			//	Read signature bytes
+			else if (STK_READ_SIGN == cmd)
+			{
+				pgm = _consts;
+				send = 3;
+			}
+
+			else if (STK_LOAD_ADDRESS == cmd)
+			{
+				address = *((u16*)packet);		// word addresses
+				address += address;
+			}
+
+			else if (STK_PROG_PAGE == cmd)
+			{
+				Program(CDC_RX,address,packet[1]);
+			}
+
+			else if (STK_READ_PAGE == cmd)
+			{
+				send = packet[1];
+				pgm = (const u8*)address;
+				address += send; // not sure of this is required
+			}
+
+			// Check sync
+			if (getch() != ' ')
+				break;
+			Transfer(CDC_TX,&_inSync,1);
+
+			// Send result
+			if (send)
+				Transfer(CDC_TX|TRANSFER_PGM,pgm,send);	// All from pgm memory
+
+			//	Send ok
+			Transfer(CDC_TX|TRANSFER_RELEASE,&_ok,1);
+
+			if (cmd == 'Q')
+				break;
 		}
+		_timeout = 500;		// wait a moment before exiting the bootloader - may need to finish responding to 'Q' for example
+		_ejected = 1;
 	}
 }
+
+//	Nice breathing LED indicates we are in the firmware
+u16 _pulse;
+void LEDPulse()
+{
+	_pulse += 4;
+	u8 p = _pulse >> 9;
+	if (p > 63)
+		p = 127-p;
+	p += p;
+	if (((u8)_pulse) > p)
+		LED0;
+	else
+		LED1;
+}
+
+void Reboot()
+{
+	TXLED0;		// switch off the RX and TX LEDs before starting the user sketch
+	RXLED0;
+	UDCON = 1;		// Detatch USB
+	UDIEN = 0;
+	asm volatile (	// Reset vector to run firmware
+		"clr r30\n"
+		"clr r31\n"
+		"ijmp\n"
+	::);
+}
diff --git a/bootloaders/diskloader/src/Platform.h b/bootloaders/diskloader/src/Platform.h
index d1f884c..6acbf39 100644
--- a/bootloaders/diskloader/src/Platform.h
+++ b/bootloaders/diskloader/src/Platform.h
@@ -1,9 +1,3 @@
-/*
- *  Platform.h
- */
-
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
 
 #include <inttypes.h>
 #include <avr/io.h>
@@ -17,50 +11,39 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef __cplusplus
-extern "C"{
-#endif
-
 typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned long u32;
 
-#define USB_PID_LEONARDO 0x0032
-#define USB_PID_MICRO 0x0033
-#define USB_VID 0x2341	// arduino LLC vid
-#define USB_PID ARDUINO_MODEL_PID	// passed in by Makefile - 0x0032 for Leonardo, 0x0033 for Micro
-
-#define min(a,b) ((a)<(b)?(a):(b))
 
 #define CPU_PRESCALE(n)	(CLKPR = 0x80, CLKPR = (n))
-#define DISABLE_JTAG()  MCUCR = (1 << JTD) | (1 << IVCE) | (0 << PUD); MCUCR = (1 << JTD) | (0 << IVSEL) | (0 << IVCE) | (0 << PUD)
+#define DISABLE_JTAG()  MCUCR = (1 << JTD) | (1 << IVCE) | (0 << PUD); MCUCR = (1 << JTD) | (0 << IVSEL) | (0 << IVCE) | (0 << PUD);
 
-#define BOARD_INIT()	DDRC |= (1<<7); DDRB |= (1<<0); DDRE |= (1<<6); CPU_PRESCALE(0); DISABLE_JTAG();	// for XXX-series boards
-//#define BOARD_INIT()	DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5); CPU_PRESCALE(0); DISABLE_JTAG();	// for non-XXX boards
+#define USB_PID_LEONARDO 0x0034
+#define USB_PID_MICRO 0x0035
+#define USB_VID 0x2341	// arduino LLC vid
+#define USB_PID ARDUINO_MODEL_PID	// passed in by Makefile - 0x0034 for Leonardo, 0x0035 for MIcro
+
+#define OEM_NAME		'l','e','o','n','a','r','d','o'					// 8 chars
+#define BOARD_INIT()	DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5); CPU_PRESCALE(0); DISABLE_JTAG();
+#define LED0			PORTC &= ~(1<<7)
+#define LED1			PORTC |= (1<<7)
+#define TXLED0			PORTD |= (1<<5)
+#define TXLED1			PORTD &= ~(1<<5)
+#define RXLED0			PORTB |= (1<<0)
+#define RXLED1			PORTB &= ~(1<<0)
 
-// for XXX-series boards
-#define TX_LED_OFF()		PORTE |= (1<<6)
-#define TX_LED_ON()			PORTE &= ~(1<<6)
-#define RX_LED_OFF()		PORTB |= (1<<0)
-#define RX_LED_ON()			PORTB &= ~(1<<0)
-#define L_LED_OFF()			PORTC &= ~(1<<7)
-#define L_LED_ON()			PORTC |= (1<<7)
-#define L_LED_TOGGLE()		PORTC ^= (1<<7)
+#define TRANSFER_PGM		0x80
+#define TRANSFER_RELEASE	0x40
+#define TRANSFER_ZERO		0x20
 
-// these for non-XXX boards
-//#define LED0			PORTC &= ~(1<<7)
-//#define LED1			PORTC |= (1<<7)
-//#define TXLED0			PORTD |= (1<<5)
-//#define TXLED1			PORTD &= ~(1<<5)
-//#define RXLED0			PORTB |= (1<<0)
-//#define RXLED1			PORTB &= ~(1<<0)
+void Transfer(u8 ep, const u8* data, int len);
+void Recv(u8 ep, u8* dst, u8 len);
+void Program(u8 ep, u16 page, u8 count);
 
-#ifdef __cplusplus
-}	/* extern "C"{ */
-#endif 
+#define CDC_ENABLED
 
+#include "USBCore.h"
 #include "USBDesc.h"
-#include "USBCore.h"	
-#include "USBAPI.h"
 
-#endif /* __PLATFORM_H__ */
+
diff --git a/bootloaders/diskloader/src/USBAPI.h b/bootloaders/diskloader/src/USBAPI.h
deleted file mode 100644
index f8d71c8..0000000
--- a/bootloaders/diskloader/src/USBAPI.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-#ifndef __USBAPI__
-#define __USBAPI__
-
-#if defined(USBCON)
-
-//================================================================================
-//================================================================================
-//	USB
-
-class USB_
-{
-public:
-	USB_();
-	bool configured();
-
-	void attach();
-	void detach();	// Serial port goes down too...
-	void poll();
-};
-extern USB_ USB;
-
-//================================================================================
-//================================================================================
-//	Low level API
-
-typedef struct
-{
-	uint8_t bmRequestType;
-	uint8_t bRequest;
-	uint8_t wValueL;
-	uint8_t wValueH;
-	uint16_t wIndex;
-	uint16_t wLength;
-} Setup;
-
-//================================================================================
-//================================================================================
-//	CDC 'Driver'
-
-int		CDC_GetInterface(uint8_t* interfaceNum);
-int		CDC_GetDescriptor(int i);
-bool	CDC_Setup(Setup& setup);
-
-//================================================================================
-//================================================================================
-
-#define TRANSFER_PGM		0x80
-#define TRANSFER_RELEASE	0x40
-#define TRANSFER_ZERO		0x20
-
-int USB_SendControl(uint8_t flags, const void* d, int len);
-int USB_RecvControl(void* d, int len);
-
-uint8_t	USB_Available(uint8_t ep);
-int USB_Send(uint8_t ep, const void* data, int len);	// blocking
-int USB_Recv(uint8_t ep, void* data, int len);		// non-blocking
-void USB_Recv_block(u8 ep, u8* dst, int len);		// blocking
-int USB_Recv(uint8_t ep);							// non-blocking
-void USB_Flush(uint8_t ep);
-
-#endif
-#endif /* if defined(USBCON) */
diff --git a/bootloaders/diskloader/src/USBCore.cpp b/bootloaders/diskloader/src/USBCore.cpp
index 6518ae9..ca74721 100644
--- a/bootloaders/diskloader/src/USBCore.cpp
+++ b/bootloaders/diskloader/src/USBCore.cpp
@@ -1,4 +1,5 @@
 
+
 /* Copyright (c) 2010, Peter Barrett  
 **  
 ** Permission to use, copy, modify, and/or distribute this software for  
@@ -16,10 +17,9 @@
 */
 
 #include "Platform.h"
-#include "USBAPI.h"
-#include "USBDesc.h"
 
-#if defined(USBCON)
+#define CDC_TX CDC_ENDPOINT_IN
+#define CDC_RX CDC_ENDPOINT_OUT
 
 #define EP_TYPE_CONTROL				0x00
 #define EP_TYPE_BULK_IN				0x81
@@ -31,50 +31,32 @@
 
 /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
 #define TX_RX_LED_PULSE_MS 100
-volatile u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
-volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+
+void Reboot();
 
 //==================================================================
 //==================================================================
 
-extern const u16 STRING_LANGUAGE[] PROGMEM;
-extern const u16 STRING_IPRODUCT[] PROGMEM;
-extern const u16 STRING_IMANUFACTURER[] PROGMEM;
-extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
-extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
-
-const u16 STRING_LANGUAGE[2] = {
-	(3<<8) | (2+2),
-	0x0409	// English
-};
-
-const u16 STRING_IPRODUCT[17] = {
-	(3<<8) | (2+2*16),
-#if USB_PID == USB_PID_LEONARDO	
-	'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
-#elif USB_PID == USB_PID_MICRO
-	'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
-#endif
-};
-
-const u16 STRING_IMANUFACTURER[12] = {
-	(3<<8) | (2+2*11),
-	'A','r','d','u','i','n','o',' ','L','L','C'
-};
-
-#define DEVICE_CLASS 0x02
-
-//	DEVICE DESCRIPTOR
-const DeviceDescriptor USB_DeviceDescriptor =
-	D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+typedef struct
+{
+	u32	dwDTERate;
+	u8	bCharFormat;
+	u8 	bParityType;
+	u8 	bDataBits;
+	u8	lineState;
+} LineInfo;
 
-const DeviceDescriptor USB_DeviceDescriptorA =
-	D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
 
 //==================================================================
 //==================================================================
 
-volatile u8 _usbConfiguration = 0;
+//	4 bytes of RAM
+volatile u8 _usbConfiguration;
+volatile u8 _ejected;
+volatile u16 _timeout;
 
 static inline void WaitIN(void)
 {
@@ -104,25 +86,34 @@ static inline void ClearOUT(void)
 	UEINTX = ~(1<<RXOUTI);
 }
 
+static
+void Send(volatile const u8* data, u8 count)
+{
+	TXLED1;					// light the TX LED
+	TxLEDPulse = TX_RX_LED_PULSE_MS;
+	while (count--)
+		UEDATX = *data++;
+}
+
 void Recv(volatile u8* data, u8 count)
 {
+	RXLED1;					// light the RX LED
+	RxLEDPulse = TX_RX_LED_PULSE_MS;
 	while (count--)
 		*data++ = UEDATX;
-	
-	RX_LED_ON();
-	RxLEDPulse = TX_RX_LED_PULSE_MS;	
 }
 
 static inline u8 Recv8()
 {
-	RX_LED_ON();
+	RXLED1;					// light the RX LED
 	RxLEDPulse = TX_RX_LED_PULSE_MS;
-
-	return UEDATX;	
+	return UEDATX;
 }
 
 static inline void Send8(u8 d)
 {
+	TXLED1;					// light the TX LED
+	TxLEDPulse = TX_RX_LED_PULSE_MS;
 	UEDATX = d;
 }
 
@@ -184,37 +175,48 @@ static inline u8 FrameNumber()
 //==================================================================
 //==================================================================
 
-u8 USBGetConfiguration(void)
+#define EP_SINGLE_64 0x32	// EP0
+#define EP_DOUBLE_64 0x36	// Other endpoints
+
+static void InitEP(u8 index, u8 type, u8 size)
 {
-	return _usbConfiguration;
+	UENUM = index;
+	UECONX = 1;
+	UECFG0X = type;
+	UECFG1X = size;
 }
 
-#define USB_RECV_TIMEOUT
-class LockEP
+//	API
+void USBInit(void)
 {
-	u8 _sreg;
-public:
-	LockEP(u8 ep) : _sreg(SREG)
-	{
-		cli();
-		SetEP(ep & 7);
-	}
-	~LockEP()
-	{
-		SREG = _sreg;
-	}
-};
+	_timeout = 0;
+	_usbConfiguration = 0;
+	_ejected = 0;
+	
+	UHWCON = 0x01;						// power internal reg (don't need this?)
+	USBCON = (1<<USBE)|(1<<FRZCLK);		// clock frozen, usb enabled
+	PLLCSR = 0x12;						// Need 16 MHz xtal
+	while (!(PLLCSR & (1<<PLOCK)))		// wait for lock pll
+		;
+	USBCON = ((1<<USBE)|(1<<OTGPADE));	// start USB clock
+	UDCON = 0;							// enable attach resistor
+}
 
-//	Number of bytes, assumes a rx endpoint
-u8 USB_Available(u8 ep)
+u8 USBGetConfiguration(void)
 {
-	LockEP lock(ep);
-	return FifoByteCount();
+	return _usbConfiguration;
+}
+
+u8 HasData(u8 ep)
+{
+	SetEP(ep);
+	return ReadWriteAllowed();	// count in fifo
 }
 
-void USB_Recv_block(u8 ep, u8* dst, int len)
+int USBGetChar();
+void Recv(u8 ep, u8* dst, u8 len)
 {
-	LockEP lock(ep);
+	SetEP(ep);
 	while (len--)
 	{
 		while (!ReadWriteAllowed())
@@ -222,119 +224,47 @@ void USB_Recv_block(u8 ep, u8* dst, int len)
 		*dst++ = Recv8();
 		if (!ReadWriteAllowed())	// release empty buffer
 			ReleaseRX();
-	}	
-}
-
-//	Non Blocking receive
-//	Return number of bytes read
-int USB_Recv(u8 ep, void* d, int len)
-{
-	if (!_usbConfiguration || len < 0)
-		return -1;
-	
-	LockEP lock(ep);
-	u8 n = FifoByteCount();
-	len = min(n,len);
-	n = len;
-	u8* dst = (u8*)d;
-	while (n--)
-		*dst++ = Recv8();
-	if (len && !FifoByteCount())	// release empty buffer
-		ReleaseRX();
-	
-	return len;
-}
-
-//	Recv 1 byte if ready
-int USB_Recv(u8 ep)
-{
-	u8 c;
-	if (USB_Recv(ep,&c,1) != 1)
-		return -1;
-	return c;
-}
-
-//	Space in send EP
-u8 USB_SendSpace(u8 ep)
-{
-	LockEP lock(ep);
-	if (!ReadWriteAllowed())
-		return 0;
-	return 64 - FifoByteCount();
+	}
 }
 
-//	Blocking Send of data to an endpoint
-int USB_Send(u8 ep, const void* d, int len)
+//	Transmit a packet to endpoint
+void Transfer(u8 ep, const u8* data, int len)
 {
-	if (!_usbConfiguration)
-		return -1;
-
-	int r = len;
-	const u8* data = (const u8*)d;
-	while (len)
+	u8 zero = ep & TRANSFER_ZERO;
+	SetEP(ep & 7);
+	while (len--)
 	{
-		u8 n = USB_SendSpace(ep);
-		if (n == 0)
-		{
-			_delay_ms(1);
-			continue;
-		}
+		while (!ReadWriteAllowed())
+			;	// TODO Check for STALL etc
 
-		if (n > len)
-			n = len;
-		len -= n;
-		{
-			LockEP lock(ep);
-			if (ep & TRANSFER_ZERO)
-			{
-				while (n--)
-					Send8(0);
-			}
-			else if (ep & TRANSFER_PGM)
-			{
-				while (n--)
-					Send8(pgm_read_byte(data++));
-			}
-			else
-			{
-				while (n--)
-					Send8(*data++);
-			}
-			if (!ReadWriteAllowed() || ((len == 0) && (ep & TRANSFER_RELEASE)))	// Release full buffer
-				ReleaseTX();
-		}
+		u8 d = (ep & TRANSFER_PGM) ? pgm_read_byte(data) : data[0];
+		data++;
+		if (zero)
+			d = 0;
+		Send8(d);
+
+		if (!ReadWriteAllowed())
+			ReleaseTX();
 	}
 	if (ep & TRANSFER_RELEASE)
 		ReleaseTX();
-	
-	TX_LED_ON();
-	TxLEDPulse = TX_RX_LED_PULSE_MS;
-	return r;
 }
 
 extern const u8 _initEndpoints[] PROGMEM;
 const u8 _initEndpoints[] = 
 {
 	0,
+
+#ifdef CDC_ENABLED
 	EP_TYPE_INTERRUPT_IN,		// CDC_ENDPOINT_ACM
 	EP_TYPE_BULK_OUT,			// CDC_ENDPOINT_OUT
 	EP_TYPE_BULK_IN,			// CDC_ENDPOINT_IN
-};
-
-#define EP_SINGLE_64 0x32	// EP0
-#define EP_DOUBLE_64 0x36	// Other endpoints
+#endif
 
-static
-void InitEP(u8 index, u8 type, u8 size)
-{
-	UENUM = index;
-	UECONX = 1;
-	UECFG0X = type;
-	UECFG1X = size;
-}
+	EP_TYPE_INTERRUPT_IN,		// HID_ENDPOINT_INT
+};
 
-static
-void InitEndpoints()
+static void InitEndpoints()
 {
 	for (u8 i = 1; i < sizeof(_initEndpoints); i++)
 	{
@@ -347,113 +277,99 @@ void InitEndpoints()
 	UERST = 0;
 }
 
-//	Handle CLASS_INTERFACE requests
-static
-bool ClassInterfaceRequest(Setup& setup)
+typedef struct
 {
-	u8 i = setup.wIndex;
-
-	if (CDC_ACM_INTERFACE == i)
-		return CDC_Setup(setup);
-
-	return false;
-}
+	u8 bmRequestType;
+	u8 bRequest;
+	u8 wValueL;
+	u8 wValueH;
+	u16 wIndex;
+	u16 wLength;
+} Setup;
+Setup _setup;
 
-int _cmark;
-int _cend;
-void InitControl(int end)
+//bool USBHook(Setup& setup)
+bool USBHook()
 {
-	SetEP(0);
-	_cmark = 0;
-	_cend = end;
-}
+	Setup& setup = _setup;
+	u8 r = setup.bRequest;
 
-static
-bool SendControl(u8 d)
-{
-	if (_cmark < _cend)
+	//	CDC Requests
+	if (CDC_GET_LINE_CODING == r)
 	{
-		if (!WaitForINOrOUT())
-			return false;
-		Send8(d);
-		if (!((_cmark + 1) & 0x3F))
-			ClearIN();	// Fifo is full, release this packet
+		Send((const volatile u8*)&_usbLineInfo,7);
 	}
-	_cmark++;
-	return true;
-};
 
-//	Clipped by _cmark/_cend
-int USB_SendControl(u8 flags, const void* d, int len)
-{
-	int sent = len;
-	const u8* data = (const u8*)d;
-	bool pgm = flags & TRANSFER_PGM;
-	while (len--)
+	else if (CDC_SET_LINE_CODING ==  r)
 	{
-		u8 c = pgm ? pgm_read_byte(data++) : *data++;
-		if (!SendControl(c))
-			return -1;
+		WaitOUT();
+		Recv((volatile u8*)&_usbLineInfo,7);
+		ClearOUT();
 	}
-	return sent;
-}
 
-//	Does not timeout or cross fifo boundaries
-//	Will only work for transfers <= 64 bytes
-//	TODO
-int USB_RecvControl(void* d, int len)
-{
-	WaitOUT();
-	Recv((u8*)d,len);
-	ClearOUT();
-	return len;
-}
+	else if (CDC_SET_CONTROL_LINE_STATE == r)
+	{
+		_usbLineInfo.lineState = setup.wValueL;
+	}
 
-int SendInterfaces()
-{
-	int total = 0;
-	u8 interfaces = 0;
-	total = CDC_GetInterface(&interfaces);
-	return interfaces;
+	return true;
 }
 
-//	Construct a dynamic configuration descriptor
-//	This really needs dynamic endpoint allocation etc
-//	TODO
-static
-bool SendConfiguration(int maxlen)
+extern const u8 _rawHID[] PROGMEM;
+#define LSB(_x) ((_x) & 0xFF)
+#define MSB(_x) ((_x) >> 8)
+
+#define RAWHID_USAGE_PAGE	0xFFC0
+#define RAWHID_USAGE		0x0C00
+#define RAWHID_TX_SIZE 64
+#define RAWHID_RX_SIZE 64
+
+const u8 _rawHID[] =
 {
-	//	Count and measure interfaces
-	InitControl(0);	
-	int interfaces = SendInterfaces();
-	ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces);
+	//	RAW HID
+	0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE),	// 30
+	0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
 
-	//	Now send them
-	InitControl(maxlen);
-	USB_SendControl(0,&config,sizeof(ConfigDescriptor));
-	SendInterfaces();
-	return true;
-}
+	0xA1, 0x01,				// Collection 0x01
+    0x85, 0x03,             // REPORT_ID (3)
+	0x75, 0x08,				// report size = 8 bits
+	0x15, 0x00,				// logical minimum = 0
+	0x26, 0xFF, 0x00,		// logical maximum = 255
 
-u8 _cdcComposite = 0;
+	0x95, 64,				// report count TX
+	0x09, 0x01,				// usage
+	0x81, 0x02,				// Input (array)
 
-static
-bool SendDescriptor(Setup& setup)
-{
-	u8 t = setup.wValueH;
-	if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
-		return SendConfiguration(setup.wLength);
+	0x95, 64,				// report count RX
+	0x09, 0x02,				// usage
+	0x91, 0x02,				// Output (array)
+	0xC0					// end collection
+};
 
-	InitControl(setup.wLength);
+u8 _cdcComposite = 0;
 
+bool SendDescriptor()
+{
+	Setup& setup = _setup;
 	u8 desc_length = 0;
 	const u8* desc_addr = 0;
-	if (USB_DEVICE_DESCRIPTOR_TYPE == t)
+
+	u8 t = setup.wValueH;
+	if (0x22 == t)
+	{
+		desc_addr = _rawHID;
+		desc_length = sizeof(desc_length);
+	} else if (USB_DEVICE_DESCRIPTOR_TYPE == t)
 	{
 		if (setup.wLength == 8)
 			_cdcComposite = 1;
 		desc_addr = _cdcComposite ?  (const u8*)&USB_DeviceDescriptorA : (const u8*)&USB_DeviceDescriptor;
 	}
+	else if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
+	{
+		desc_addr = (const u8*)&USB_ConfigDescriptor;
+		desc_length = sizeof(USB_ConfigDescriptor);
+	}
 	else if (USB_STRING_DESCRIPTOR_TYPE == t)
 	{
 		if (setup.wValueL == 0)
@@ -464,106 +380,81 @@ bool SendDescriptor(Setup& setup)
 			desc_addr = (const u8*)&STRING_IMANUFACTURER;
 		else
 			return false;
-	}
-
-	if (desc_addr == 0)
+	} else 
 		return false;
+
 	if (desc_length == 0)
 		desc_length = pgm_read_byte(desc_addr);
-
-	USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
+	if ((u8)setup.wLength < desc_length)		// bit of a cheat limiting to 255 bytes TODO (saved 8 bytes)
+		desc_length = (u8)setup.wLength;
+
+	//	Send descriptor
+	//	EP0 is 64 bytes long
+	//	RWAL and FIFOCON don't work on EP0
+	u8 n = 0;
+	do
+	{
+		if (!WaitForINOrOUT())
+			return false;
+		Send8(pgm_read_byte(&desc_addr[n++]));
+		u8 clr = n & 0x3F;
+		if (!clr)
+			ClearIN();	// Fifo is full, release this packet
+	} while (n < desc_length);
 	return true;
 }
 
-//	Endpoint 0 interrupt
-ISR(USB_COM_vect)
+void USBSetupInterrupt()
 {
     SetEP(0);
 	if (!ReceivedSetupInt())
 		return;
 
-	Setup setup;
+	Setup& setup = _setup;	// global saves ~30 bytes
 	Recv((u8*)&setup,8);
 	ClearSetupInt();
 
-	u8 requestType = setup.bmRequestType;
-	if (requestType & REQUEST_DEVICETOHOST)
+	if (setup.bmRequestType & DEVICETOHOST)
 		WaitIN();
 	else
 		ClearIN();
 
     bool ok = true;
-	if (REQUEST_STANDARD == (requestType & REQUEST_TYPE))
+	u8 r = setup.bRequest;
+	if (SET_ADDRESS == r)
 	{
-		//	Standard Requests
-		u8 r = setup.bRequest;
-		if (GET_STATUS == r)
-		{
-			Send8(0);		// TODO
-			Send8(0);
-		}
-		else if (CLEAR_FEATURE == r)
-		{
-		}
-		else if (SET_FEATURE == r)
-		{
-		}
-		else if (SET_ADDRESS == r)
-		{
-			WaitIN();
-			UDADDR = setup.wValueL | (1<<ADDEN);
-		}
-		else if (GET_DESCRIPTOR == r)
-		{
-			ok = SendDescriptor(setup);
-		}
-		else if (SET_DESCRIPTOR == r)
-		{
-			ok = false;
-		}
-		else if (GET_CONFIGURATION == r)
-		{
-			Send8(1);
-		}
-		else if (SET_CONFIGURATION == r)
-		{
-			if (REQUEST_DEVICE == (requestType & REQUEST_RECIPIENT))
-			{
-				InitEndpoints();
-				_usbConfiguration = setup.wValueL;
-			} else
-				ok = false;
-		}
-		else if (GET_INTERFACE == r)
-		{
-		}
-		else if (SET_INTERFACE == r)
-		{
-		}
+		WaitIN();
+		UDADDR = setup.wValueL | (1<<ADDEN);
+	}
+	else if (SET_CONFIGURATION == r)
+	{
+		_usbConfiguration = setup.wValueL;
+		InitEndpoints();
+	}
+	else if (GET_CONFIGURATION == r)
+	{
+		Send8(_usbConfiguration);
+	}
+	else if (GET_STATUS == r)
+	{
+		Send8(0);		// All good as far as I know
+	}
+	else if (GET_DESCRIPTOR == r)
+	{
+		ok = SendDescriptor();
 	}
 	else
 	{
-		InitControl(setup.wLength);		//	Max length of transfer
-		ok = ClassInterfaceRequest(setup);
+		ok = USBHook();
 	}
 
 	if (ok)
 		ClearIN();
 	else
-	{
 		Stall();
-	}
 }
 
-void USB_Flush(u8 ep)
-{
-	SetEP(ep);
-	if (FifoByteCount())
-		ReleaseTX();
-}
-
-//	General interrupt
-ISR(USB_GEN_vect)
+void USBGeneralInterrupt()
 {
 	u8 udint = UDINT;
 	UDINT = 0;
@@ -573,67 +464,45 @@ ISR(USB_GEN_vect)
 	{
 		InitEP(0,EP_TYPE_CONTROL,EP_SINGLE_64);	// init ep0
 		_usbConfiguration = 0;			// not configured yet
-		UEIENX = 1 << RXSTPE;			// Enable interrupts for ep0
 	}
 
 	//	Start of Frame - happens every millisecond so we use it for TX and RX LED one-shot timing, too
 	if (udint & (1<<SOFI))
 	{
-		USB_Flush(CDC_TX);				// Send a tx frame if found
-		
 		// check whether the one-shot period has elapsed.  if so, turn off the LED
 		if (TxLEDPulse && !(--TxLEDPulse))
-			TX_LED_OFF();
+			TXLED0;
 		if (RxLEDPulse && !(--RxLEDPulse))
-			RX_LED_OFF();
+			RXLED0;
+		
+		if (!_ejected)
+			_timeout = 0;
 	}
 }
 
-//	VBUS or counting frames
-//	Any frame counting?
-u8 USBConnected()
-{
-	u8 f = UDFNUML;
-//	delay(3);
-	_delay_ms(3);
-	return f != UDFNUML;
-}
-
-//=======================================================================
-//=======================================================================
-
-USB_ USB;
-
-USB_::USB_()
+void LEDPulse();
+int USBGetChar()
 {
-}
-
-void USB_::attach()
-{
-	_usbConfiguration = 0;
-	UHWCON = 0x01;						// power internal reg
-	USBCON = (1<<USBE)|(1<<FRZCLK);		// clock frozen, usb enabled
-	PLLCSR = 0x12;						// Need 16 MHz xtal
-	while (!(PLLCSR & (1<<PLOCK)))		// wait for lock pll
-		;
-	USBCON = ((1<<USBE)|(1<<OTGPADE));	// start USB clock
-	UDIEN = (1<<EORSTE)|(1<<SOFE);		// Enable interrupts for EOR (End of Reset) and SOF (start of frame)
-	UDCON = 0;							// enable attach resistor
-}
-
-void USB_::detach()
-{
-}
-
-//	Check for interrupts
-//	TODO: VBUS detection
-bool USB_::configured()
-{
-	return _usbConfiguration;
-}
+	for(;;)
+	{
+		USBSetupInterrupt();
+		USBGeneralInterrupt();
 
-void USB_::poll()
-{
+		//	Read a char
+		if (HasData(CDC_RX))
+		{
+			u8 c = Recv8();
+			if (!ReadWriteAllowed())
+				ReleaseRX();
+			return c;
+		} 
+
+		if (!--_timeout) {
+			Reboot();	// USB not connected, run firmware
+		}
+		
+		_delay_us(100);	// stretch out the bootloader period to about 5 seconds after enumeration
+		LEDPulse();
+	}
+	return -1;
 }
-
-#endif /* if defined(USBCON) */
diff --git a/bootloaders/diskloader/src/USBCore.h b/bootloaders/diskloader/src/USBCore.h
index 511b57c..537c0ec 100644
--- a/bootloaders/diskloader/src/USBCore.h
+++ b/bootloaders/diskloader/src/USBCore.h
@@ -18,42 +18,29 @@
 #ifndef __USBCORE_H__
 #define __USBCORE_H__
 
-//	Standard requests
 #define GET_STATUS			0
 #define CLEAR_FEATURE		1
 #define SET_FEATURE			3
 #define SET_ADDRESS			5
 #define GET_DESCRIPTOR		6
-#define SET_DESCRIPTOR		7
 #define GET_CONFIGURATION	8
 #define SET_CONFIGURATION	9
 #define GET_INTERFACE		10
 #define SET_INTERFACE		11
 
-
 // bmRequestType
-#define REQUEST_HOSTTODEVICE	0x00
-#define REQUEST_DEVICETOHOST	0x80
-#define REQUEST_DIRECTION		0x80
-
-#define REQUEST_STANDARD		0x00
-#define REQUEST_CLASS			0x20
-#define REQUEST_VENDOR			0x40
-#define REQUEST_TYPE			0x60
-
-#define REQUEST_DEVICE			0x00
-#define REQUEST_INTERFACE		0x01
-#define REQUEST_ENDPOINT		0x02
-#define REQUEST_OTHER			0x03
-#define REQUEST_RECIPIENT		0x03
-
-#define REQUEST_DEVICETOHOST_CLASS_INTERFACE  (REQUEST_DEVICETOHOST + REQUEST_CLASS + REQUEST_INTERFACE)
-#define REQUEST_HOSTTODEVICE_CLASS_INTERFACE  (REQUEST_HOSTTODEVICE + REQUEST_CLASS + REQUEST_INTERFACE)
-
-//	Class requests
-
-#define CDC_SET_LINE_CODING			0x20
-#define CDC_GET_LINE_CODING			0x21
+#define HOSTTODEVICE	0x00
+#define DEVICETOHOST	0x80
+#define STANDARD		0x00
+#define CLASS			0x20
+#define VENDOR			0x40
+#define DEVICE			0x00
+#define INTERFACE		0x01
+#define ENDPOINT		0x02
+#define OTHER			0x03
+
+#define CDC_SET_LINE_CODING		0x20
+#define CDC_GET_LINE_CODING		0x21
 #define CDC_SET_CONTROL_LINE_STATE	0x22
 
 //	Descriptors
@@ -107,6 +94,7 @@
 #define CDC_CS_ENDPOINT                         0x25
 #define CDC_DATA_INTERFACE_CLASS                0x0A
 
+
 //	Device
 typedef struct {
 	u8 len;				// 18
@@ -198,32 +186,14 @@ typedef struct
 
 typedef struct 
 {
-    u8	len;
-    u8 	dtype;		// 0x24
-    u8 	subtype;	// 1
-    u8 	bmCapabilities;
-    u8 	bDataInterface;
-} CMFunctionalDescriptor;
-	
-typedef struct 
-{
-    u8	len;
-    u8 	dtype;		// 0x24
-    u8 	subtype;	// 1
-    u8 	bmCapabilities;
-} ACMFunctionalDescriptor;
-
-typedef struct 
-{
-	//	IAD
 	IADDescriptor				iad;	// Only needed on compound device
 
 	//	Control
 	InterfaceDescriptor			cif;	// 
 	CDCCSInterfaceDescriptor	header;
-	CMFunctionalDescriptor		callManagement;			// Call Management
-	ACMFunctionalDescriptor		controlManagement;		// ACM
-	CDCCSInterfaceDescriptor	functionalDescriptor;	// CDC_UNION
+	CDCCSInterfaceDescriptor	callManagement;
+	CDCCSInterfaceDescriptor4	controlManagement;
+	CDCCSInterfaceDescriptor	functionalDescriptor;
 	EndpointDescriptor			cifin;
 
 	//	Data
@@ -232,11 +202,31 @@ typedef struct
 	EndpointDescriptor			out;
 } CDCDescriptor;
 
+typedef struct
+{
+	u8 len;			// 9
+	u8 dtype;		// 0x21
+	u8 addr;
+	u8	versionL;	// 0x101
+	u8	versionH;	// 0x101
+	u8	country;
+	u8	desctype;	// 0x22 report
+	u8	descLenL;
+	u8	descLenH;
+} HIDDescDescriptor;
+
+typedef struct 
+{
+	InterfaceDescriptor			hid;
+	HIDDescDescriptor			desc;
+	EndpointDescriptor			in;
+} HIDDescriptor;
+
 #define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
 	{ 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
 
 #define D_CONFIG(_totalLength,_interfaces) \
-	{ 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(500) }
+	{ 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(100) }
 
 #define D_INTERFACE(_n,_numEndpoints,_class,_subClass,_protocol) \
 	{ 9, 4, _n, 0, _numEndpoints, _class,_subClass, _protocol, 0 }
@@ -247,8 +237,10 @@ typedef struct
 #define D_IAD(_firstInterface, _count, _class, _subClass, _protocol) \
 	{ 8, 11, _firstInterface, _count, _class, _subClass, _protocol, 0 }
 
+#define D_HIDREPORT(_descriptorLength) \
+	{ 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
+
 #define D_CDCCS(_subtype,_d0,_d1)	{ 5, 0x24, _subtype, _d0, _d1 }
 #define D_CDCCS4(_subtype,_d0)		{ 4, 0x24, _subtype, _d0 }
 
-
 #endif
\ No newline at end of file
diff --git a/bootloaders/diskloader/src/USBDesc.cpp b/bootloaders/diskloader/src/USBDesc.cpp
new file mode 100644
index 0000000..c8ea9c6
--- /dev/null
+++ b/bootloaders/diskloader/src/USBDesc.cpp
@@ -0,0 +1,82 @@
+
+
+/* Copyright (c) 2011, Peter Barrett  
+**  
+** Permission to use, copy, modify, and/or distribute this software for  
+** any purpose with or without fee is hereby granted, provided that the  
+** above copyright notice and this permission notice appear in all copies.  
+** 
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS 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, DIRECT, 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.  
+*/
+
+#include "Platform.h"
+
+//====================================================================================================
+//====================================================================================================
+//	Actual device descriptors
+
+const u16 STRING_LANGUAGE[2] = {
+	(3<<8) | (2+2),
+	0x0409	// English
+};
+
+
+const u16 STRING_IPRODUCT[28] = {
+	(3<<8) | (2+2*27),
+#if USB_PID == USB_PID_LEONARDO	
+	'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o',' ','b','o','o','t','l','o','a','d','e','r'
+#elif USB_PID == USB_PID_MICRO
+	'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ','b','o','o','t','l','o','a','d','e','r',' ',' ',' '
+#endif
+};
+
+const u16 STRING_IMANUFACTURER[12] = {
+	(3<<8) | (2+2*11),
+	'A','r','d','u','i','n','o',' ','L','L','C'
+};
+
+
+//#ifdef CDC_ENABLED
+DeviceDescriptor USB_DeviceDescriptorA = D_DEVICE(0X02,0X00,0X00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+//#else
+DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+//#endif
+
+Config USB_ConfigDescriptor =
+{
+	D_CONFIG(sizeof(Config),INTERFACE_COUNT),
+
+#ifdef CDC_ENABLED
+	//	CDC
+	{
+		D_IAD(0,2,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,1),
+
+		//	CDC communication interface
+		D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
+		D_CDCCS(CDC_HEADER,0x10,0x01),								// Header (1.10 bcd)
+		D_CDCCS(CDC_CALL_MANAGEMENT,1,1),							// Device handles call management
+		D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,2),				// SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
+		D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE),	// Communication interface is master, data interface is slave 0
+		D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10,0x40),
+
+		//	CDC data interface
+		D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
+		D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),
+		D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
+	},
+#endif
+	// HID
+	{
+		D_INTERFACE(HID_INTERFACE,1,3,0,0),
+		D_HIDREPORT(30),
+		D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x40)
+	}
+};
+
diff --git a/bootloaders/diskloader/src/USBDesc.h b/bootloaders/diskloader/src/USBDesc.h
index 588a40c..094dba5 100644
--- a/bootloaders/diskloader/src/USBDesc.h
+++ b/bootloaders/diskloader/src/USBDesc.h
@@ -16,19 +16,48 @@
 ** SOFTWARE.  
 */
 
-#define CDC_INTERFACE_COUNT	2
-#define CDC_ENPOINT_COUNT	3
+
+#ifdef CDC_ENABLED
 
 #define CDC_ACM_INTERFACE	0	// CDC ACM
 #define CDC_DATA_INTERFACE	1	// CDC Data
-#define CDC_FIRST_ENDPOINT	1
-#define CDC_ENDPOINT_ACM	(CDC_FIRST_ENDPOINT)							// CDC First
-#define CDC_ENDPOINT_OUT	(CDC_FIRST_ENDPOINT+1)
-#define CDC_ENDPOINT_IN		(CDC_FIRST_ENDPOINT+2)
+#define CDC_ENDPOINT_ACM	1
+#define CDC_ENDPOINT_OUT	2
+#define CDC_ENDPOINT_IN		3
 
-#define CDC_RX CDC_ENDPOINT_OUT
-#define CDC_TX CDC_ENDPOINT_IN
+#define HID_INTERFACE		2	// HID Interface
+#define HID_ENDPOINT_INT	4
+
+#define INTERFACE_COUNT		3	// 2 for cdc + 1 for hid
+
+#else 
+
+#define HID_INTERFACE		2	// HID Interface
+#define HID_ENDPOINT_INT	4
+
+#define INTERFACE_COUNT		1	// 1 for hid
+
+#endif
+
+typedef struct
+{
+	ConfigDescriptor	config;
+#ifdef CDC_ENABLED
+	CDCDescriptor		cdc;
+#endif
+	HIDDescriptor		hid;
+} Config;
+
+extern Config USB_ConfigDescriptor PROGMEM;
+extern DeviceDescriptor USB_DeviceDescriptor PROGMEM;
+extern DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
+
+extern const u16 STRING_LANGUAGE[2] PROGMEM;
+extern const u16 STRING_IPRODUCT[28] PROGMEM;
+extern const u16 STRING_IMANUFACTURER[12] PROGMEM;
 
 #define IMANUFACTURER	1
 #define IPRODUCT		2
 
+#define CDC_TX CDC_ENDPOINT_IN
+#define CDC_RX CDC_ENDPOINT_OUT
\ No newline at end of file