* move usb descriptors into separate file (src/os/usb_descriptors_openpcd.h)

* add USB HID skeleton


git-svn-id: https://svn.openpcd.org:2342/trunk@426 6dc7ffe9-61d6-0310-9af1-9938baff3ed1

7 files changed, 556 insertions, 98 deletions

diff --git a/firmware/Makefile b/firmware/Makefile
index 567c76f..08126c1 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -34,7 +34,7 @@
 # - 19. Apr. 2006  - option FLASH_TOOL (default lpc21isp); variable IMGEXT (mth)
 # - 19. Mai. 2006  - USE_THUMB_MODE switch, ROM_RUN->RUN_FROM_ROM RAM_RUN->RUN_FROM_RAM
 
-LIBRFID_DIR:=../librfid/
+LIBRFID_DIR:=../../librfid/
 
 FLASH_TOOL = AT91FLASH
 #FLASH_TOOL = UVISION
diff --git a/firmware/include/usb_hid.h b/firmware/include/usb_hid.h
new file mode 100644
index 0000000..49f5ab8
--- /dev/null
+++ b/firmware/include/usb_hid.h
@@ -0,0 +1,236 @@
+#ifndef _USB_HID_H
+#define _USB_HID_H
+
+/*
+ *
+ * Portions of <linux/hid.h>:
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2001 Vojtech Pavlik
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+/*
+ * USB HID (Human Interface Device) interface class code
+ */
+
+#define USB_INTERFACE_CLASS_HID		3
+
+/*
+ * USB HID interface subclass and protocol codes
+ */
+
+#define USB_INTERFACE_SUBCLASS_BOOT	1
+#define USB_INTERFACE_PROTOCOL_KEYBOARD	1
+#define USB_INTERFACE_PROTOCOL_MOUSE	2
+
+/*
+ * HID class requests
+ */
+
+#define HID_REQ_GET_REPORT		0x01
+#define HID_REQ_GET_IDLE		0x02
+#define HID_REQ_GET_PROTOCOL		0x03
+#define HID_REQ_SET_REPORT		0x09
+#define HID_REQ_SET_IDLE		0x0A
+#define HID_REQ_SET_PROTOCOL		0x0B
+
+/*
+ * HID class descriptor types
+ */
+
+#define HID_DT_HID			(USB_TYPE_CLASS | 0x01)
+#define HID_DT_REPORT			(USB_TYPE_CLASS | 0x02)
+#define HID_DT_PHYSICAL			(USB_TYPE_CLASS | 0x03)
+
+#define HID_MAX_DESCRIPTOR_SIZE		4096
+
+/*
+ * HID report item format
+ */
+
+#define HID_ITEM_FORMAT_SHORT	0
+#define HID_ITEM_FORMAT_LONG	1
+
+/*
+ * Special tag indicating long items
+ */
+
+#define HID_ITEM_TAG_LONG	15
+
+/*
+ * HID report descriptor item type (prefix bit 2,3)
+ */
+
+#define HID_ITEM_TYPE_MAIN		0
+#define HID_ITEM_TYPE_GLOBAL		1
+#define HID_ITEM_TYPE_LOCAL		2
+#define HID_ITEM_TYPE_RESERVED		3
+
+/*
+ * HID report descriptor main item tags
+ */
+
+#define HID_MAIN_ITEM_TAG_INPUT			8
+#define HID_MAIN_ITEM_TAG_OUTPUT		9
+#define HID_MAIN_ITEM_TAG_FEATURE		11
+#define HID_MAIN_ITEM_TAG_BEGIN_COLLECTION	10
+#define HID_MAIN_ITEM_TAG_END_COLLECTION	12
+
+/*
+ * HID report descriptor main item contents
+ */
+
+#define HID_MAIN_ITEM_CONSTANT		0x001
+#define HID_MAIN_ITEM_VARIABLE		0x002
+#define HID_MAIN_ITEM_RELATIVE		0x004
+#define HID_MAIN_ITEM_WRAP		0x008
+#define HID_MAIN_ITEM_NONLINEAR		0x010
+#define HID_MAIN_ITEM_NO_PREFERRED	0x020
+#define HID_MAIN_ITEM_NULL_STATE	0x040
+#define HID_MAIN_ITEM_VOLATILE		0x080
+#define HID_MAIN_ITEM_BUFFERED_BYTE	0x100
+
+/*
+ * HID report descriptor collection item types
+ */
+
+#define HID_COLLECTION_PHYSICAL		0
+#define HID_COLLECTION_APPLICATION	1
+#define HID_COLLECTION_LOGICAL		2
+
+/*
+ * HID report descriptor global item tags
+ */
+
+#define HID_GLOBAL_ITEM_TAG_USAGE_PAGE		0
+#define HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM	1
+#define HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM	2
+#define HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM	3
+#define HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM	4
+#define HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT	5
+#define HID_GLOBAL_ITEM_TAG_UNIT		6
+#define HID_GLOBAL_ITEM_TAG_REPORT_SIZE		7
+#define HID_GLOBAL_ITEM_TAG_REPORT_ID		8
+#define HID_GLOBAL_ITEM_TAG_REPORT_COUNT	9
+#define HID_GLOBAL_ITEM_TAG_PUSH		10
+#define HID_GLOBAL_ITEM_TAG_POP			11
+
+/*
+ * HID report descriptor local item tags
+ */
+
+#define HID_LOCAL_ITEM_TAG_USAGE		0
+#define HID_LOCAL_ITEM_TAG_USAGE_MINIMUM	1
+#define HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM	2
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX	3
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MINIMUM	4
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM	5
+#define HID_LOCAL_ITEM_TAG_STRING_INDEX		7
+#define HID_LOCAL_ITEM_TAG_STRING_MINIMUM	8
+#define HID_LOCAL_ITEM_TAG_STRING_MAXIMUM	9
+#define HID_LOCAL_ITEM_TAG_DELIMITER		10
+
+/*
+ * HID usage tables
+ */
+
+#define HID_USAGE_PAGE		0xffff0000
+
+#define HID_UP_UNDEFINED	0x00000000
+#define HID_UP_GENDESK		0x00010000
+#define HID_UP_SIMULATION	0x00020000
+#define HID_UP_KEYBOARD		0x00070000
+#define HID_UP_LED		0x00080000
+#define HID_UP_BUTTON		0x00090000
+#define HID_UP_ORDINAL		0x000a0000
+#define HID_UP_CONSUMER		0x000c0000
+#define HID_UP_DIGITIZER	0x000d0000
+#define HID_UP_PID		0x000f0000
+#define HID_UP_HPVENDOR         0xff7f0000
+#define HID_UP_MSVENDOR		0xff000000
+#define HID_UP_CUSTOM		0x00ff0000
+#define HID_UP_LOGIVENDOR	0xffbc0000
+
+#define HID_USAGE		0x0000ffff
+
+#define HID_GD_POINTER		0x00010001
+#define HID_GD_MOUSE		0x00010002
+#define HID_GD_JOYSTICK		0x00010004
+#define HID_GD_GAMEPAD		0x00010005
+#define HID_GD_KEYBOARD		0x00010006
+#define HID_GD_KEYPAD		0x00010007
+#define HID_GD_MULTIAXIS	0x00010008
+#define HID_GD_X		0x00010030
+#define HID_GD_Y		0x00010031
+#define HID_GD_Z		0x00010032
+#define HID_GD_RX		0x00010033
+#define HID_GD_RY		0x00010034
+#define HID_GD_RZ		0x00010035
+#define HID_GD_SLIDER		0x00010036
+#define HID_GD_DIAL		0x00010037
+#define HID_GD_WHEEL		0x00010038
+#define HID_GD_HATSWITCH	0x00010039
+#define HID_GD_BUFFER		0x0001003a
+#define HID_GD_BYTECOUNT	0x0001003b
+#define HID_GD_MOTION		0x0001003c
+#define HID_GD_START		0x0001003d
+#define HID_GD_SELECT		0x0001003e
+#define HID_GD_VX		0x00010040
+#define HID_GD_VY		0x00010041
+#define HID_GD_VZ		0x00010042
+#define HID_GD_VBRX		0x00010043
+#define HID_GD_VBRY		0x00010044
+#define HID_GD_VBRZ		0x00010045
+#define HID_GD_VNO		0x00010046
+#define HID_GD_FEATURE		0x00010047
+#define HID_GD_UP		0x00010090
+#define HID_GD_DOWN		0x00010091
+#define HID_GD_RIGHT		0x00010092
+#define HID_GD_LEFT		0x00010093
+
+/*
+ * HID report types --- Ouch! HID spec says 1 2 3!
+ */
+
+#define HID_INPUT_REPORT	0
+#define HID_OUTPUT_REPORT	1
+#define HID_FEATURE_REPORT	2
+
+struct usb_hid_class_descriptor {
+	u_int8_t  bDescriptorType;
+	u_int16_t wDescriptorLength;
+} __attribute__ ((packed));
+
+struct usb_hid_descriptor {
+	u_int8_t  bLength;
+	u_int8_t  bDescriptorType;
+	u_int16_t bcdHID;
+	u_int8_t  bCountryCode;
+	u_int8_t  bNumDescriptors;
+
+	struct hid_class_descriptor desc[1];
+} __attribute__ ((packed));
+
+/* Applications from HID Usage Tables 4/8/99 Version 1.1 */
+/* We ignore a few input applications that are not widely used */
+#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001))
+
+#endif
+
diff --git a/firmware/src/os/pcd_enumerate.c b/firmware/src/os/pcd_enumerate.c
index 5fc47a3..ab000c7 100644
--- a/firmware/src/os/pcd_enumerate.c
+++ b/firmware/src/os/pcd_enumerate.c
@@ -85,106 +85,13 @@ static const struct dfuapi *dfu = DFU_API_LOCATION;
 #error non-DFU builds currently not supported (yet) again
 #endif
 
-static struct udp_pcd upcd;
-
-const struct usb_device_descriptor dev_descriptor = {
-	.bLength = USB_DT_DEVICE_SIZE,
-	.bDescriptorType = USB_DT_DEVICE,
-	.bcdUSB = 0x0100,
-	.bDeviceClass = USB_CLASS_VENDOR_SPEC,
-	.bDeviceSubClass = 0xff,
-	.bDeviceProtocol = 0xff,
-	.bMaxPacketSize0 = 0x08,
-	.idVendor = USB_VENDOR_ID,
-	.idProduct = USB_PRODUCT_ID,
-	.bcdDevice = 0x0030,	/* Version 0.3 */
-#ifdef CONFIG_USB_STRING
-	.iManufacturer = 3,
-	.iProduct = 4,
-	.iSerialNumber = 0,
+#ifdef CONFIG_USB_HID
+#include "usb_descriptors_hid.h"
 #else
-	.iManufacturer = 0,
-	.iProduct = 0,
-	.iSerialNumber = 0,
-#endif
-	.bNumConfigurations = 0x01,
-};
-
-struct _desc {
-	struct usb_config_descriptor ucfg;
-	struct usb_interface_descriptor uif;
-	struct usb_endpoint_descriptor ep[3];
-#ifdef CONFIG_DFU
-	struct usb_interface_descriptor uif_dfu[2];
+#include "usb_descriptors_openpcd.h"
 #endif
-};
 
-const struct _desc cfg_descriptor = {
-	.ucfg = {
-		 .bLength = USB_DT_CONFIG_SIZE,
-		 .bDescriptorType = USB_DT_CONFIG,
-		 .wTotalLength = USB_DT_CONFIG_SIZE +
-#ifdef CONFIG_DFU
-		 		 3 * USB_DT_INTERFACE_SIZE + 
-				 3 * USB_DT_ENDPOINT_SIZE,
-		 .bNumInterfaces = 3,
-#else
-		 		 1 * USB_DT_INTERFACE_SIZE + 
-				 3 * USB_DT_ENDPOINT_SIZE,
-		 .bNumInterfaces = 1,
-#endif
-		 .bConfigurationValue = 1,
-#ifdef CONFIG_USB_STRING
-		 .iConfiguration = 5,
-#else
-		 .iConfiguration = 0,
-#endif
-		 .bmAttributes = USB_CONFIG_ATT_ONE,
-		 .bMaxPower = 250,	/* 500mA */
-		 },
-	.uif = {
-		.bLength = USB_DT_INTERFACE_SIZE,
-		.bDescriptorType = USB_DT_INTERFACE,
-		.bInterfaceNumber = 0,
-		.bAlternateSetting = 0,
-		.bNumEndpoints = 3,
-		.bInterfaceClass = USB_CLASS_VENDOR_SPEC,
-		.bInterfaceSubClass = 0,
-		.bInterfaceProtocol = 0xff,
-#ifdef CONFIG_SB_STRING
-		.iInterface = 6,
-#else
-		.iInterface = 0,
-#endif
-		},
-	.ep= {
-		{
-			  .bLength = USB_DT_ENDPOINT_SIZE,
-			  .bDescriptorType = USB_DT_ENDPOINT,
-			  .bEndpointAddress = OPENPCD_OUT_EP,
-			  .bmAttributes = USB_ENDPOINT_XFER_BULK,
-			  .wMaxPacketSize = AT91C_EP_OUT_SIZE,
-			  .bInterval = 0x00,
-		  }, {
-			  .bLength = USB_DT_ENDPOINT_SIZE,
-			  .bDescriptorType = USB_DT_ENDPOINT,
-			  .bEndpointAddress = OPENPCD_IN_EP,
-			  .bmAttributes = USB_ENDPOINT_XFER_BULK,
-			  .wMaxPacketSize = AT91C_EP_IN_SIZE,
-			  .bInterval = 0x00,
-		  }, {
-			  .bLength = USB_DT_ENDPOINT_SIZE,
-			  .bDescriptorType = USB_DT_ENDPOINT,
-			  .bEndpointAddress = OPENPCD_IRQ_EP,
-			  .bmAttributes = USB_ENDPOINT_XFER_INT,
-			  .wMaxPacketSize = AT91C_EP_IN_SIZE,
-			  .bInterval = 0xff,	/* FIXME */
-		  },
-	},
-#ifdef CONFIG_DFU
-	.uif_dfu = DFU_RT_IF_DESC,
-#endif
-};
+static struct udp_pcd upcd;
 
 struct epstate {
 	u_int32_t state_busy;
diff --git a/firmware/src/os/usb_descriptors_hid.h b/firmware/src/os/usb_descriptors_hid.h
new file mode 100644
index 0000000..9399692
--- /dev/null
+++ b/firmware/src/os/usb_descriptors_hid.h
@@ -0,0 +1,112 @@
+#ifndef _USB_DESCRIPTORS_H
+#define _USB_DESCRIPTORS_H
+
+#include <usb_ch9.h>
+#include <usb_hid.h>
+#include <sys/types.h>
+#include <openpcd.h>
+#include <dfu/dfu.h>
+
+#include "../config.h"
+
+/* The USB descriptor set for emulating a HID device */
+
+const struct usb_device_descriptor dev_descriptor = {
+	.bLength = USB_DT_DEVICE_SIZE,
+	.bDescriptorType = USB_DT_DEVICE,
+	.bcdUSB = 0x0100,
+	.bDeviceClass = 0x00,
+	.bDeviceSubClass = 0x00,
+	.bDeviceProtocol = 0x00,
+	.bMaxPacketSize0 = 0x08,
+	.idVendor = USB_VENDOR_ID,
+	.idProduct = USB_PRODUCT_ID,
+	.bcdDevice = 0x0030,	/* Version 0.3 */
+#ifdef CONFIG_USB_STRING
+	.iManufacturer = 3,
+	.iProduct = 4,
+	.iSerialNumber = 0,
+#else
+	.iManufacturer = 0,
+	.iProduct = 0,
+	.iSerialNumber = 0,
+#endif
+	.bNumConfigurations = 0x01,
+};
+
+struct _desc {
+	struct usb_config_descriptor ucfg;
+	struct usb_interface_descriptor uif;
+	struct usb_hid_descriptor hid;
+	struct usb_endpoint_descriptor ep[1];
+#ifdef CONFIG_DFU
+	struct usb_interface_descriptor uif_dfu[2];
+#endif
+};
+
+const struct _desc cfg_descriptor = {
+	.ucfg = {
+		 .bLength = USB_DT_CONFIG_SIZE,
+		 .bDescriptorType = USB_DT_CONFIG,
+		 .wTotalLength = USB_DT_CONFIG_SIZE +
+#ifdef CONFIG_DFU
+		 		 3 * USB_DT_INTERFACE_SIZE + 
+				 1 * USB_DT_ENDPOINT_SIZE,
+		 .bNumInterfaces = 3,
+#else
+		 		 1 * USB_DT_INTERFACE_SIZE + 
+				 1 * USB_DT_ENDPOINT_SIZE,
+		 .bNumInterfaces = 1,
+#endif
+		 .bConfigurationValue = 1,
+#ifdef CONFIG_USB_STRING
+		 .iConfiguration = 5,
+#else
+		 .iConfiguration = 0,
+#endif
+		 .bmAttributes = USB_CONFIG_ATT_ONE,
+		 .bMaxPower = 250,	/* 500mA */
+		 },
+	.uif = {
+		.bLength = USB_DT_INTERFACE_SIZE,
+		.bDescriptorType = USB_DT_INTERFACE,
+		.bInterfaceNumber = 0,
+		.bAlternateSetting = 0,
+		.bNumEndpoints = 1,
+		.bInterfaceClass = USB_CLASS_HID,
+		.bInterfaceSubClass = 0,
+		.bInterfaceProtocol = 0x01,
+#ifdef CONFIG_USB_STRING
+		.iInterface = 6,
+#else
+		.iInterface = 0,
+#endif
+		},
+	.hid = {
+		.bLength = 0x09,
+		.bDescriptorType = HID_DT_HID,
+		.bcdHID = 0x0111,
+		.bCountryCode = 0,
+		.bNumDescriptors = 1,
+		.desc[0] = {
+			.bDescriptorType = HID_DT_REPORT,
+			.bLength = FIXME,
+		},
+	},
+	.ep = {
+		{
+			  .bLength = USB_DT_ENDPOINT_SIZE,
+			  .bDescriptorType = USB_DT_ENDPOINT,
+			  .bEndpointAddress = OPENPCD_IRQ_EP,
+			  .bmAttributes = USB_ENDPOINT_XFER_INT,
+			  .wMaxPacketSize = AT91C_EP_IN_SIZE,
+			  .bInterval = 0x0a,	/* FIXME */
+		},
+	},
+
+#ifdef CONFIG_DFU
+	.uif_dfu = DFU_RT_IF_DESC,
+#endif
+};
+
+#endif /* _USB_DESCRIPTORS_H */
diff --git a/firmware/src/os/usb_descriptors_openpcd.h b/firmware/src/os/usb_descriptors_openpcd.h
new file mode 100644
index 0000000..ceb7ff6
--- /dev/null
+++ b/firmware/src/os/usb_descriptors_openpcd.h
@@ -0,0 +1,110 @@
+#ifndef _USB_DESCRIPTORS_H
+#define _USB_DESCRIPTORS_H
+
+#include <usb_ch9.h>
+#include <sys/types.h>
+#include <openpcd.h>
+#include <dfu/dfu.h>
+
+#include "../config.h"
+
+const struct usb_device_descriptor dev_descriptor = {
+	.bLength = USB_DT_DEVICE_SIZE,
+	.bDescriptorType = USB_DT_DEVICE,
+	.bcdUSB = 0x0100,
+	.bDeviceClass = USB_CLASS_VENDOR_SPEC,
+	.bDeviceSubClass = 0xff,
+	.bDeviceProtocol = 0xff,
+	.bMaxPacketSize0 = 0x08,
+	.idVendor = USB_VENDOR_ID,
+	.idProduct = USB_PRODUCT_ID,
+	.bcdDevice = 0x0030,	/* Version 0.3 */
+#ifdef CONFIG_USB_STRING
+	.iManufacturer = 3,
+	.iProduct = 4,
+	.iSerialNumber = 0,
+#else
+	.iManufacturer = 0,
+	.iProduct = 0,
+	.iSerialNumber = 0,
+#endif
+	.bNumConfigurations = 0x01,
+};
+
+struct _desc {
+	struct usb_config_descriptor ucfg;
+	struct usb_interface_descriptor uif;
+	struct usb_endpoint_descriptor ep[3];
+#ifdef CONFIG_DFU
+	struct usb_interface_descriptor uif_dfu[2];
+#endif
+};
+
+const struct _desc cfg_descriptor = {
+	.ucfg = {
+		 .bLength = USB_DT_CONFIG_SIZE,
+		 .bDescriptorType = USB_DT_CONFIG,
+		 .wTotalLength = USB_DT_CONFIG_SIZE +
+#ifdef CONFIG_DFU
+		 		 3 * USB_DT_INTERFACE_SIZE + 
+				 3 * USB_DT_ENDPOINT_SIZE,
+		 .bNumInterfaces = 3,
+#else
+		 		 1 * USB_DT_INTERFACE_SIZE + 
+				 3 * USB_DT_ENDPOINT_SIZE,
+		 .bNumInterfaces = 1,
+#endif
+		 .bConfigurationValue = 1,
+#ifdef CONFIG_USB_STRING
+		 .iConfiguration = 5,
+#else
+		 .iConfiguration = 0,
+#endif
+		 .bmAttributes = USB_CONFIG_ATT_ONE,
+		 .bMaxPower = 250,	/* 500mA */
+		 },
+	.uif = {
+		.bLength = USB_DT_INTERFACE_SIZE,
+		.bDescriptorType = USB_DT_INTERFACE,
+		.bInterfaceNumber = 0,
+		.bAlternateSetting = 0,
+		.bNumEndpoints = 3,
+		.bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+		.bInterfaceSubClass = 0,
+		.bInterfaceProtocol = 0xff,
+#ifdef CONFIG_USB_STRING
+		.iInterface = 6,
+#else
+		.iInterface = 0,
+#endif
+		},
+	.ep= {
+		{
+			  .bLength = USB_DT_ENDPOINT_SIZE,
+			  .bDescriptorType = USB_DT_ENDPOINT,
+			  .bEndpointAddress = OPENPCD_OUT_EP,
+			  .bmAttributes = USB_ENDPOINT_XFER_BULK,
+			  .wMaxPacketSize = AT91C_EP_OUT_SIZE,
+			  .bInterval = 0x00,
+		  }, {
+			  .bLength = USB_DT_ENDPOINT_SIZE,
+			  .bDescriptorType = USB_DT_ENDPOINT,
+			  .bEndpointAddress = OPENPCD_IN_EP,
+			  .bmAttributes = USB_ENDPOINT_XFER_BULK,
+			  .wMaxPacketSize = AT91C_EP_IN_SIZE,
+			  .bInterval = 0x00,
+		  }, {
+			  .bLength = USB_DT_ENDPOINT_SIZE,
+			  .bDescriptorType = USB_DT_ENDPOINT,
+			  .bEndpointAddress = OPENPCD_IRQ_EP,
+			  .bmAttributes = USB_ENDPOINT_XFER_INT,
+			  .wMaxPacketSize = AT91C_EP_IN_SIZE,
+			  .bInterval = 0xff,	/* FIXME */
+		  },
+	},
+#ifdef CONFIG_DFU
+	.uif_dfu = DFU_RT_IF_DESC,
+#endif
+};
+
+#endif /* _USB_DESCRIPTORS_H */
diff --git a/firmware/src/os/usb_hid.c b/firmware/src/os/usb_hid.c
new file mode 100644
index 0000000..57daeb5
--- /dev/null
+++ b/firmware/src/os/usb_hid.c
@@ -0,0 +1,34 @@
+/* OpenPCD USB HID - emulate a human inupt device 
+ * (C) 2008 by Harald Welte <hwelte@hmw-consulting.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by 
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <sys/types.h>
+#include <errno.h>
+#include <string.h>
+
+#include <openpcd.h>
+
+#include <os/pcd_enumerate.h>
+#include <os/usb_handler.h>
+#include <os/req_ctx.h>
+#include <os/led.h>
+#include <os/dbgu.h>
+
+#include "../openpcd.h"
+
+
diff --git a/firmware/src/pcd/main_hid.c b/firmware/src/pcd/main_hid.c
new file mode 100644
index 0000000..9735c3d
--- /dev/null
+++ b/firmware/src/pcd/main_hid.c
@@ -0,0 +1,59 @@
+/* main_hid - OpenPCD Human Input Device firmware
+ *
+ * (C) 2008 by Harald Welte <laforge@hmw-consulting.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by 
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <errno.h>
+#include <string.h>
+#include <lib_AT91SAM7.h>
+#include <openpcd.h>
+#include <os/dbgu.h>
+#include <os/led.h>
+#include <os/pcd_enumerate.h>
+#include <os/usb_handler.h>
+
+static void help(void)
+{
+}
+
+int _main_dbgu(char key)
+{
+	switch (key) {
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+void _init_func(void)
+{
+	//usbtest_init();
+}
+
+void _main_func(void)
+{
+	/* first we try to get rid of pending to-be-sent stuff */
+	usb_out_process();
+
+	/* next we deal with incoming reqyests from USB EP1 (OUT) */
+	usb_in_process();
+
+	/* try unthrottling sources since we now are [more] likely to
+	 * have empty request contexts */
+	udp_unthrottle();
+}