initHEADmaster

94 files changed, 13174 insertions, 0 deletions

diff --git a/lib/vusb/.gitignore b/lib/vusb/.gitignore
new file mode 100644
index 000000000..20c204a9e
--- /dev/null
+++ b/lib/vusb/.gitignore
@@ -0,0 +1,22 @@
+.DS_Store
+._*
+*.o
+*.elf
+*.hex
+*.exe
+/*.xcodeproj/project.xcworkspace/xcuserdata
+examples/*/*/Makefile*
+examples/*/*/opendevice.*
+examples/*/opendevice.*
+examples/*/firmware/usbdrv
+examples/*/firmware/usbconfig.h
+examples/*/firmware/osccal.*
+examples/*/commandline/hiddata.*
+examples/*/commandline/hidsdi.h
+examples/hid-custom-rq/commandline
+examples/custom-class/commandline/set-led
+examples/drivertest/commandline/runtest
+examples/hid-data/commandline/hidtool
+examples/usbtool/usbtool
+tests/sizes.txt
+tests/usbdrv
diff --git a/lib/vusb/Makefile b/lib/vusb/Makefile
new file mode 100644
index 000000000..a6eb8a54b
--- /dev/null
+++ b/lib/vusb/Makefile
@@ -0,0 +1,60 @@
+# Name: Makefile
+# Project: v-usb
+# Author: Christian Starkjohann
+# Creation Date: 2012-12-05
+# Tabsize: 4
+# Copyright: (c) 2012 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+# This is the main Makefile. The two primary targets are "all", to build
+# everything which can be built (except tests), and "clean" to remove all
+# dependent files. In a repository clone, derived source files are generated
+# and deleted as well.
+#
+# We distinguish between repository clones and source packages by the existence
+# of make-files.sh scripts in various subdirectories.
+
+
+all:
+        if [ ! -f examples/hid-mouse/firmware/Makefile ]; then \
+                $(MAKE) files; \
+        fi
+        if [ -n "$(uname -s | grep -i mingw)" ]; then \
+                $(MAKE) windows; \
+        else \
+                $(MAKE) unix; \
+        fi
+
+clean:
+        $(MAKE) unixclean
+        if cross-make.sh --help >/dev/null 2>&1; then \
+                $(MAKE) windowsclean; \
+        fi
+        $(MAKE) filesremove
+
+
+unix unixclean:
+        target=$$(echo $@ | sed -e 's/unix//g'); \
+        find . -mindepth 3 -name Makefile -print | while read i; do \
+                dir=$$(dirname $$i); \
+                dirname=$$(basename $$dir); \
+                pushd $$dir >/dev/null; \
+                if [ "$$dirname" = firmware -a -z "$$target" ]; then \
+                        if ! $(MAKE) hex; then break; fi; \
+                else \
+                        if ! $(MAKE) $$target; then break; fi;\
+                fi; \
+                popd >/dev/null; \
+        done
+
+
+windows windowsclean:
+        target=$$(echo $@ | sed -e 's/windows//g'); \
+        find . -mindepth 3 -name Makefile.windows -execdir cross-make.sh $$target \; ; \
+        if [ -z "$$target" ]; then target=hex; fi; \
+        find . -mindepth 2 -name firmware -exec sh -c "cd '{}'; $(MAKE) $$target" \;
+
+files filesremove:
+        target=$$(echo $@ | sed -e 's/files//g'); \
+        find . -mindepth 2 -name make-files.sh -execdir ./make-files.sh $$target \;
+
diff --git a/lib/vusb/README.md b/lib/vusb/README.md
new file mode 100644
index 000000000..88b29da28
--- /dev/null
+++ b/lib/vusb/README.md
@@ -0,0 +1,33 @@
+What is V-USB?
+==============
+V-USB is a firmware-only USB driver for Atmel's AVR microcontrollers.
+For more information please visit <http://www.obdev.at/vusb/>.
+
+What is in this Repository?
+===========================
+This repository contains the source code of the driver (in the usbdrv
+subdirectory), examples (in the examples) subdirectory and other things
+you might need when you design a device using V-USB.
+
+When you check out this repository, the resulting directory is *not* equivalent
+to the source code package which can be downloaded at
+<http://www.obdev.at/vusb/>. Some files in the source code package are generated
+by scripts when the package is created. On the other hand, the scripts which
+generate source files and the package are not contained in the package itself.
+
+If you want to know more about the files and directories, see the file
+Readme.txt in the top level directory.
+
+How do I Add the Driver to My Project?
+======================================
+Simply copy the entire usbdrv subdirectory into your project's firmware
+source code directory. Then edit the firmware's Makefile and add the following
+object files to your binary:
+
+    usbdrv/usbdrv.o
+    usbdrv/usbdrvasm.o
+    usbdrv/oddebug.o
+
+Then make sure that your Makefile contains rules to convert *.S and *.c to
+object files. See the Makefiles in the examples subdirectory for an
+inspiration.
diff --git a/lib/vusb/Readme.txt b/lib/vusb/Readme.txt
new file mode 100644
index 000000000..84d27f997
--- /dev/null
+++ b/lib/vusb/Readme.txt
@@ -0,0 +1,83 @@
+This is the Readme file for V-USB and related code. V-USB is Objective
+Development's firmware-only USB driver for Atmel's(r) AVR(r) microcontrollers.
+For more information please visit http://www.obdev.at/vusb/.
+
+To avoid name confusion: This project was formerly known as AVR-USB. Due to
+a trademark issue, it was renamed to V-USB in April 2009.
+
+
+WHAT IS INCLUDED IN THIS PACKAGE?
+=================================
+This package consists of the device side USB driver firmware, library code
+for device and host and fully working examples for device and host:
+
+  Readme.txt .............. The file you are currently reading.
+  usbdrv .................. V-USB firmware, to be included in your project.
+  examples ................ Example code for device and host side.
+  libs-device ............. Useful code snippets for the device firmware.
+  libs-host ............... Useful code snippets for host-side drivers.
+  circuits ................ Example circuits using this driver.
+  Changelog.txt ........... Documentation of changes between versions.
+  License.txt ............. Free Open Source license for this package (GPL).
+  CommercialLicense.txt ... Alternative commercial license for this package.
+  USB-ID-FAQ.txt .......... General infos about USB Product- and Vendor-IDs.
+  USB-IDs-for-free.txt .... List and terms of use for free shared PIDs.
+
+Each subdirectory contains a separate Readme file which explains its
+contents. We recommend that you also read the Readme.txt file in the
+usbdrv subdirectory.
+
+
+PREREQUISITES
+=============
+The AVR code of V-USB is written in C and assembler. You need either
+avr-gcc or IAR CC to compile the project. We recommend avr-gcc because it
+is free and easily available. Gcc version 3 generates slightly more
+efficient code than version 4 for V-USB. Not every release is tested with
+the IAR compiler. Previous versions have been tested with IAR 4.10B/W32 and
+4.12A/W32 on an ATmega8 with the "small" and "tiny" memory model.
+
+Ready made avr-gcc tool chains are available for most operating systems:
+  * Windows: WinAVR http://winavr.sourceforge.net/
+  * Mac: CrossPack for AVR Development http://www.obdev.at/crosspack/
+  * Linux and other Unixes: Most free Unixes have optional packages for AVR
+    development. If not, follow the instructions at
+    http://www.nongnu.org/avr-libc/user-manual/install_tools.html
+
+Our host side examples are compiled with gcc on all platforms. Gcc is the
+default C compiler on Mac, Linux and many other Unixes. On windows, we
+recommend MinGW (http://www.mingw.org/). Use the automated MinGW installer
+for least troubles. You also need MSYS from the same site to work with
+standard Makefiles.
+
+Most examples also depend on libusb. Libusb is available from
+http://libusb.sourceforge.net/ for Unix and
+http://libusb-win32.sourceforge.net/ for Windows.
+
+
+TECHNICAL DOCUMENTATION
+=======================
+The API reference of the driver firmware can be found in usbdrv/usbdrv.h.
+Documentation for host and device library files are in the respective header
+files. For more information, see our documentation wiki at
+http://www.obdev.at/goto.php?t=vusb-wiki.
+
+See the file usbdrv/Readme.txt for more info about the driver itself.
+
+
+LICENSE
+=======
+V-USB and related code is distributed under the terms of the GNU General
+Public License (GPL) version 2 (see License.txt for details) and the GNU
+General Public License (GPL) version 3. It is your choice whether you apply
+the terms of version 2 or version 3. In addition to the terms of the GPL, we
+strongly encourage you to publish your entire project and mail OBJECTIVE
+DEVELOPMENT a link to your publication.
+
+Alternatively, we offer a commercial license without the restrictions of the
+GPL. See CommercialLicense.txt for details.
+
+
+----------------------------------------------------------------------------
+(c) 2010 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/circuits/Readme.txt b/lib/vusb/circuits/Readme.txt
new file mode 100644
index 000000000..1aa52182e
--- /dev/null
+++ b/lib/vusb/circuits/Readme.txt
@@ -0,0 +1,79 @@
+This is the Readme file for the V-USB example circuits directory.
+
+
+CIRCUITS IN THIS DIRECTORY
+==========================
+Since USB requires 3.3 V levels on D+ and D- but delivers a power supply of
+ca. 5 V, some kind of level conversion must be performed. There are several
+ways to implement this level conversion, see the example circuits below.
+
+with-vreg.png and with-vreg.sch (EAGLE schematics):
+  This circuit uses a low drop voltage regulator to reduce the USB supply to
+  3.3 V. You MUST use a low drop regulator because standard regulators such
+  as the LM317 require at least ca. 2 V drop. The advantage of this approach
+  is that it comes closest to the voltage levels required by the USB
+  specification and that the circuit is powered from a regulated supply. If
+  no USB cable is used (connector directly soldered on PCB), you can even
+  omit the 68 Ohm series resistors. The disadvantage is that you may want to
+  use other chips in your design which require 5 V. Please check that the AVR
+  used in your design allows the chosen clock rate at 3.3 V.
+
+with-zener.png and with-zener.sch (EAGLE schematics):
+  This circuit enforces lower voltage levels on D+ and D- with zener diodes.
+  The zener diodes MUST be low power / low current types to ensure that the
+  1k5 pull-up resistor on D- generates a voltage of well above 2.5 V (but
+  below 3.6 V). The advantage of this circuit is its simplicity and that the
+  circuit can be powered at 5 V (usually precise enough if the cable drop is
+  neglected). The disadvantage is that some zener diodes have a lower voltage
+  than 3 V when powered through 1k5 and the choice of components becomes
+  relevant. In addition to that, the power consumption during USB data
+  transfer is increased because the current is only limited by the 68 Ohm
+  series resistor. The zeners may even distort the signal waveforms due to
+  their capacity.
+
+with-series-diodes.png and with-series-diodes.sch (EAGLE schematics):
+  This is a simplified low-cost version of the voltage regulator approach.
+  Instead of using a voltage regulator, we reduce the voltage by the forward
+  voltage of two silicon diodes (roughly 1.4 V). This gives ca. 3.6 V which
+  is practically inside the allowed range. The big disadvantage is that the
+  supply is not regulated -- it even depends strongly on the power
+  consumption. This cannot be tolerated for analog circuits.
+
+tiny45-rc.png and tiny45-rc.sch (EAGLE schematics):
+  This is mostly an example for connecting an 8 pin device using the internal
+  RC oscillator for system clock. This example uses series diodes to limit
+  the supply, but you may choose any other method. Please note that you must
+  choose a clock rate of 12.8 or 16.5 MHz because only the receiver modules
+  for these frequencies have a PLL to allow higher clock rate tolerances.
+
+
+GENERAL DESIGN NOTES
+====================
+All examples have D+ on hardware interrupt INT0 because this is the highest
+priority interrupt on AVRs. You may use other hardware interrupts (and
+configure the options at the end of usbconfig.h accordingly) if you make sure
+that no higher priority interrupt is used.
+
+If you use USB_SOF_HOOK or USB_COUNT_SOF in usbconfig.h, you must wire D- to
+the interrupt instead. This way the interrupt is triggered on USB Start Of
+Frame pulses as well.
+
+Most examples have a 1M pull-down resistor at D+. This pull-up ensures that
+in self-powered designs no interrupts occur while USB is not connected. You
+may omit this resistor in bus-powered designs. Older examples had a pull-up
+resistor instead. This is not compatible with the zener diode approach to
+level conversion: 1M pull-up in conjunction with a 3.6 V zener diode give an
+invalid logic level.
+
+All examples with ATMega8/88/168 have D+ at port D bit 2 (because this is
+hardware interrupt 0) and D- on port D bit 4 because it is also a clock input
+for timer/counter 0. This way the firmware can easily check for activity on
+D- (USB frame pulses) by checking the counter value in regular intervals. If
+no activity is found, the firmware should (according to the USB
+specification) put the system into a low power suspend mode.
+
+
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/circuits/tiny45-rc.sch b/lib/vusb/circuits/tiny45-rc.sch
new file mode 100644
index 000000000..349f1ad60
--- /dev/null
+++ b/lib/vusb/circuits/tiny45-rc.sch
diff --git a/lib/vusb/circuits/with-series-diodes.sch b/lib/vusb/circuits/with-series-diodes.sch
new file mode 100644
index 000000000..d84d99e56
--- /dev/null
+++ b/lib/vusb/circuits/with-series-diodes.sch
diff --git a/lib/vusb/circuits/with-vreg.sch b/lib/vusb/circuits/with-vreg.sch
new file mode 100644
index 000000000..1f1797bdd
--- /dev/null
+++ b/lib/vusb/circuits/with-vreg.sch
diff --git a/lib/vusb/circuits/with-zener.sch b/lib/vusb/circuits/with-zener.sch
new file mode 100644
index 000000000..624177a7d
--- /dev/null
+++ b/lib/vusb/circuits/with-zener.sch
diff --git a/lib/vusb/examples/Readme.txt b/lib/vusb/examples/Readme.txt
new file mode 100644
index 000000000..82b10fe3d
--- /dev/null
+++ b/lib/vusb/examples/Readme.txt
@@ -0,0 +1,102 @@
+This is the Readme file for the directory "examples" of V-USB, a firmware-
+only USB driver for AVR microcontrollers.
+
+WHAT IS IN THIS DIRECTORY?
+==========================
+This directory contains examples which are mostly for educational purposes.
+Examples can be device firmware only, host software only or both. Here is
+a summary:
+
+custom-class
+  A custom class device with host software based on libusb. It demonstrates
+  the straight forward way of sending small amounts of data to a device and
+  receiving data from the device. It does NOT demonstrate how to send large
+  amounts of data to the device or how to receive data generated on the fly
+  by the device (how to use usbFunctionWrite() and usbFunctionRead()). See
+  the hid-data example for how usbFunctionWrite() and usbFunctionRead() are
+  used.
+
+hid-custom-rq
+  This example implements the same functionality as the custom-class example
+  above, but declares the device as HID. This prevents the "give me a driver
+  CD" dialog on Windows. The device can still be controlled with libusb as in
+  the previous example (on Windows, the filter version of libusb-win32 must
+  be installed). In addition to the features presented in custom-class, this
+  example demonstrates how a HID class device is defined.
+
+hid-mouse
+  This example implements a mouse device. No host driver is required since
+  today's operating systems have drivers for USB mice built-in. It
+  demonstrates how a real-world HID class device is implemented and how
+  interrupt-in endpoints are used.
+
+hid-data
+  This example demonstrates how the HID class can be misused to transfer
+  arbitrary data over HID feature reports. This technique is of great value
+  on Windows because no driver DLLs are needed (the hid-custom-rq example
+  still requires the libusb-win32 DLL, although it may be in the program's
+  directory). The host side application requires no installation, it can
+  even be started directly from a CD. This example also demonstrates how
+  to transfer data using usbFunctionWrite() and usbFunctionRead().
+
+usbtool
+  This is a general purpose development and debugging tool for USB devices.
+  You can use it during development of your device to test various requests
+  without special test programs. But it is also an example how all the
+  libusb API functions are used.
+
+More information about each example can be found in the Readme file in the
+respective directory.
+
+Hardware dependencies of AVR code has been kept at a minimum. All examples
+should work on any AVR chip which has enough resources to run the driver.
+Makefile and usbconfig.h have been configured for the metaboard hardware (see
+http://www.obdev.at/goto.php?t=metaboard for details). Edit the target
+device, fuse values, clock rate and programmer in Makefile and the I/O pins
+dedicated to USB in usbconfig.h.
+
+
+WHAT IS NOT DEMONSTRATED IN THESE EXAMPLES?
+===========================================
+These examples show only the most basic functionality. More elaborate
+examples and real world applications showing more features of the driver are
+available at http://www.obdev.at/vusb/projects.html. Most of these
+features are described in our documentation wiki at
+http://www.obdev.at/goto.php?t=vusb-wiki.
+
+To mention just a few:
+
+Using RC oscillator for system clock
+  The 12.8 MHz and 16.5 MHz modules of V-USB have been designed to cope
+  with clock rate deviations up to 1%. This allows an RC oscillator to be
+  used. Since the AVR's RC oscillator has a factory precision of only 10%,
+  it must be calibrated to an external reference. The EasyLogger example
+  shows how this can be done.
+
+Dynamically generated descriptors
+  Sometimes you want to implement different typtes of USB device depending
+  on a jumper or other condition. V-USB has a very flexible interface for
+  providing USB descriptors. See AVR-Doper for how to provide descriptors
+  at runtime.
+
+Virtual COM port
+  Some people prefer a virtual serial interface to communicate with their
+  device. We strongly discourage this method because it does things
+  forbidden by the USB specification. If you still want to go this route,
+  see AVR-CDC.
+
+Implementing suspend mode
+  V-USB does not implement suspend mode. This means that the device does
+  not reduce power consumption when the host goes into sleep mode. Device
+  firmware is free to implement suspend mode, though. See USB2LPT for an
+  example.
+
+The projects mentioned above can best be found on
+
+    http://www.obdev.at/vusb/prjall.html
+
+where all projects are listed.
+
+----------------------------------------------------------------------------
+(c) 2009 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/examples/custom-class/Readme.txt b/lib/vusb/examples/custom-class/Readme.txt
new file mode 100644
index 000000000..815518ea1
--- /dev/null
+++ b/lib/vusb/examples/custom-class/Readme.txt
@@ -0,0 +1,64 @@
+This is the Readme file for the custom-class example. In this example, we
+show how an LED can be controlled via USB.
+
+
+WHAT IS DEMONSTRATED?
+=====================
+This example shows how small amounts of data (several bytes) can be
+transferred between the device and the host. In addition to a very basic
+USB device, it demonstrates how to build a host side driver application
+using libusb or libusb-win32. It does NOT show how usbFunctionWrite() and
+usbFunctionRead() are used. See the hid-data example if you want to learn
+about these functions.
+
+
+PREREQUISITES
+=============
+Target hardware: You need an AVR based circuit based on one of the examples
+(see the "circuits" directory at the top level of this package), e.g. the
+metaboard (http://www.obdev.at/goto.php?t=metaboard).
+
+AVR development environment: You need the gcc tool chain for the AVR, see
+the Prerequisites section in the top level Readme file for how to obtain it.
+
+Host development environment: A C compiler and libusb. See the top level
+Readme file, section Prerequisites for more information.
+
+
+BUILDING THE FIRMWARE
+=====================
+Change to the "firmware" directory and modify Makefile according to your
+architecture (CPU clock, target device, fuse values) and ISP programmer. Then
+edit usbconfig.h according to your pin assignments for D+ and D-. The default
+settings are for the metaboard hardware. You should have wired an LED with a
+current limiting resistor of ca. 270 Ohm to a free I/O pin. Change the
+defines in main.c to match the port and bit number.
+
+Type "make hex" to build main.hex, then "make flash" to upload the firmware
+to the device. Don't forget to run "make fuse" once to program the fuses. If
+you use a prototyping board with boot loader, follow the instructions of the
+boot loader instead.
+
+Please note that the first "make hex" copies the driver from the top level
+into the firmware directory. If you use a different build system than our
+Makefile, you must copy the driver by hand.
+
+
+BUILDING THE HOST SOFTWARE
+==========================
+Since the host software is based on libusb or libusb-win32, make sure that
+this library is installed. On Unix, ensure that libusb-config is in your
+search PATH. On Windows, edit Makefile.windows and set the library path
+appropriately. Then type "make" on Unix or "make -f Makefile.windows" on
+Windows to build the command line tool.
+
+
+USING THE COMMAND LINE TOOL
+===========================
+The command line tool has three valid arguments: "status" to query the
+current LED status, "on" to turn on the LED and "off" to turn it off.
+
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/examples/custom-class/commandline/set-led.c b/lib/vusb/examples/custom-class/commandline/set-led.c
new file mode 100644
index 000000000..fe0d75d71
--- /dev/null
+++ b/lib/vusb/examples/custom-class/commandline/set-led.c
@@ -0,0 +1,134 @@
+/* Name: set-led.c
+ * Project: custom-class, a basic USB example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-10
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+General Description:
+This is the host-side driver for the custom-class example device. It searches
+the USB for the LEDControl device and sends the requests understood by this
+device.
+This program must be linked with libusb on Unix and libusb-win32 on Windows.
+See http://libusb.sourceforge.net/ or http://libusb-win32.sourceforge.net/
+respectively.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <usb.h>        /* this is libusb */
+#include "opendevice.h" /* common code moved to separate module */
+
+#include "../firmware/requests.h"   /* custom request numbers */
+#include "../firmware/usbconfig.h"  /* device's VID/PID and names */
+
+static void usage(char *name)
+{
+    fprintf(stderr, "usage:\n");
+    fprintf(stderr, "  %s on ....... turn on LED\n", name);
+    fprintf(stderr, "  %s off ...... turn off LED\n", name);
+    fprintf(stderr, "  %s status ... ask current status of LED\n", name);
+#if ENABLE_TEST
+    fprintf(stderr, "  %s test ..... run driver reliability test\n", name);
+#endif /* ENABLE_TEST */
+}
+
+int main(int argc, char **argv)
+{
+usb_dev_handle      *handle = NULL;
+const unsigned char rawVid[2] = {USB_CFG_VENDOR_ID}, rawPid[2] = {USB_CFG_DEVICE_ID};
+char                vendor[] = {USB_CFG_VENDOR_NAME, 0}, product[] = {USB_CFG_DEVICE_NAME, 0};
+char                buffer[4];
+int                 cnt, vid, pid, isOn;
+
+    usb_init();
+    if(argc < 2){   /* we need at least one argument */
+        usage(argv[0]);
+        exit(1);
+    }
+    /* compute VID/PID from usbconfig.h so that there is a central source of information */
+    vid = rawVid[1] * 256 + rawVid[0];
+    pid = rawPid[1] * 256 + rawPid[0];
+    /* The following function is in opendevice.c: */
+    if(usbOpenDevice(&handle, vid, vendor, pid, product, NULL, NULL, NULL) != 0){
+        fprintf(stderr, "Could not find USB device \"%s\" with vid=0x%x pid=0x%x\n", product, vid, pid);
+        exit(1);
+    }
+    /* Since we use only control endpoint 0, we don't need to choose a
+     * configuration and interface. Reading device descriptor and setting a
+     * configuration and interface is done through endpoint 0 after all.
+     * However, newer versions of Linux require that we claim an interface
+     * even for endpoint 0. Enable the following code if your operating system
+     * needs it: */
+#if 0
+    int retries = 1, usbConfiguration = 1, usbInterface = 0;
+    if(usb_set_configuration(handle, usbConfiguration) && showWarnings){
+        fprintf(stderr, "Warning: could not set configuration: %s\n", usb_strerror());
+    }
+    /* now try to claim the interface and detach the kernel HID driver on
+     * Linux and other operating systems which support the call. */
+    while((len = usb_claim_interface(handle, usbInterface)) != 0 && retries-- > 0){
+#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+        if(usb_detach_kernel_driver_np(handle, 0) < 0 && showWarnings){
+            fprintf(stderr, "Warning: could not detach kernel driver: %s\n", usb_strerror());
+        }
+#endif
+    }
+#endif
+
+    if(strcasecmp(argv[1], "status") == 0){
+        cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, CUSTOM_RQ_GET_STATUS, 0, 0, buffer, sizeof(buffer), 5000);
+        if(cnt < 1){
+            if(cnt < 0){
+                fprintf(stderr, "USB error: %s\n", usb_strerror());
+            }else{
+                fprintf(stderr, "only %d bytes received.\n", cnt);
+            }
+        }else{
+            printf("LED is %s\n", buffer[0] ? "on" : "off");
+        }
+    }else if((isOn = (strcasecmp(argv[1], "on") == 0)) || strcasecmp(argv[1], "off") == 0){
+        cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_STATUS, isOn, 0, buffer, 0, 5000);
+        if(cnt < 0){
+            fprintf(stderr, "USB error: %s\n", usb_strerror());
+        }
+#if ENABLE_TEST
+    }else if(strcasecmp(argv[1], "test") == 0){
+        int i;
+        srandomdev();
+        for(i = 0; i < 50000; i++){
+            int value = random() & 0xffff, index = random() & 0xffff;
+            int rxValue, rxIndex;
+            if((i+1) % 100 == 0){
+                fprintf(stderr, "\r%05d", i+1);
+                fflush(stderr);
+            }
+            cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, CUSTOM_RQ_ECHO, value, index, buffer, sizeof(buffer), 5000);
+            if(cnt < 0){
+                fprintf(stderr, "\nUSB error in iteration %d: %s\n", i, usb_strerror());
+                break;
+            }else if(cnt != 4){
+                fprintf(stderr, "\nerror in iteration %d: %d bytes received instead of 4\n", i, cnt);
+                break;
+            }
+            rxValue = ((int)buffer[0] & 0xff) | (((int)buffer[1] & 0xff) << 8);
+            rxIndex = ((int)buffer[2] & 0xff) | (((int)buffer[3] & 0xff) << 8);
+            if(rxValue != value || rxIndex != index){
+                fprintf(stderr, "\ndata error in iteration %d:\n", i);
+                fprintf(stderr, "rxValue = 0x%04x value = 0x%04x\n", rxValue, value);
+                fprintf(stderr, "rxIndex = 0x%04x index = 0x%04x\n", rxIndex, index);
+            }
+        }
+        fprintf(stderr, "\nTest completed.\n");
+#endif /* ENABLE_TEST */
+    }else{
+        usage(argv[0]);
+        exit(1);
+    }
+    usb_close(handle);
+    return 0;
+}
diff --git a/lib/vusb/examples/custom-class/firmware/main.c b/lib/vusb/examples/custom-class/firmware/main.c
new file mode 100644
index 000000000..5c07a7fb0
--- /dev/null
+++ b/lib/vusb/examples/custom-class/firmware/main.c
@@ -0,0 +1,97 @@
+/* Name: main.c
+ * Project: custom-class, a basic USB example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-09
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+This example should run on most AVRs with only little changes. No special
+hardware resources except INT0 are used. You may have to change usbconfig.h for
+different I/O pins for USB. Please note that USB D+ must be the INT0 pin, or
+at least be connected to INT0 as well.
+We assume that an LED is connected to port B bit 0. If you connect it to a
+different port or bit, change the macros below:
+*/
+#define LED_PORT_DDR        DDRB
+#define LED_PORT_OUTPUT     PORTB
+#define LED_BIT             0
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>  /* for sei() */
+#include <util/delay.h>     /* for _delay_ms() */
+
+#include <avr/pgmspace.h>   /* required by usbdrv.h */
+#include "usbdrv.h"
+#include "oddebug.h"        /* This is also an example for using debug macros */
+#include "requests.h"       /* The custom request numbers we use */
+
+/* ------------------------------------------------------------------------- */
+/* ----------------------------- USB interface ----------------------------- */
+/* ------------------------------------------------------------------------- */
+
+usbMsgLen_t usbFunctionSetup(uchar data[8])
+{
+usbRequest_t    *rq = (void *)data;
+static uchar    dataBuffer[4];  /* buffer must stay valid when usbFunctionSetup returns */
+
+    if(rq->bRequest == CUSTOM_RQ_ECHO){ /* echo -- used for reliability tests */
+        dataBuffer[0] = rq->wValue.bytes[0];
+        dataBuffer[1] = rq->wValue.bytes[1];
+        dataBuffer[2] = rq->wIndex.bytes[0];
+        dataBuffer[3] = rq->wIndex.bytes[1];
+        usbMsgPtr = dataBuffer;         /* tell the driver which data to return */
+        return 4;
+    }else if(rq->bRequest == CUSTOM_RQ_SET_STATUS){
+        if(rq->wValue.bytes[0] & 1){    /* set LED */
+            LED_PORT_OUTPUT |= _BV(LED_BIT);
+        }else{                          /* clear LED */
+            LED_PORT_OUTPUT &= ~_BV(LED_BIT);
+        }
+    }else if(rq->bRequest == CUSTOM_RQ_GET_STATUS){
+        dataBuffer[0] = ((LED_PORT_OUTPUT & _BV(LED_BIT)) != 0);
+        usbMsgPtr = dataBuffer;         /* tell the driver which data to return */
+        return 1;                       /* tell the driver to send 1 byte */
+    }
+    return 0;   /* default for not implemented requests: return no data back to host */
+}
+
+/* ------------------------------------------------------------------------- */
+
+int __attribute__((noreturn)) main(void)
+{
+uchar   i;
+
+    wdt_enable(WDTO_1S);
+    /* If you don't use the watchdog, replace the call above with a wdt_disable().
+     * On newer devices, the status of the watchdog (on/off, period) is PRESERVED
+     * OVER RESET!
+     */
+    /* RESET status: all port bits are inputs without pull-up.
+     * That's the way we need D+ and D-. Therefore we don't need any
+     * additional hardware initialization.
+     */
+    odDebugInit();
+    DBG1(0x00, 0, 0);       /* debug output: main starts */
+    usbInit();
+    usbDeviceDisconnect();  /* enforce re-enumeration, do this while interrupts are disabled! */
+    i = 0;
+    while(--i){             /* fake USB disconnect for > 250 ms */
+        wdt_reset();
+        _delay_ms(1);
+    }
+    usbDeviceConnect();
+    LED_PORT_DDR |= _BV(LED_BIT);   /* make the LED bit an output */
+    sei();
+    DBG1(0x01, 0, 0);       /* debug output: main loop starts */
+    for(;;){                /* main event loop */
+        DBG1(0x02, 0, 0);   /* debug output: main loop iterates */
+        wdt_reset();
+        usbPoll();
+    }
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/lib/vusb/examples/custom-class/firmware/requests.h b/lib/vusb/examples/custom-class/firmware/requests.h
new file mode 100644
index 000000000..3d09e66e8
--- /dev/null
+++ b/lib/vusb/examples/custom-class/firmware/requests.h
@@ -0,0 +1,35 @@
+/* Name: requests.h
+ * Project: custom-class, a basic USB example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-09
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/* This header is shared between the firmware and the host software. It
+ * defines the USB request numbers (and optionally data types) used to
+ * communicate between the host and the device.
+ */
+
+#ifndef __REQUESTS_H_INCLUDED__
+#define __REQUESTS_H_INCLUDED__
+
+#define CUSTOM_RQ_ECHO          0
+/* Request that the device sends back wValue and wIndex. This is used with
+ * random data to test the reliability of the communication.
+ */
+#define CUSTOM_RQ_SET_STATUS    1
+/* Set the LED status. Control-OUT.
+ * The requested status is passed in the "wValue" field of the control
+ * transfer. No OUT data is sent. Bit 0 of the low byte of wValue controls
+ * the LED.
+ */
+
+#define CUSTOM_RQ_GET_STATUS    2
+/* Get the current LED status. Control-IN.
+ * This control transfer involves a 1 byte data phase where the device sends
+ * the current status to the host. The status is in bit 0 of the byte.
+ */
+
+#endif /* __REQUESTS_H_INCLUDED__ */
diff --git a/lib/vusb/examples/custom-class/make-files.sh b/lib/vusb/examples/custom-class/make-files.sh
new file mode 100755
index 000000000..df3fa5eed
--- /dev/null
+++ b/lib/vusb/examples/custom-class/make-files.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-17
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+
+if [ "$1" = remove ]; then
+    (cd firmware; make clean)
+    rm -f firmware/usbconfig.h
+    rm -rf firmware/usbdrv
+    rm -f commandline/Makefile.windows
+    rm -f commandline/Makefile
+    rm -f commandline/opendevice.[ch]
+    exit
+fi
+
+cat << \EOF | sed -n -f /dev/stdin ../../usbdrv/usbconfig-prototype.h >firmware/usbconfig.h
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^#define USB_CFG_DMINUS_BIT .*$/#define USB_CFG_DMINUS_BIT      4/g
+s|^.*#define USB_CFG_CLOCK_KHZ.*$|#define USB_CFG_CLOCK_KHZ       (F_CPU/1000)|g
+s/^#define USB_CFG_DEVICE_NAME .*$/#define USB_CFG_DEVICE_NAME     'L', 'E', 'D', 'C', 'o', 'n', 't', 'r', 'o', 'l'/g
+s/^#define USB_CFG_DEVICE_NAME_LEN .*$/#define USB_CFG_DEVICE_NAME_LEN 10/g
+
+s/^#define USB_CFG_MAX_BUS_POWER .*$/#define USB_CFG_MAX_BUS_POWER           40/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../usbtool/Makefile.windows >commandline/Makefile.windows
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: custom-class example/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../usbtool/Makefile >commandline/Makefile
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: custom-class example/g
+s/^NAME = .*$/NAME = set-led/g
+p
+EOF
+
+cp ../../libs-host/opendevice.[ch] commandline/
diff --git a/lib/vusb/examples/drivertest/commandline/runtest.c b/lib/vusb/examples/drivertest/commandline/runtest.c
new file mode 100644
index 000000000..3d04421f4
--- /dev/null
+++ b/lib/vusb/examples/drivertest/commandline/runtest.c
@@ -0,0 +1,151 @@
+/* Name: runtest.c
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-10
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+General Description:
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <usb.h>        /* this is libusb */
+#include "opendevice.h" /* common code moved to separate module */
+
+#include "../firmware/requests.h"   /* custom request numbers */
+#include "../firmware/usbconfig.h"  /* device's VID/PID and names */
+
+#define uchar   unsigned char
+
+static void hexdump(char *_buffer, int len, FILE *fp)
+{
+int i;
+uchar *buffer = (uchar *)_buffer;
+
+    for(i = 0; i < len; i++){
+        if(i != 0){
+            if(i % 16 == 0){
+                fprintf(fp, "\n");
+            }else{
+                fprintf(fp, " ");
+            }
+        }
+        fprintf(fp, "%02x", buffer[i]);
+    }
+    if(i != 0)
+        fprintf(fp, "\n");
+}
+
+static void fillBuffer(char *buffer, int len)
+{
+static int  type = 0;
+
+    if(type == 0){          /* all 0 */
+        bzero(buffer, len);
+    }else if(type == 1){    /* all 0xff */
+        memset(buffer, 0xff, len);
+    }else{                  /* random */
+        int i;
+        for(i = 0; i < len; i++){
+            buffer[i] = random() & 0xff;
+        }
+    }
+    if(++type >= 1000)
+        type = 0;
+}
+
+static int compareBuffers(char *txBuffer, char *rxBuffer, int len)
+{
+int i, rval = 0;
+
+    for(i = 0; i < len; i++){
+        if(rxBuffer[i] != txBuffer[i]){
+            fprintf(stderr, "compare error at index %d: byte is 0x%x instead of 0x%x\n", i, rxBuffer[i], txBuffer[i]);
+            rval = 1;
+        }
+    }
+    if(rval){
+        fprintf(stderr, "txBuffer was:\n");
+        hexdump(txBuffer, len, stderr);
+        fprintf(stderr, "rxBuffer is:\n");
+        hexdump(rxBuffer, len, stderr);
+    }
+    return rval;
+}
+
+int main(int argc, char **argv)
+{
+usb_dev_handle  *handle = NULL;
+const uchar     rawVid[2] = {USB_CFG_VENDOR_ID}, rawPid[2] = {USB_CFG_DEVICE_ID};
+char            vendor[] = {USB_CFG_VENDOR_NAME, 0}, product[] = {USB_CFG_DEVICE_NAME, 0};
+char            txBuffer[64], rxBuffer[64];
+int             cnt, vid, pid, i, j;
+
+    usb_init();
+    /* compute VID/PID from usbconfig.h so that there is a central source of information */
+    vid = rawVid[1] * 256 + rawVid[0];
+    pid = rawPid[1] * 256 + rawPid[0];
+    /* The following function is in opendevice.c: */
+    if(usbOpenDevice(&handle, vid, vendor, pid, product, NULL, NULL, NULL) != 0){
+        fprintf(stderr, "Could not find USB device \"%s\" with vid=0x%x pid=0x%x\n", product, vid, pid);
+        exit(1);
+    }
+    if(argc > 1 && strcasecmp(argv[1], "osccal") == 0){
+        if(argc > 2){   /* set osccal */
+            int osccal = atoi(argv[2]);
+            printf("setting osccal to %d\n", osccal);
+            cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, CUSTOM_RQ_SET_OSCCAL, osccal, 0, txBuffer, 0, 5000);
+            if(cnt < 0){
+                fprintf(stderr, "\nUSB error setting osccal: %s\n", usb_strerror());
+            }
+        }else{
+            cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, CUSTOM_RQ_GET_OSCCAL, 0, 0, rxBuffer, 1, 5000);
+            if(cnt < 0){
+                fprintf(stderr, "\nUSB error getting osccal: %s\n", usb_strerror());
+            }else{
+                printf("osccal = %d\n", (unsigned char)rxBuffer[0]);
+            }
+        }
+    }else{
+        srandomdev();
+        for(i = 0; i <= 100000; i++){
+            fillBuffer(txBuffer, sizeof(txBuffer));
+            cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_DATA, 0, 0, txBuffer, sizeof(txBuffer), 5000);
+            if(cnt < 0){
+                fprintf(stderr, "\nUSB tx error in iteration %d: %s\n", i, usb_strerror());
+                break;
+            }else if(cnt != sizeof(txBuffer)){
+                fprintf(stderr, "\nerror in iteration %d: %d bytes sent instead of %d\n", i, cnt, (int)sizeof(txBuffer));
+                break;
+            }
+            for(j = 0; j < sizeof(rxBuffer); j++){
+                rxBuffer[j] = ~txBuffer[j];
+            }
+            cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, CUSTOM_RQ_GET_DATA, 0, 0, rxBuffer, sizeof(rxBuffer), 5000);
+            if(cnt < 0){
+                fprintf(stderr, "\nUSB rx error in iteration %d: %s\n", i, usb_strerror());
+                break;
+            }else if(cnt != sizeof(txBuffer)){
+                fprintf(stderr, "\nerror in iteration %d: %d bytes received instead of %d\n", i, cnt, (int)sizeof(rxBuffer));
+                break;
+            }
+            if(compareBuffers(txBuffer, rxBuffer, sizeof(rxBuffer))){
+                fprintf(stderr, "\ncompare error in iteration %d.\n", i);
+                break;
+            }
+            if(i != 0 && i % 100 == 0){
+                printf(".");
+                fflush(stdout);
+                if(i % 5000 == 0)
+                    printf(" %6d\n", i);
+            }
+        }
+        fprintf(stderr, "\nTest completed.\n");
+    }
+    usb_close(handle);
+    return 0;
+}
diff --git a/lib/vusb/examples/drivertest/firmware/main.c b/lib/vusb/examples/drivertest/firmware/main.c
new file mode 100644
index 000000000..d24e50f67
--- /dev/null
+++ b/lib/vusb/examples/drivertest/firmware/main.c
@@ -0,0 +1,128 @@
+/* Name: main.c
+ * Project: hid-custom-rq example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-07
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+This example should run on most AVRs with only little changes. No special
+hardware resources except INT0 are used. You may have to change usbconfig.h for
+different I/O pins for USB. Please note that USB D+ must be the INT0 pin, or
+at least be connected to INT0 as well.
+*/
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>  /* for sei() */
+#include <util/delay.h>     /* for _delay_ms() */
+
+#include <avr/pgmspace.h>   /* required by usbdrv.h */
+#include "usbdrv.h"
+#include "oddebug.h"        /* This is also an example for using debug macros */
+#include "requests.h"       /* The custom request numbers we use */
+
+#if TUNE_OSCCAL
+uchar   lastTimer0Value;
+#endif
+
+#if CALIBRATE_OSCCAL
+#include "osccal.c"
+#endif
+
+
+/* ------------------------------------------------------------------------- */
+/* ----------------------------- USB interface ----------------------------- */
+/* ------------------------------------------------------------------------- */
+
+static uchar    dataBuffer[64];
+static uchar    writeIndex;
+
+uchar usbFunctionWrite(uchar *data, uchar len)
+{
+
+    if(writeIndex + len <= sizeof(dataBuffer)){
+        uchar i;
+        for(i = 0; i < len; i++){
+            dataBuffer[writeIndex++] = *data++;
+        }
+    }
+    return writeIndex >= sizeof(dataBuffer);
+}
+
+usbMsgLen_t usbFunctionSetup(uchar data[8])
+{
+usbRequest_t    *rq = (void *)data;
+
+    DBG1(0x50, &rq->bRequest, 1);   /* debug output: print our request */
+    if(rq->bRequest == CUSTOM_RQ_SET_DATA){
+        writeIndex = 0;
+        return USB_NO_MSG;
+    }else if(rq->bRequest == CUSTOM_RQ_GET_DATA){
+        usbMsgPtr = dataBuffer;     /* tell the driver which data to return */
+        return sizeof(dataBuffer);  /* tell the driver how many bytes to send */
+    }else if(rq->bRequest == CUSTOM_RQ_SET_OSCCAL){
+        OSCCAL = rq->wValue.bytes[0];
+    }else if(rq->bRequest == CUSTOM_RQ_GET_OSCCAL){
+        usbMsgPtr = (uchar *)&OSCCAL;
+        return 1;
+    }
+    return 0;   /* default for not implemented requests: return no data back to host */
+}
+
+/* ------------------------------------------------------------------------- */
+
+int __attribute__((noreturn)) main(void)
+{
+uchar   i;
+
+    wdt_enable(WDTO_1S);
+    /* If you don't use the watchdog, replace the call above with a wdt_disable().
+     * On newer devices, the status of the watchdog (on/off, period) is PRESERVED
+     * OVER RESET!
+     */
+    odDebugInit();
+    DBG1(0x00, 0, 0);       /* debug output: main starts */
+    /* RESET status: all port bits are inputs without pull-up.
+     * That's the way we need D+ and D-. Therefore we don't need any
+     * additional hardware initialization.
+     */
+    TCCR2 = 9 | (1 << COM20);
+    OCR2 = 3;               /* should give F_CPU/8 clock */
+
+    DDRB = (1 << 2) | (1 << 3);
+    TCCR0 = 3;              /* 1/64 prescaler */
+    usbInit();
+    usbDeviceDisconnect();  /* enforce re-enumeration, do this while interrupts are disabled! */
+    i = 0;
+    while(--i){             /* fake USB disconnect for > 250 ms */
+        wdt_reset();
+        _delay_ms(1);
+    }
+    usbDeviceConnect();
+    sei();
+    DBG1(0x01, 0, 0);       /* debug output: main loop starts */
+    for(;;){                /* main event loop */
+        wdt_reset();
+        usbPoll();
+        cli();              /* disable interrupts for some cycles, use other cli as nop */
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        cli();
+        sei();
+    }
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/lib/vusb/examples/drivertest/firmware/requests.h b/lib/vusb/examples/drivertest/firmware/requests.h
new file mode 100644
index 000000000..475101a37
--- /dev/null
+++ b/lib/vusb/examples/drivertest/firmware/requests.h
@@ -0,0 +1,28 @@
+/* Name: requests.h
+ * Project: custom-class, a basic USB example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-09
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/* This header is shared between the firmware and the host software. It
+ * defines the USB request numbers (and optionally data types) used to
+ * communicate between the host and the device.
+ */
+
+#ifndef __REQUESTS_H_INCLUDED__
+#define __REQUESTS_H_INCLUDED__
+
+#define CUSTOM_RQ_SET_DATA      1
+/* Send data to device. Control-OUT with 64 bytes data.
+ */
+
+#define CUSTOM_RQ_GET_DATA      2
+/* Get data from device. Control-IN with 64 bytes data.
+ */
+#define CUSTOM_RQ_SET_OSCCAL    3
+#define CUSTOM_RQ_GET_OSCCAL    4
+
+#endif /* __REQUESTS_H_INCLUDED__ */
diff --git a/lib/vusb/examples/drivertest/make-files.sh b/lib/vusb/examples/drivertest/make-files.sh
new file mode 100755
index 000000000..af4ef7950
--- /dev/null
+++ b/lib/vusb/examples/drivertest/make-files.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-17
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+
+if [ "$1" = remove ]; then
+    (cd firmware; make clean)
+    rm -rf firmware/usbdrv
+    rm -f firmware/osccal.[ch]
+    rm -f commandline/Makefile.windows
+    rm -f commandline/Makefile
+    rm -f commandline/opendevice.[ch]
+    exit
+fi
+
+cat << \EOF | sed -n -f /dev/stdin ../usbtool/Makefile.windows >commandline/Makefile.windows
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: hid-custom-rq example/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../usbtool/Makefile >commandline/Makefile
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: hid-custom-rq example/g
+s/^NAME = .*$/NAME = runtest/g
+p
+EOF
+
+cp ../../libs-host/opendevice.[ch] commandline/
+cp ../../libs-device/osccal.[ch] firmware/
diff --git a/lib/vusb/examples/hid-custom-rq/Readme.txt b/lib/vusb/examples/hid-custom-rq/Readme.txt
new file mode 100644
index 000000000..6a2ab3b6c
--- /dev/null
+++ b/lib/vusb/examples/hid-custom-rq/Readme.txt
@@ -0,0 +1,28 @@
+This is the Readme file for the hid-custom-rq example. This is basically the
+same as the custom-class example, except that the device conforms to the USB
+HID class.
+
+
+WHAT IS DEMONSTRATED?
+=====================
+This example demonstrates how custom requests can be sent to devices which
+are otherwise HID compliant. This mechanism can be used to prevent the
+"driver CD" dialog on Windows and still control the device with libusb-win32.
+It can also be used to extend the functionality of the USB class, e.g. by
+setting parameters.
+
+Please note that you should install the filter version of libusb-win32 to
+take full advantage or this mode. The device driver version only has access
+to devices which have been registered for it with a *.inf file. The filter
+version has access to all devices.
+
+
+MORE INFORMATION
+================
+For information about how to build this example and how to use the command
+line tool see the Readme file in the custom-class example.
+
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/examples/hid-custom-rq/firmware/main.c b/lib/vusb/examples/hid-custom-rq/firmware/main.c
new file mode 100644
index 000000000..605d58b47
--- /dev/null
+++ b/lib/vusb/examples/hid-custom-rq/firmware/main.c
@@ -0,0 +1,120 @@
+/* Name: main.c
+ * Project: hid-custom-rq example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-07
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+This example should run on most AVRs with only little changes. No special
+hardware resources except INT0 are used. You may have to change usbconfig.h for
+different I/O pins for USB. Please note that USB D+ must be the INT0 pin, or
+at least be connected to INT0 as well.
+We assume that an LED is connected to port B bit 0. If you connect it to a
+different port or bit, change the macros below:
+*/
+#define LED_PORT_DDR        DDRB
+#define LED_PORT_OUTPUT     PORTB
+#define LED_BIT             0
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>  /* for sei() */
+#include <util/delay.h>     /* for _delay_ms() */
+
+#include <avr/pgmspace.h>   /* required by usbdrv.h */
+#include "usbdrv.h"
+#include "oddebug.h"        /* This is also an example for using debug macros */
+#include "requests.h"       /* The custom request numbers we use */
+
+/* ------------------------------------------------------------------------- */
+/* ----------------------------- USB interface ----------------------------- */
+/* ------------------------------------------------------------------------- */
+
+PROGMEM const char usbHidReportDescriptor[22] = {   /* USB report descriptor */
+    0x06, 0x00, 0xff,              // USAGE_PAGE (Generic Desktop)
+    0x09, 0x01,                    // USAGE (Vendor Usage 1)
+    0xa1, 0x01,                    // COLLECTION (Application)
+    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
+    0x26, 0xff, 0x00,              //   LOGICAL_MAXIMUM (255)
+    0x75, 0x08,                    //   REPORT_SIZE (8)
+    0x95, 0x01,                    //   REPORT_COUNT (1)
+    0x09, 0x00,                    //   USAGE (Undefined)
+    0xb2, 0x02, 0x01,              //   FEATURE (Data,Var,Abs,Buf)
+    0xc0                           // END_COLLECTION
+};
+/* The descriptor above is a dummy only, it silences the drivers. The report
+ * it describes consists of one byte of undefined data.
+ * We don't transfer our data through HID reports, we use custom requests
+ * instead.
+ */
+
+/* ------------------------------------------------------------------------- */
+
+usbMsgLen_t usbFunctionSetup(uchar data[8])
+{
+usbRequest_t    *rq = (void *)data;
+
+    if((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_VENDOR){
+        DBG1(0x50, &rq->bRequest, 1);   /* debug output: print our request */
+        if(rq->bRequest == CUSTOM_RQ_SET_STATUS){
+            if(rq->wValue.bytes[0] & 1){    /* set LED */
+                LED_PORT_OUTPUT |= _BV(LED_BIT);
+            }else{                          /* clear LED */
+                LED_PORT_OUTPUT &= ~_BV(LED_BIT);
+            }
+        }else if(rq->bRequest == CUSTOM_RQ_GET_STATUS){
+            static uchar dataBuffer[1];     /* buffer must stay valid when usbFunctionSetup returns */
+            dataBuffer[0] = ((LED_PORT_OUTPUT & _BV(LED_BIT)) != 0);
+            usbMsgPtr = dataBuffer;         /* tell the driver which data to return */
+            return 1;                       /* tell the driver to send 1 byte */
+        }
+    }else{
+        /* calss requests USBRQ_HID_GET_REPORT and USBRQ_HID_SET_REPORT are
+         * not implemented since we never call them. The operating system
+         * won't call them either because our descriptor defines no meaning.
+         */
+    }
+    return 0;   /* default for not implemented requests: return no data back to host */
+}
+
+/* ------------------------------------------------------------------------- */
+
+int __attribute__((noreturn)) main(void)
+{
+uchar   i;
+
+    wdt_enable(WDTO_1S);
+    /* If you don't use the watchdog, replace the call above with a wdt_disable().
+     * On newer devices, the status of the watchdog (on/off, period) is PRESERVED
+     * OVER RESET!
+     */
+    /* RESET status: all port bits are inputs without pull-up.
+     * That's the way we need D+ and D-. Therefore we don't need any
+     * additional hardware initialization.
+     */
+    odDebugInit();
+    DBG1(0x00, 0, 0);       /* debug output: main starts */
+    usbInit();
+    usbDeviceDisconnect();  /* enforce re-enumeration, do this while interrupts are disabled! */
+    i = 0;
+    while(--i){             /* fake USB disconnect for > 250 ms */
+        wdt_reset();
+        _delay_ms(1);
+    }
+    usbDeviceConnect();
+    LED_PORT_DDR |= _BV(LED_BIT);   /* make the LED bit an output */
+    sei();
+    DBG1(0x01, 0, 0);       /* debug output: main loop starts */
+    for(;;){                /* main event loop */
+#if 0   /* this is a bit too aggressive for a debug output */
+        DBG2(0x02, 0, 0);   /* debug output: main loop iterates */
+#endif
+        wdt_reset();
+        usbPoll();
+    }
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/lib/vusb/examples/hid-custom-rq/firmware/requests.h b/lib/vusb/examples/hid-custom-rq/firmware/requests.h
new file mode 100644
index 000000000..630a68551
--- /dev/null
+++ b/lib/vusb/examples/hid-custom-rq/firmware/requests.h
@@ -0,0 +1,31 @@
+/* Name: requests.h
+ * Project: custom-class, a basic USB example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-09
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/* This header is shared between the firmware and the host software. It
+ * defines the USB request numbers (and optionally data types) used to
+ * communicate between the host and the device.
+ */
+
+#ifndef __REQUESTS_H_INCLUDED__
+#define __REQUESTS_H_INCLUDED__
+
+#define CUSTOM_RQ_SET_STATUS    1
+/* Set the LED status. Control-OUT.
+ * The requested status is passed in the "wValue" field of the control
+ * transfer. No OUT data is sent. Bit 0 of the low byte of wValue controls
+ * the LED.
+ */
+
+#define CUSTOM_RQ_GET_STATUS    2
+/* Get the current LED status. Control-IN.
+ * This control transfer involves a 1 byte data phase where the device sends
+ * the current status to the host. The status is in bit 0 of the byte.
+ */
+
+#endif /* __REQUESTS_H_INCLUDED__ */
diff --git a/lib/vusb/examples/hid-custom-rq/make-files.sh b/lib/vusb/examples/hid-custom-rq/make-files.sh
new file mode 100755
index 000000000..844761489
--- /dev/null
+++ b/lib/vusb/examples/hid-custom-rq/make-files.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-17
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+
+if [ "$1" = remove ]; then
+    (cd firmware; make clean)
+    rm -f firmware/usbconfig.h
+    rm -rf firmware/usbdrv
+    rm -f firmware/Makefile
+    rm -rf commandline
+    exit
+fi
+
+cat << \EOF | sed -n -f /dev/stdin ../../usbdrv/usbconfig-prototype.h >firmware/usbconfig.h
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^#define USB_CFG_DMINUS_BIT .*$/#define USB_CFG_DMINUS_BIT      4/g
+s|^.*#define USB_CFG_CLOCK_KHZ.*$|#define USB_CFG_CLOCK_KHZ       (F_CPU/1000)|g
+s/^#define USB_CFG_HAVE_INTRIN_ENDPOINT .*$/#define USB_CFG_HAVE_INTRIN_ENDPOINT    1/g
+s|^#define  USB_CFG_DEVICE_ID .*$|#define  USB_CFG_DEVICE_ID       0xdf, 0x05 /* obdev's shared PID for HIDs */|g
+s/^#define USB_CFG_DEVICE_NAME .*$/#define USB_CFG_DEVICE_NAME     'L', 'E', 'D', 'C', 't', 'l', 'H', 'I', 'D'/g
+s/^#define USB_CFG_DEVICE_NAME_LEN .*$/#define USB_CFG_DEVICE_NAME_LEN 9/g
+
+s/^#define USB_CFG_INTR_POLL_INTERVAL .*$/#define USB_CFG_INTR_POLL_INTERVAL      100/g
+s/^#define USB_CFG_MAX_BUS_POWER .*$/#define USB_CFG_MAX_BUS_POWER           40/g
+s/^#define USB_CFG_DEVICE_CLASS .*$/#define USB_CFG_DEVICE_CLASS        0/g
+s/^#define USB_CFG_INTERFACE_CLASS .*$/#define USB_CFG_INTERFACE_CLASS     3/g
+s/^.*#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH.*$/#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH    22/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../custom-class/firmware/Makefile >firmware/Makefile
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: hid-custom-rq example/g
+p
+EOF
+
+mkdir commandline 2>/dev/null
+cat << \EOF | sed -n -f /dev/stdin ../custom-class/commandline/set-led.c >commandline/set-led.c
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^ [*] Project: .*$/ * Project: hid-custom-rq example/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../usbtool/Makefile.windows >commandline/Makefile.windows
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: hid-custom-rq example/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../usbtool/Makefile >commandline/Makefile
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: hid-custom-rq example/g
+s/^NAME = .*$/NAME = set-led/g
+p
+EOF
+
+cp ../../libs-host/opendevice.[ch] commandline/
diff --git a/lib/vusb/examples/hid-data/Readme.txt b/lib/vusb/examples/hid-data/Readme.txt
new file mode 100644
index 000000000..cb17baa01
--- /dev/null
+++ b/lib/vusb/examples/hid-data/Readme.txt
@@ -0,0 +1,75 @@
+This is the Readme file for the hid-data example. In this example, we show
+how blocks of data can be exchanged with the device using only functionality
+compliant to the HID class. Since class drivers for HID are included with
+Windows, you don't need to install drivers on Windows.
+
+
+WHAT IS DEMONSTRATED?
+=====================
+This example demonstrates how the HID class can be misused to transfer fixed
+size blocks of data (up to the driver's transfer size limit) over HID feature
+reports. This technique is of great value on Windows because no driver DLLs
+are needed (the hid-custom-rq example still requires the libusb-win32 DLL,
+although it may be in the program's directory). The host side application
+requires no installation, it can even be started directly from a CD. This
+example also demonstrates how to transfer data using usbFunctionWrite() and
+usbFunctionRead().
+
+
+PREREQUISITES
+=============
+Target hardware: You need an AVR based circuit based on one of the examples
+(see the "circuits" directory at the top level of this package), e.g. the
+metaboard (http://www.obdev.at/goto.php?t=metaboard).
+
+AVR development environment: You need the gcc tool chain for the AVR, see
+the Prerequisites section in the top level Readme file for how to obtain it.
+
+Host development environment: A C compiler and libusb on Unix. On Windows
+you need the Driver Development Kit (DDK) Instead of libusb. MinGW ships
+with a free version of the DDK.
+
+
+BUILDING THE FIRMWARE
+=====================
+Change to the "firmware" directory and modify Makefile according to your
+architecture (CPU clock, target device, fuse values) and ISP programmer. Then
+edit usbconfig.h according to your pin assignments for D+ and D-. The default
+settings are for the metaboard hardware.
+
+Type "make hex" to build main.hex, then "make flash" to upload the firmware
+to the device. Don't forget to run "make fuse" once to program the fuses. If
+you use a prototyping board with boot loader, follow the instructions of the
+boot loader instead.
+
+Please note that the first "make hex" copies the driver from the top level
+into the firmware directory. If you use a different build system than our
+Makefile, you must copy the driver by hand.
+
+
+BUILDING THE HOST SOFTWARE
+==========================
+Make sure that you have libusb (on Unix) or the DDK (on Windows) installed.
+We recommend MinGW on Windows since it includes a free version of the DDK.
+Then change to directory "commandline" and run "make" on Unix or
+"make -f Makefile.windows" on Windows.
+
+
+USING THE COMMAND LINE TOOL
+===========================
+The device implements a data store of 128 bytes in EEPROM. You can send a
+block of 128 bytes to the device or read the block using the command line
+tool.
+
+To send a block to the device, use e.g.
+
+    hidtool write 0x01,0x02,0x03,0x04,...
+
+and to receive the block, use
+
+    hidtool read
+
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/examples/hid-data/commandline/hidtool.c b/lib/vusb/examples/hid-data/commandline/hidtool.c
new file mode 100644
index 000000000..609531253
--- /dev/null
+++ b/lib/vusb/examples/hid-data/commandline/hidtool.c
@@ -0,0 +1,126 @@
+/* Name: hidtool.c
+ * Project: hid-data example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-11
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "hiddata.h"
+#include "../firmware/usbconfig.h"  /* for device VID, PID, vendor name and product name */
+
+/* ------------------------------------------------------------------------- */
+
+static char *usbErrorMessage(int errCode)
+{
+static char buffer[80];
+
+    switch(errCode){
+        case USBOPEN_ERR_ACCESS:      return "Access to device denied";
+        case USBOPEN_ERR_NOTFOUND:    return "The specified device was not found";
+        case USBOPEN_ERR_IO:          return "Communication error with device";
+        default:
+            sprintf(buffer, "Unknown USB error %d", errCode);
+            return buffer;
+    }
+    return NULL;    /* not reached */
+}
+
+static usbDevice_t  *openDevice(void)
+{
+usbDevice_t     *dev = NULL;
+unsigned char   rawVid[2] = {USB_CFG_VENDOR_ID}, rawPid[2] = {USB_CFG_DEVICE_ID};
+char            vendorName[] = {USB_CFG_VENDOR_NAME, 0}, productName[] = {USB_CFG_DEVICE_NAME, 0};
+int             vid = rawVid[0] + 256 * rawVid[1];
+int             pid = rawPid[0] + 256 * rawPid[1];
+int             err;
+
+    if((err = usbhidOpenDevice(&dev, vid, vendorName, pid, productName, 0)) != 0){
+        fprintf(stderr, "error finding %s: %s\n", productName, usbErrorMessage(err));
+        return NULL;
+    }
+    return dev;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static void hexdump(char *buffer, int len)
+{
+int     i;
+FILE    *fp = stdout;
+
+    for(i = 0; i < len; i++){
+        if(i != 0){
+            if(i % 16 == 0){
+                fprintf(fp, "\n");
+            }else{
+                fprintf(fp, " ");
+            }
+        }
+        fprintf(fp, "0x%02x", buffer[i] & 0xff);
+    }
+    if(i != 0)
+        fprintf(fp, "\n");
+}
+
+static int  hexread(char *buffer, char *string, int buflen)
+{
+char    *s;
+int     pos = 0;
+
+    while((s = strtok(string, ", ")) != NULL && pos < buflen){
+        string = NULL;
+        buffer[pos++] = (char)strtol(s, NULL, 0);
+    }
+    return pos;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static void usage(char *myName)
+{
+    fprintf(stderr, "usage:\n");
+    fprintf(stderr, "  %s read\n", myName);
+    fprintf(stderr, "  %s write <listofbytes>\n", myName);
+}
+
+int main(int argc, char **argv)
+{
+usbDevice_t *dev;
+char        buffer[129];    /* room for dummy report ID */
+int         err;
+
+    if(argc < 2){
+        usage(argv[0]);
+        exit(1);
+    }
+    if((dev = openDevice()) == NULL)
+        exit(1);
+    if(strcasecmp(argv[1], "read") == 0){
+        int len = sizeof(buffer);
+        if((err = usbhidGetReport(dev, 0, buffer, &len)) != 0){
+            fprintf(stderr, "error reading data: %s\n", usbErrorMessage(err));
+        }else{
+            hexdump(buffer + 1, sizeof(buffer) - 1);
+        }
+    }else if(strcasecmp(argv[1], "write") == 0){
+        int i, pos;
+        memset(buffer, 0, sizeof(buffer));
+        for(pos = 1, i = 2; i < argc && pos < sizeof(buffer); i++){
+            pos += hexread(buffer + pos, argv[i], sizeof(buffer) - pos);
+        }
+        if((err = usbhidSetReport(dev, buffer, sizeof(buffer))) != 0)   /* add a dummy report ID */
+            fprintf(stderr, "error writing data: %s\n", usbErrorMessage(err));
+    }else{
+        usage(argv[0]);
+        exit(1);
+    }
+    usbhidCloseDevice(dev);
+    return 0;
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/lib/vusb/examples/hid-data/firmware/main.c b/lib/vusb/examples/hid-data/firmware/main.c
new file mode 100644
index 000000000..7c8c85e4b
--- /dev/null
+++ b/lib/vusb/examples/hid-data/firmware/main.c
@@ -0,0 +1,141 @@
+/* Name: main.c
+ * Project: hid-data, example how to use HID for data transfer
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-11
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+This example should run on most AVRs with only little changes. No special
+hardware resources except INT0 are used. You may have to change usbconfig.h for
+different I/O pins for USB. Please note that USB D+ must be the INT0 pin, or
+at least be connected to INT0 as well.
+*/
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>  /* for sei() */
+#include <util/delay.h>     /* for _delay_ms() */
+#include <avr/eeprom.h>
+
+#include <avr/pgmspace.h>   /* required by usbdrv.h */
+#include "usbdrv.h"
+#include "oddebug.h"        /* This is also an example for using debug macros */
+
+/* ------------------------------------------------------------------------- */
+/* ----------------------------- USB interface ----------------------------- */
+/* ------------------------------------------------------------------------- */
+
+PROGMEM const char usbHidReportDescriptor[22] = {    /* USB report descriptor */
+    0x06, 0x00, 0xff,              // USAGE_PAGE (Generic Desktop)
+    0x09, 0x01,                    // USAGE (Vendor Usage 1)
+    0xa1, 0x01,                    // COLLECTION (Application)
+    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
+    0x26, 0xff, 0x00,              //   LOGICAL_MAXIMUM (255)
+    0x75, 0x08,                    //   REPORT_SIZE (8)
+    0x95, 0x80,                    //   REPORT_COUNT (128)
+    0x09, 0x00,                    //   USAGE (Undefined)
+    0xb2, 0x02, 0x01,              //   FEATURE (Data,Var,Abs,Buf)
+    0xc0                           // END_COLLECTION
+};
+/* Since we define only one feature report, we don't use report-IDs (which
+ * would be the first byte of the report). The entire report consists of 128
+ * opaque data bytes.
+ */
+
+/* The following variables store the status of the current data transfer */
+static uchar    currentAddress;
+static uchar    bytesRemaining;
+
+/* ------------------------------------------------------------------------- */
+
+/* usbFunctionRead() is called when the host requests a chunk of data from
+ * the device. For more information see the documentation in usbdrv/usbdrv.h.
+ */
+uchar   usbFunctionRead(uchar *data, uchar len)
+{
+    if(len > bytesRemaining)
+        len = bytesRemaining;
+    eeprom_read_block(data, (uchar *)0 + currentAddress, len);
+    currentAddress += len;
+    bytesRemaining -= len;
+    return len;
+}
+
+/* usbFunctionWrite() is called when the host sends a chunk of data to the
+ * device. For more information see the documentation in usbdrv/usbdrv.h.
+ */
+uchar   usbFunctionWrite(uchar *data, uchar len)
+{
+    if(bytesRemaining == 0)
+        return 1;               /* end of transfer */
+    if(len > bytesRemaining)
+        len = bytesRemaining;
+    eeprom_write_block(data, (uchar *)0 + currentAddress, len);
+    currentAddress += len;
+    bytesRemaining -= len;
+    return bytesRemaining == 0; /* return 1 if this was the last chunk */
+}
+
+/* ------------------------------------------------------------------------- */
+
+usbMsgLen_t usbFunctionSetup(uchar data[8])
+{
+usbRequest_t    *rq = (void *)data;
+
+    if((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_CLASS){    /* HID class request */
+        if(rq->bRequest == USBRQ_HID_GET_REPORT){  /* wValue: ReportType (highbyte), ReportID (lowbyte) */
+            /* since we have only one report type, we can ignore the report-ID */
+            bytesRemaining = 128;
+            currentAddress = 0;
+            return USB_NO_MSG;  /* use usbFunctionRead() to obtain data */
+        }else if(rq->bRequest == USBRQ_HID_SET_REPORT){
+            /* since we have only one report type, we can ignore the report-ID */
+            bytesRemaining = 128;
+            currentAddress = 0;
+            return USB_NO_MSG;  /* use usbFunctionWrite() to receive data from host */
+        }
+    }else{
+        /* ignore vendor type requests, we don't use any */
+    }
+    return 0;
+}
+
+/* ------------------------------------------------------------------------- */
+
+int main(void)
+{
+uchar   i;
+
+    wdt_enable(WDTO_1S);
+    /* If you don't use the watchdog, replace the call above with a wdt_disable().
+     * On newer devices, the status of the watchdog (on/off, period) is PRESERVED
+     * OVER RESET!
+     */
+    /* RESET status: all port bits are inputs without pull-up.
+     * That's the way we need D+ and D-. Therefore we don't need any
+     * additional hardware initialization.
+     */
+    odDebugInit();
+    DBG1(0x00, 0, 0);       /* debug output: main starts */
+    usbInit();
+    usbDeviceDisconnect();  /* enforce re-enumeration, do this while interrupts are disabled! */
+    i = 0;
+    while(--i){             /* fake USB disconnect for > 250 ms */
+        wdt_reset();
+        _delay_ms(1);
+    }
+    usbDeviceConnect();
+    sei();
+    DBG1(0x01, 0, 0);       /* debug output: main loop starts */
+    for(;;){                /* main event loop */
+        DBG1(0x02, 0, 0);   /* debug output: main loop iterates */
+        wdt_reset();
+        usbPoll();
+    }
+    return 0;
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/lib/vusb/examples/hid-data/make-files.sh b/lib/vusb/examples/hid-data/make-files.sh
new file mode 100755
index 000000000..3da9bd549
--- /dev/null
+++ b/lib/vusb/examples/hid-data/make-files.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-17
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+
+if [ "$1" = remove ]; then
+    (cd firmware; make clean)
+    rm -f firmware/usbconfig.h
+    rm -rf firmware/usbdrv
+    rm -f firmware/Makefile
+    rm -f commandline/hiddata.[ch]
+    rm -f commandline/hidsdi.h
+    exit
+fi
+
+cat << \EOF | sed -n -f /dev/stdin ../../usbdrv/usbconfig-prototype.h >firmware/usbconfig.h
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^#define USB_CFG_DMINUS_BIT .*$/#define USB_CFG_DMINUS_BIT      4/g
+s|^.*#define USB_CFG_CLOCK_KHZ.*$|#define USB_CFG_CLOCK_KHZ       (F_CPU/1000)|g
+s/^#define USB_CFG_HAVE_INTRIN_ENDPOINT .*$/#define USB_CFG_HAVE_INTRIN_ENDPOINT    1/g
+s|^#define  USB_CFG_DEVICE_ID .*$|#define  USB_CFG_DEVICE_ID       0xdf, 0x05 /* obdev's shared PID for HIDs */|g
+s/^#define USB_CFG_DEVICE_NAME .*$/#define USB_CFG_DEVICE_NAME     'D', 'a', 't', 'a', 'S', 't', 'o', 'r', 'e'/g
+s/^#define USB_CFG_DEVICE_NAME_LEN .*$/#define USB_CFG_DEVICE_NAME_LEN 9/g
+
+s/^#define USB_CFG_INTR_POLL_INTERVAL .*$/#define USB_CFG_INTR_POLL_INTERVAL      100/g
+s/^#define USB_CFG_MAX_BUS_POWER .*$/#define USB_CFG_MAX_BUS_POWER           20/g
+s/^#define USB_CFG_IMPLEMENT_FN_WRITE .*$/#define USB_CFG_IMPLEMENT_FN_WRITE      1/g
+s/^#define USB_CFG_IMPLEMENT_FN_READ .*$/#define USB_CFG_IMPLEMENT_FN_READ       1/g
+s/^#define USB_CFG_DEVICE_CLASS .*$/#define USB_CFG_DEVICE_CLASS        0/g
+s/^#define USB_CFG_INTERFACE_CLASS .*$/#define USB_CFG_INTERFACE_CLASS     3/g
+s/^.*#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH.*$/#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH    22/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../custom-class/firmware/Makefile >firmware/Makefile
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: hid-data example/g
+p
+EOF
+
+cp ../../libs-host/hiddata.[ch] ../../libs-host/hidsdi.h commandline
diff --git a/lib/vusb/examples/hid-mouse/Readme.txt b/lib/vusb/examples/hid-mouse/Readme.txt
new file mode 100644
index 000000000..e0c814281
--- /dev/null
+++ b/lib/vusb/examples/hid-mouse/Readme.txt
@@ -0,0 +1,48 @@
+This is the Readme file for hid-mouse, an example of a USB mouse device. In
+order to have as little dependencies on hardware and architecture as
+possible, mouse movements are computed internally so that the mouse pointer
+moves in a circle.
+
+
+WHAT IS DEMONSTRATED?
+=====================
+This example demonstrates how HID class devices are implemented. The example
+is kept as simple as possible, except the report descriptor which is taken
+from a real-world mouse.
+
+It does NOT include a host side driver because all modern operating systems
+include one. It does NOT implement USBRQ_HID_SET_REPORT and report-IDs. See
+the "hid-data" example for this topic. It does NOT implement any special
+features such as suspend mode etc.
+
+
+PREREQUISITES
+=============
+Target hardware: You need an AVR based circuit based on one of the examples
+(see the "circuits" directory at the top level of this package), e.g. the
+metaboard (http://www.obdev.at/goto.php?t=metaboard).
+
+AVR development environment: You need the gcc tool chain for the AVR, see
+the Prerequisites section in the top level Readme file for how to obtain it.
+
+
+BUILDING THE FIRMWARE
+=====================
+Change to the "firmware" directory and modify Makefile according to your
+architecture (CPU clock, target device, fuse values) and ISP programmer. Then
+edit usbconfig.h according to your pin assignments for D+ and D-. The default
+settings are for the metaboard hardware.
+
+Type "make hex" to build main.hex, then "make flash" to upload the firmware
+to the device. Don't forget to run "make fuse" once to program the fuses. If
+you use a prototyping board with boot loader, follow the instructions of the
+boot loader instead.
+
+Please note that the first "make hex" copies the driver from the top level
+into the firmware directory. If you use a different build system than our
+Makefile, you must copy the driver by hand.
+
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/examples/hid-mouse/firmware/main.c b/lib/vusb/examples/hid-mouse/firmware/main.c
new file mode 100644
index 000000000..e98673123
--- /dev/null
+++ b/lib/vusb/examples/hid-mouse/firmware/main.c
@@ -0,0 +1,164 @@
+/* Name: main.c
+ * Project: hid-mouse, a very simple HID example
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-07
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+This example should run on most AVRs with only little changes. No special
+hardware resources except INT0 are used. You may have to change usbconfig.h for
+different I/O pins for USB. Please note that USB D+ must be the INT0 pin, or
+at least be connected to INT0 as well.
+
+We use VID/PID 0x046D/0xC00E which is taken from a Logitech mouse. Don't
+publish any hardware using these IDs! This is for demonstration only!
+*/
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>  /* for sei() */
+#include <util/delay.h>     /* for _delay_ms() */
+
+#include <avr/pgmspace.h>   /* required by usbdrv.h */
+#include "usbdrv.h"
+#include "oddebug.h"        /* This is also an example for using debug macros */
+
+/* ------------------------------------------------------------------------- */
+/* ----------------------------- USB interface ----------------------------- */
+/* ------------------------------------------------------------------------- */
+
+PROGMEM const char usbHidReportDescriptor[52] = { /* USB report descriptor, size must match usbconfig.h */
+    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
+    0x09, 0x02,                    // USAGE (Mouse)
+    0xa1, 0x01,                    // COLLECTION (Application)
+    0x09, 0x01,                    //   USAGE (Pointer)
+    0xA1, 0x00,                    //   COLLECTION (Physical)
+    0x05, 0x09,                    //     USAGE_PAGE (Button)
+    0x19, 0x01,                    //     USAGE_MINIMUM
+    0x29, 0x03,                    //     USAGE_MAXIMUM
+    0x15, 0x00,                    //     LOGICAL_MINIMUM (0)
+    0x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
+    0x95, 0x03,                    //     REPORT_COUNT (3)
+    0x75, 0x01,                    //     REPORT_SIZE (1)
+    0x81, 0x02,                    //     INPUT (Data,Var,Abs)
+    0x95, 0x01,                    //     REPORT_COUNT (1)
+    0x75, 0x05,                    //     REPORT_SIZE (5)
+    0x81, 0x03,                    //     INPUT (Const,Var,Abs)
+    0x05, 0x01,                    //     USAGE_PAGE (Generic Desktop)
+    0x09, 0x30,                    //     USAGE (X)
+    0x09, 0x31,                    //     USAGE (Y)
+    0x09, 0x38,                    //     USAGE (Wheel)
+    0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
+    0x25, 0x7F,                    //     LOGICAL_MAXIMUM (127)
+    0x75, 0x08,                    //     REPORT_SIZE (8)
+    0x95, 0x03,                    //     REPORT_COUNT (3)
+    0x81, 0x06,                    //     INPUT (Data,Var,Rel)
+    0xC0,                          //   END_COLLECTION
+    0xC0,                          // END COLLECTION
+};
+/* This is the same report descriptor as seen in a Logitech mouse. The data
+ * described by this descriptor consists of 4 bytes:
+ *      .  .  .  .  . B2 B1 B0 .... one byte with mouse button states
+ *     X7 X6 X5 X4 X3 X2 X1 X0 .... 8 bit signed relative coordinate x
+ *     Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 .... 8 bit signed relative coordinate y
+ *     W7 W6 W5 W4 W3 W2 W1 W0 .... 8 bit signed relative coordinate wheel
+ */
+typedef struct{
+    uchar   buttonMask;
+    char    dx;
+    char    dy;
+    char    dWheel;
+}report_t;
+
+static report_t reportBuffer;
+static int      sinus = 7 << 6, cosinus = 0;
+static uchar    idleRate;   /* repeat rate for keyboards, never used for mice */
+
+
+/* The following function advances sin/cos by a fixed angle
+ * and stores the difference to the previous coordinates in the report
+ * descriptor.
+ * The algorithm is the simulation of a second order differential equation.
+ */
+static void advanceCircleByFixedAngle(void)
+{
+char    d;
+
+#define DIVIDE_BY_64(val)  (val + (val > 0 ? 32 : -32)) >> 6    /* rounding divide */
+    reportBuffer.dx = d = DIVIDE_BY_64(cosinus);
+    sinus += d;
+    reportBuffer.dy = d = DIVIDE_BY_64(sinus);
+    cosinus -= d;
+}
+
+/* ------------------------------------------------------------------------- */
+
+usbMsgLen_t usbFunctionSetup(uchar data[8])
+{
+usbRequest_t    *rq = (void *)data;
+
+    /* The following requests are never used. But since they are required by
+     * the specification, we implement them in this example.
+     */
+    if((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_CLASS){    /* class request type */
+        DBG1(0x50, &rq->bRequest, 1);   /* debug output: print our request */
+        if(rq->bRequest == USBRQ_HID_GET_REPORT){  /* wValue: ReportType (highbyte), ReportID (lowbyte) */
+            /* we only have one report type, so don't look at wValue */
+            usbMsgPtr = (void *)&reportBuffer;
+            return sizeof(reportBuffer);
+        }else if(rq->bRequest == USBRQ_HID_GET_IDLE){
+            usbMsgPtr = &idleRate;
+            return 1;
+        }else if(rq->bRequest == USBRQ_HID_SET_IDLE){
+            idleRate = rq->wValue.bytes[1];
+        }
+    }else{
+        /* no vendor specific requests implemented */
+    }
+    return 0;   /* default for not implemented requests: return no data back to host */
+}
+
+/* ------------------------------------------------------------------------- */
+
+int __attribute__((noreturn)) main(void)
+{
+uchar   i;
+
+    wdt_enable(WDTO_1S);
+    /* If you don't use the watchdog, replace the call above with a wdt_disable().
+     * On newer devices, the status of the watchdog (on/off, period) is PRESERVED
+     * OVER RESET!
+     */
+    /* RESET status: all port bits are inputs without pull-up.
+     * That's the way we need D+ and D-. Therefore we don't need any
+     * additional hardware initialization.
+     */
+    odDebugInit();
+    DBG1(0x00, 0, 0);       /* debug output: main starts */
+    usbInit();
+    usbDeviceDisconnect();  /* enforce re-enumeration, do this while interrupts are disabled! */
+    i = 0;
+    while(--i){             /* fake USB disconnect for > 250 ms */
+        wdt_reset();
+        _delay_ms(1);
+    }
+    usbDeviceConnect();
+    sei();
+    DBG1(0x01, 0, 0);       /* debug output: main loop starts */
+    for(;;){                /* main event loop */
+        DBG1(0x02, 0, 0);   /* debug output: main loop iterates */
+        wdt_reset();
+        usbPoll();
+        if(usbInterruptIsReady()){
+            /* called after every poll of the interrupt endpoint */
+            advanceCircleByFixedAngle();
+            DBG1(0x03, 0, 0);   /* debug output: interrupt report prepared */
+            usbSetInterrupt((void *)&reportBuffer, sizeof(reportBuffer));
+        }
+    }
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/lib/vusb/examples/hid-mouse/make-files.sh b/lib/vusb/examples/hid-mouse/make-files.sh
new file mode 100755
index 000000000..3e931c4ee
--- /dev/null
+++ b/lib/vusb/examples/hid-mouse/make-files.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-17
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+
+if [ "$1" = remove ]; then
+    (cd firmware; make clean)
+    rm -f firmware/usbconfig.h
+    rm -rf firmware/usbdrv
+    rm -f firmware/Makefile
+    exit
+fi
+
+cat << \EOF | sed -n -f /dev/stdin ../../usbdrv/usbconfig-prototype.h >firmware/usbconfig.h
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^#define USB_CFG_DMINUS_BIT .*$/#define USB_CFG_DMINUS_BIT      4/g
+s|^.*#define USB_CFG_CLOCK_KHZ.*$|#define USB_CFG_CLOCK_KHZ       (F_CPU/1000)|g
+s/^#define USB_CFG_HAVE_INTRIN_ENDPOINT .*$/#define USB_CFG_HAVE_INTRIN_ENDPOINT    1/g
+s|^#define  USB_CFG_DEVICE_ID .*$|#define  USB_CFG_DEVICE_ID       0xe8, 0x03 /* VOTI's lab use PID */|g
+s/^#define USB_CFG_DEVICE_NAME .*$/#define USB_CFG_DEVICE_NAME     'M', 'o', 'u', 's', 'e'/g
+s/^#define USB_CFG_DEVICE_NAME_LEN .*$/#define USB_CFG_DEVICE_NAME_LEN 5/g
+
+s/^#define USB_CFG_INTR_POLL_INTERVAL .*$/#define USB_CFG_INTR_POLL_INTERVAL      100/g
+s/^#define USB_CFG_MAX_BUS_POWER .*$/#define USB_CFG_MAX_BUS_POWER           20/g
+s/^#define USB_CFG_DEVICE_CLASS .*$/#define USB_CFG_DEVICE_CLASS        0/g
+s/^#define USB_CFG_INTERFACE_CLASS .*$/#define USB_CFG_INTERFACE_CLASS     3/g
+s/^.*#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH.*$/#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH    52/g
+p
+EOF
+
+cat << \EOF | sed -n -f /dev/stdin ../custom-class/firmware/Makefile >firmware/Makefile
+/^\( [*] \)\{0,1\}[+].*$/ d
+s/^# Project: .*$/# Project: hid-mouse example/g
+p
+EOF
diff --git a/lib/vusb/examples/usbtool/Makefile b/lib/vusb/examples/usbtool/Makefile
new file mode 100644
index 000000000..1f2a8ab81
--- /dev/null
+++ b/lib/vusb/examples/usbtool/Makefile
@@ -0,0 +1,47 @@
+# Name: Makefile
+# Project: usbtool
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-06
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+
+# Concigure the following definitions according to your system.
+# This Makefile has been tested on Mac OS X, Linux and Windows.
+
+# Use the following 3 lines on Unix (uncomment the framework on Mac OS X):
+USBFLAGS = `libusb-config --cflags`
+USBLIBS = `libusb-config --libs`
+EXE_SUFFIX =
+
+# Use the following 3 lines on Windows and comment out the 3 above. You may
+# have to change the include paths to where you installed libusb-win32
+#USBFLAGS = -I/usr/local/include
+#USBLIBS = -L/usr/local/lib -lusb
+#EXE_SUFFIX = .exe
+
+NAME = usbtool
+
+OBJECTS = opendevice.o $(NAME).o
+
+CC              = gcc
+CFLAGS  = $(CPPFLAGS) $(USBFLAGS) -O -g -Wall
+LIBS    = $(USBLIBS)
+
+PROGRAM = $(NAME)$(EXE_SUFFIX)
+
+
+all: $(PROGRAM)
+
+.c.o:
+        $(CC) $(CFLAGS) -c $<
+
+$(PROGRAM): $(OBJECTS)
+        $(CC) -o $(PROGRAM) $(OBJECTS) $(LIBS)
+
+strip: $(PROGRAM)
+        strip $(PROGRAM)
+
+clean:
+        rm -f *.o $(PROGRAM)
diff --git a/lib/vusb/examples/usbtool/Makefile.windows b/lib/vusb/examples/usbtool/Makefile.windows
new file mode 100644
index 000000000..8298dd3b1
--- /dev/null
+++ b/lib/vusb/examples/usbtool/Makefile.windows
@@ -0,0 +1,17 @@
+# Name: Makefile.windows
+# Project: usbtool
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-06
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+# You may use this file with
+#   make -f Makefile.windows
+# on Windows with MinGW instead of editing the main Makefile.
+
+include Makefile
+
+USBFLAGS = -I/usr/local/mingw/include
+USBLIBS = -L/usr/local/mingw/lib -lusb
+EXE_SUFFIX = .exe
diff --git a/lib/vusb/examples/usbtool/Readme.txt b/lib/vusb/examples/usbtool/Readme.txt
new file mode 100644
index 000000000..33f527cc4
--- /dev/null
+++ b/lib/vusb/examples/usbtool/Readme.txt
@@ -0,0 +1,209 @@
+This is the Readme file for usbtool, a general purpose command line utility
+which can send USB requests to arbitrary devices. Usbtool is based on libusb.
+
+
+WHAT IS USBTOOL GOOD FOR?
+=========================
+When you implement a communication protocol like USB, you must usually write
+two programs: one on each end of the communication. For USB, this means that
+you must write a firmware for the device and driver software for the host.
+
+Usbtool can save you the work of writing the host software, at least during
+firmware development and testing. Usbtool can send control-in and -out
+requests to arbitrary devices and send and receive data on interrupt- and
+bulk-endpoints.
+
+Usbtool is not only a useful developer tool, it's also an example for using
+libusb for communication with the device.
+
+
+SYNOPSIS
+========
+  usbtool [options] <command>
+
+
+COMMANDS
+========
+  list
+    This command prints a list of devices found on all available USB busses.
+    Options -v, -V, -p and -P can be used to filter the list.
+
+  control in|out <type> <recipient> <request> <value> <index>
+    Sends a control-in or control-out request to the device. The request
+    parameters are:
+      type ........ Type of request, can be "standard", "class", "vendor" or
+                    "reserved". The type determines which software module in
+                    the device is responsible for answering the request:
+                    Standard requests are answered by the driver, class
+                    requests by the class implementation (e.g. HID, CDC) and
+                    vendor requests by custom code.
+      recipient ... Recipient of the request in the device. Can be "device",
+                    "interface", "endpoint" or "other". For standard and
+                    class requests, the specification defines a recipient for
+                    each request. For vendor requests, choose whatever your
+                    code expects.
+      request ..... 8 bit numeric value identifying the request.
+      value ....... 16 bit numeric value passed to the device.
+      index ....... another 16 bit numeric value passed to the device.
+    Use options -v, -V, -p and -P to single out a particular device. Use
+    options -d or -D to to send data in an OUT request. Use options -n, -O
+    and -b to determine what to do with data received in an IN request.
+
+  interrupt in|out
+    Sends or receives data on an interrupt-out resp. -in endpoint.
+    Use options -v, -V, -p and -P to single out a particular device. Use
+    options -d or -D to to send data to an OUT endpoint. Use options -n, -O
+    and -b to determine what to do with data received from an IN endpoint.
+    Use option -e to set the endpoint number, -c to choose a configuration
+    -i to claim a particular interface.
+
+  bulk in|out
+    Same as "interrupt in" and "interrupt out", but for bulk endpoints.
+
+
+OPTIONS
+=======
+Most options have already been mentioned at the commands which use them.
+here is a complete list:
+
+  -h or -?
+    Prints a short help.
+
+  -v <vendor-id>
+    Numeric vendor ID, can be "*" to allow any VID. Take only devices with
+    matching vendor ID into account.
+
+  -p <product-id>
+    Numeric product ID, can be "*" to allow any PID. Take only devices with
+    matching product ID into account.
+
+  -V <vendor-name-pattern>
+    Shell style matching pattern for vendor name. Take only devices into
+    account which have a vendor name that matches this pattern.
+
+  -P <product-name-pattern>
+    Shell style matching pattern for product name. Take only devices into
+    account which have a product name that matches this pattern.
+
+  -S <serial-pattern>
+    Shell style matching pattern for serial number. Take only devices into
+    account which have a serial number that matches this pattern.
+
+  -d <databytes>
+    Data bytes to send to the device, comma separated list of numeric values.
+    E.g.: "1,2,3,4,5".
+
+  -D <file>
+    Binary data sent to the device should be taken from this file.
+
+  -O <file>
+    Write received data bytes to the given file. Format is either hex or
+    binary, depending on the -b flag. By default, received data is printed
+    to standard output.
+
+  -b
+    Request binary output format for files and standard output. Default is
+    a hexadecimal listing.
+
+  -n <count>
+    Numeric value: Maximum number of bytes to receive. This value is passed
+    directly to the libusb API functions.
+
+  -e <endpoint>
+    Numeric value: Endpoint number for interrupt and bulk commands.
+
+  -t <timeout>
+    Numeric value: Timeout in milliseconds for the request. This value is
+    passed directly to the libusb API functions.
+
+  -c <configuration>
+    Numeric value: Interrupt and bulk endpoints can usually only be used if
+    a configuration and an interface has been chosen. Use -c and -i to
+    specify configuration and interface values.
+
+  -i <interface>
+    Numeric value: Interrupt and bulk endpoints can usually only be used if
+    a configuration and an interface has been chosen. Use -c and -i to
+    specify configuration and interface values.
+
+  -w
+    Usbtool may be too verbose with warnings for some applications. Use this
+    option to suppress USB warnings.
+
+
+NUMERIC VALUES
+==============
+All numeric values can be given in hexadecimal, decimal or octal. Hex values
+are identified by their 0x or 0X prefix, octal values by a leading "0" (the
+digit zero) and decimal values because they start with a non-zero digit. An
+optional sign character is allowed. The special value "*" is translated to
+zero and stands for "any value" in some contexts.
+
+
+SHELL STYLE MATCHING PATTERNS
+=============================
+Some options take shell style matching patterns as an argument. This refers
+to Unix shells and their file wildcard operations:
+  + "*" (asterisk character) matches any number (0 to infinite) of any
+    characters.
+  + "?" matches exactly one arbitrary character.
+  + A list of characters in square brackets (e.g. "[abc]") matches any of the
+    characters in the list. If a dash ("-") is in the list, it must be the
+    first or the last character. If a caret ("^") is in the list, it must
+    not be the first character. A closing square bracket ("]") must be the
+    first character in the list. A range of characters can be specified in
+    the way "[a-z]". This matches all characters with numeric representation
+    (usually ASCII) starting with "a" and ending with "z". The entire
+    construct matches only one character.
+  + A list of characters in square brackets starting with a caret ("^"), e.g.
+    ("[^abc]") matches any character NOT in the list. The other rules are as
+    above.
+  + "\" (backslash) followed by any character matches that following
+    character. This can be used to escape "*", "?", "[" and "\".
+
+
+BUILDING USBTOOL
+================
+Usbtool uses libusb on Unix and libusb-win32 on Windows. These libraries can
+be obtained from http://libusb.sourceforge.net/ and
+http://libusb-win32.sourceforge.net/ respectively. On Unix, a simple "make"
+should compile the sources (although you may have to edit Makefile to
+include or remove additional libraries). On Windows, we recommend that you
+use MinGW and MSYS. See the top level Readme file for details. Edit
+Makefile.windows according to your library installation paths and build with
+"make -f Makefile.windows".
+
+
+EXAMPLES
+========
+To list all devices connected to your computer, do
+
+    usbtool -w list
+
+To check whether our selection options single out the desired device, use eg.
+
+    usbtool -w -P LEDControl list
+
+This command shows all LEDControl devices connected or prints nothing if
+none is found. LEDControl is the device from the "custom-class" example.
+
+You can also send commands to the LEDControl device using usbtool. From
+the file requests.h in custom-class/firmware, we know that the set-status
+request has numeric value 1 and the get-status request is 2. See this file
+for details of the protocol used. We can therefore query the status with
+
+    usbtool -w -P LEDControl control in vendor device 2 0 0
+
+This command prints 0x00 if the LED is off or 0x01 if it is on. To turn the
+LED on, use
+
+    usbtool -w -P LEDControl control out vendor device 1 1 0
+
+and to turn it off, use
+
+    usbtool -w -P LEDControl control out vendor device 1 0 0
+
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/examples/usbtool/make-files.sh b/lib/vusb/examples/usbtool/make-files.sh
new file mode 100755
index 000000000..8519514a8
--- /dev/null
+++ b/lib/vusb/examples/usbtool/make-files.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Author: Christian Starkjohann
+# Creation Date: 2008-04-17
+# Tabsize: 4
+# Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+
+
+if [ "$1" = remove ]; then
+    make clean
+    rm -f opendevice.[ch]
+    exit
+fi
+
+cp ../../libs-host/opendevice.[ch] .
diff --git a/lib/vusb/examples/usbtool/usbtool.c b/lib/vusb/examples/usbtool/usbtool.c
new file mode 100644
index 000000000..56bdac109
--- /dev/null
+++ b/lib/vusb/examples/usbtool/usbtool.c
@@ -0,0 +1,355 @@
+/* Name: usbtool.c
+ * Project: V-USB examples, host side
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-06
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+General Description:
+This command line tool can perform various USB requests at arbitrary
+USB devices. It is intended as universal host side tool for experimentation
+and debugging purposes. It must be linked with libusb, a library for accessing
+the USB bus from Linux, FreeBSD, Mac OS X and other Unix operating systems.
+Libusb can be obtained from http://libusb.sourceforge.net/.
+On Windows use libusb-win32 from http://libusb-win32.sourceforge.net/.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <usb.h>        /* this is libusb, see http://libusb.sourceforge.net/ */
+#include "opendevice.h" /* common code moved to separate module */
+
+#define DEFAULT_USB_VID         0   /* any */
+#define DEFAULT_USB_PID         0   /* any */
+
+static void usage(char *name)
+{
+    fprintf(stderr, "usage: %s [options] <command>\n", name);
+    fprintf(stderr,
+        "Options are:\n"
+        "  -h or -? (print this help and exit)\n"
+        "  -v <vendor-id> (defaults to 0x%x, can be '*' for any VID)\n"
+        "  -p <product-id> (defaults to 0x%x, can be '*' for any PID)\n"
+        "  -V <vendor-name-pattern> (shell style matching, defaults to '*')\n"
+        "  -P <product-name-pattern> (shell style matching, defaults to '*')\n"
+        "  -S <serial-pattern> (shell style matching, defaults to '*')\n"
+        "  -d <databytes> (data byte for request, comma separated list)\n"
+        "  -D <file> (binary data for request taken from file)\n"
+        "  -O <file> (write received data bytes to file)\n"
+        "  -b (binary output format, default is hex)\n"
+        "  -n <count> (maximum number of bytes to receive)\n"
+        "  -e <endpoint> (specify endpoint for some commands)\n"
+        "  -t <timeout> (specify USB timeout in milliseconds)\n"
+        "  -c <configuration> (device configuration to choose)\n"
+        "  -i <interface> (configuration interface to claim)\n"
+        "  -w (suppress USB warnings, default is verbose)\n"
+        "\n"
+        "Commands are:\n"
+        "  list (list all matching devices by name)\n"
+        "  control in|out <type> <recipient> <request> <value> <index> (send control request)\n"
+        "  interrupt in|out (send or receive interrupt data)\n"
+        "  bulk in|out (send or receive bulk data)\n"
+        "For valid enum values for <type> and <recipient> pass \"x\" for the value.\n"
+        "Objective Development's free VID/PID pairs are:\n"
+        "  5824/1500 for vendor class devices\n"
+        "  5824/1503 for HID class devices excluding mice and keyboards\n"
+        "  5824/1505 for CDC-ACM class devices\n"
+        "  5824/1508 for MIDI class devices\n"
+        , DEFAULT_USB_VID, DEFAULT_USB_PID
+    );
+
+
+}
+
+static int  vendorID = DEFAULT_USB_VID;
+static int  productID = DEFAULT_USB_PID;
+static char *vendorNamePattern = "*";
+static char *productNamePattern = "*";
+static char *serialPattern = "*";
+static char *sendBytes = NULL;
+static int  sendByteCount;
+static char *outputFile = NULL;
+static int  endpoint = 0;
+static int  outputFormatIsBinary = 0;
+static int  showWarnings = 1;
+static int  usbTimeout = 5000;
+static int  usbCount = 128;
+static int  usbConfiguration = 1;
+static int  usbInterface = 0;
+
+static int  usbDirection, usbType, usbRecipient, usbRequest, usbValue, usbIndex; /* arguments of control transfer */
+
+/* ------------------------------------------------------------------------- */
+
+/* ASCII to integer (number parsing) which allows hex (0x prefix),
+ * octal (0 prefix) and decimal (1-9 prefix) input.
+ */
+static int  myAtoi(char *text)
+{
+long    l;
+char    *endPtr;
+
+    if(strcmp(text, "*") == 0)
+        return 0;
+    l = strtol(text, &endPtr, 0);
+    if(endPtr == text){
+        fprintf(stderr, "warning: can't parse numeric parameter ->%s<-, defaults to 0.\n", text);
+        l = 0;
+    }else if(*endPtr != 0){
+        fprintf(stderr, "warning: numeric parameter ->%s<- only partially parsed.\n", text);
+    }
+    return l;
+}
+
+static int  parseEnum(char *text, ...)
+{
+va_list vlist;
+char    *entries[64];
+int     i, numEntries;
+
+    va_start(vlist, text);
+    for(i = 0; i < 64; i++){
+        entries[i] = va_arg(vlist, char *);
+        if(entries[i] == NULL)
+            break;
+    }
+    numEntries = i;
+    va_end(vlist);
+    for(i = 0; i < numEntries; i++){
+        if(strcasecmp(text, entries[i]) == 0)
+            return i;
+    }
+    if(isdigit(*text)){
+        return myAtoi(text);
+    }
+    fprintf(stderr, "Enum value \"%s\" not allowed. Allowed values are:\n", text);
+    for(i = 0; i < numEntries; i++){
+        fprintf(stderr, "  %s\n", entries[i]);
+    }
+    exit(1);
+}
+
+/* ------------------------------------------------------------------------- */
+
+#define ACTION_LIST         0
+#define ACTION_CONTROL      1
+#define ACTION_INTERRUPT    2
+#define ACTION_BULK         3
+
+int main(int argc, char **argv)
+{
+usb_dev_handle  *handle = NULL;
+int             opt, len, action, argcnt;
+char            *myName = argv[0], *s, *rxBuffer = NULL;
+FILE            *fp;
+
+    while((opt = getopt(argc, argv, "?hv:p:V:P:S:d:D:O:e:n:tbw")) != -1){
+        switch(opt){
+        case 'h':
+        case '?':   /* -h or -? (print this help and exit) */
+            usage(myName);
+            exit(1);
+        case 'v':   /* -v <vendor-id> (defaults to 0x%x, can be '*' for any VID) */
+            vendorID = myAtoi(optarg);
+            break;
+        case 'p':   /* -p <product-id> (defaults to 0x%x, can be '*' for any PID) */
+            productID = myAtoi(optarg);
+            break;
+        case 'V':   /* -V <vendor-name-pattern> (shell style matching, defaults to '*') */
+            vendorNamePattern = optarg;
+            break;
+        case 'P':   /* -P <product-name-pattern> (shell style matching, defaults to '*') */
+            productNamePattern = optarg;
+            break;
+        case 'S':   /* -S <serial-pattern> (shell style matching, defaults to '*') */
+            serialPattern = optarg;
+            break;
+        case 'd':   /* -d <databytes> (data bytes for requests given on command line) */
+            while((s = strtok(optarg, ", ")) != NULL){
+                optarg = NULL;
+                if(sendBytes != NULL){
+                    sendBytes = realloc(sendBytes, sendByteCount + 1);
+                }else{
+                    sendBytes = malloc(sendByteCount + 1);
+                }
+                sendBytes[sendByteCount++] = myAtoi(s);
+            }
+            break;
+        case 'D':   /* -D <file> (data bytes for request taken from file) */
+            if((fp = fopen(optarg, "rb")) == NULL){
+                fprintf(stderr, "error opening %s: %s\n", optarg, strerror(errno));
+                exit(1);
+            }
+            fseek(fp, 0, SEEK_END);
+            len = ftell(fp);
+            fseek(fp, 0, SEEK_SET);
+            if(sendBytes != NULL){
+                sendBytes = realloc(sendBytes, sendByteCount + len);
+            }else{
+                sendBytes = malloc(sendByteCount + len);
+            }
+            fread(sendBytes + sendByteCount, 1, len, fp);   /* would need error checking */
+            sendByteCount += len;
+            fclose(fp);
+            break;
+        case 'O':   /* -O <file> (write received data bytes to file) */
+            outputFile = optarg;
+            break;
+        case 'e':   /* -e <endpoint> (specify endpoint for some commands) */
+            endpoint = myAtoi(optarg);
+            break;
+        case 't':   /* -t <timeout> (specify USB timeout in milliseconds) */
+            usbTimeout = myAtoi(optarg);
+            break;
+        case 'b':   /* -b (binary output format, default is hex) */
+            outputFormatIsBinary = 1;
+            break;
+        case 'n':   /* -n <count> (maximum number of bytes to receive) */
+            usbCount = myAtoi(optarg);
+            break;
+        case 'c':   /* -c <configuration> (device configuration to choose) */
+            usbConfiguration = myAtoi(optarg);
+            break;
+        case 'i':   /* -i <interface> (configuration interface to claim) */
+            usbInterface = myAtoi(optarg);
+            break;
+        case 'w':   /* -w (suppress USB warnings, default is verbose) */
+            showWarnings = 0;
+            break;
+        default:
+            fprintf(stderr, "Option -%c unknown\n", opt);
+            exit(1);
+        }
+    }
+    argc -= optind;
+    argv += optind;
+    if(argc < 1){
+        usage(myName);
+        exit(1);
+    }
+    argcnt = 2;
+    if(strcasecmp(argv[0], "list") == 0){
+        action = ACTION_LIST;
+        argcnt = 1;
+    }else if(strcasecmp(argv[0], "control") == 0){
+        action = ACTION_CONTROL;
+        argcnt = 7;
+    }else if(strcasecmp(argv[0], "interrupt") == 0){
+        action = ACTION_INTERRUPT;
+    }else if(strcasecmp(argv[0], "bulk") == 0){
+        action = ACTION_BULK;
+    }else{
+        fprintf(stderr, "command %s not known\n", argv[0]);
+        usage(myName);
+        exit(1);
+    }
+    if(argc < argcnt){
+        fprintf(stderr, "Not enough arguments.\n");
+        usage(myName);
+        exit(1);
+    }
+    if(argc > argcnt){
+        fprintf(stderr, "Warning: only %d arguments expected, rest ignored.\n", argcnt);
+    }
+    usb_init();
+    if(usbOpenDevice(&handle, vendorID, vendorNamePattern, productID, productNamePattern, serialPattern, action == ACTION_LIST ? stdout : NULL, showWarnings ? stderr : NULL) != 0){
+        fprintf(stderr, "Could not find USB device with VID=0x%x PID=0x%x Vname=%s Pname=%s Serial=%s\n", vendorID, productID, vendorNamePattern, productNamePattern, serialPattern);
+        exit(1);
+    }
+    if(action == ACTION_LIST)
+        exit(0);                /* we've done what we were asked to do already */
+    usbDirection = parseEnum(argv[1], "out", "in", NULL);
+    if(usbDirection){   /* IN transfer */
+        rxBuffer = malloc(usbCount);
+    }
+    if(action == ACTION_CONTROL){
+        int requestType;
+        usbType = parseEnum(argv[2], "standard", "class", "vendor", "reserved", NULL);
+        usbRecipient = parseEnum(argv[3], "device", "interface", "endpoint", "other", NULL);
+        usbRequest = myAtoi(argv[4]);
+        usbValue = myAtoi(argv[5]);
+        usbIndex = myAtoi(argv[6]);
+        requestType = ((usbDirection & 1) << 7) | ((usbType & 3) << 5) | (usbRecipient & 0x1f);
+        if(usbDirection){   /* IN transfer */
+            len = usb_control_msg(handle, requestType, usbRequest, usbValue, usbIndex, rxBuffer, usbCount, usbTimeout);
+        }else{              /* OUT transfer */
+            len = usb_control_msg(handle, requestType, usbRequest, usbValue, usbIndex, sendBytes, sendByteCount, usbTimeout);
+        }
+    }else{  /* must be ACTION_INTERRUPT or ACTION_BULK */
+        int retries = 1;
+        if(usb_set_configuration(handle, usbConfiguration) && showWarnings){
+            fprintf(stderr, "Warning: could not set configuration: %s\n", usb_strerror());
+        }
+        /* now try to claim the interface and detach the kernel HID driver on
+         * linux and other operating systems which support the call.
+         */
+        while((len = usb_claim_interface(handle, usbInterface)) != 0 && retries-- > 0){
+#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+            if(usb_detach_kernel_driver_np(handle, 0) < 0 && showWarnings){
+                fprintf(stderr, "Warning: could not detach kernel driver: %s\n", usb_strerror());
+            }
+#endif
+        }
+        if(len != 0 && showWarnings)
+            fprintf(stderr, "Warning: could not claim interface: %s\n", usb_strerror());
+        if(action == ACTION_INTERRUPT){
+            if(usbDirection){   /* IN transfer */
+                len = usb_interrupt_read(handle, endpoint, rxBuffer, usbCount, usbTimeout);
+            }else{
+                len = usb_interrupt_write(handle, endpoint, sendBytes, sendByteCount, usbTimeout);
+            }
+        }else{
+            if(usbDirection){   /* IN transfer */
+                len = usb_bulk_read(handle, endpoint, rxBuffer, usbCount, usbTimeout);
+            }else{
+                len = usb_bulk_write(handle, endpoint, sendBytes, sendByteCount, usbTimeout);
+            }
+        }
+    }
+    if(len < 0){
+        fprintf(stderr, "USB error: %s\n", usb_strerror());
+        exit(1);
+    }
+    if(usbDirection == 0)   /* OUT */
+        printf("%d bytes sent.\n", len);
+    if(rxBuffer != NULL){
+        FILE *fp = stdout;
+        if(outputFile != NULL){
+            fp = fopen(outputFile, outputFormatIsBinary ? "wb" : "w");
+            if(fp == NULL){
+                fprintf(stderr, "Error writing \"%s\": %s\n", outputFile, strerror(errno));
+                exit(1);
+            }
+        }
+        if(outputFormatIsBinary){
+            fwrite(rxBuffer, 1, len, fp);
+        }else{
+            int i;
+            for(i = 0; i < len; i++){
+                if(i != 0){
+                    if(i % 16 == 0){
+                        fprintf(fp, "\n");
+                    }else{
+                        fprintf(fp, " ");
+                    }
+                }
+                fprintf(fp, "0x%02x", rxBuffer[i] & 0xff);
+            }
+            if(i != 0)
+                fprintf(fp, "\n");
+        }
+    }
+    usb_close(handle);
+    if(rxBuffer != NULL)
+        free(rxBuffer);
+    return 0;
+}
diff --git a/lib/vusb/libs-device/Readme.txt b/lib/vusb/libs-device/Readme.txt
new file mode 100644
index 000000000..76518dc90
--- /dev/null
+++ b/lib/vusb/libs-device/Readme.txt
@@ -0,0 +1,22 @@
+This is the Readme file for the libs-device directory. This directory contains
+code snippets which may be useful for USB device firmware.
+
+
+WHAT IS INCLUDED IN THIS DIRECTORY?
+===================================
+
+osccal.c and osccal.h
+  This module contains a function which calibrates the AVR's built-in RC
+  oscillator based on the USB frame clock. See osccal.h for a documentation
+  of the API.
+
+osctune.h
+  This header file contains a code snippet for usbconfig.h. With this code,
+  you can keep the AVR's internal RC oscillator in sync with the USB frame
+  clock. This is a continuous synchronization, not a single calibration at
+  USB reset as with osccal.c above. Please note that this code works only
+  if D- is wired to the interrupt, not D+.
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/libs-device/osccal.c b/lib/vusb/libs-device/osccal.c
new file mode 100644
index 000000000..ea170ec66
--- /dev/null
+++ b/lib/vusb/libs-device/osccal.c
@@ -0,0 +1,68 @@
+/* Name: osccal.c
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-10
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+#include <avr/io.h>
+
+#ifndef uchar
+#define uchar   unsigned char
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------ Oscillator Calibration ------------------------- */
+/* ------------------------------------------------------------------------- */
+
+/* This is a "C" implementation. You can customize it to your needs easily.
+ * If you want smaller code size, there is an improved version in the
+ * micronucleous project. See
+ * https://github.com/micronucleus/micronucleus/blob/master/firmware/osccalASM.S
+ */
+
+/* Calibrate the RC oscillator. Our timing reference is the Start Of Frame
+ * signal (a single SE0 bit) repeating every millisecond immediately after
+ * a USB RESET. We first do a binary search for the OSCCAL value and then
+ * optimize this value with a neighboorhod search.
+ */
+void    calibrateOscillator(void)
+{
+uchar       step = 128;
+uchar       trialValue = 0, optimumValue;
+int         x, optimumDev, targetValue = (unsigned)(1499 * (double)F_CPU / 10.5e6 + 0.5);
+
+    /* do a binary search: */
+    do{
+        OSCCAL = trialValue + step;
+        x = usbMeasureFrameLength();    /* proportional to current real frequency */
+        if(x < targetValue)             /* frequency still too low */
+            trialValue += step;
+        step >>= 1;
+    }while(step > 0);
+    /* We have a precision of +/- 1 for optimum OSCCAL here */
+    /* now do a neighborhood search for optimum value */
+    optimumValue = trialValue;
+    optimumDev = x; /* this is certainly far away from optimum */
+    for(OSCCAL = trialValue - 1; OSCCAL <= trialValue + 1; OSCCAL++){
+        x = usbMeasureFrameLength() - targetValue;
+        if(x < 0)
+            x = -x;
+        if(x < optimumDev){
+            optimumDev = x;
+            optimumValue = OSCCAL;
+        }
+    }
+    OSCCAL = optimumValue;
+}
+/*
+Note: This calibration algorithm may try OSCCAL values of up to 192 even if
+the optimum value is far below 192. It may therefore exceed the allowed clock
+frequency of the CPU in low voltage designs!
+You may replace this search algorithm with any other algorithm you like if
+you have additional constraints such as a maximum CPU clock.
+For version 5.x RC oscillators (those with a split range of 2x128 steps, e.g.
+ATTiny25, ATTiny45, ATTiny85), it may be useful to search for the optimum in
+both regions.
+*/
diff --git a/lib/vusb/libs-device/osccal.h b/lib/vusb/libs-device/osccal.h
new file mode 100644
index 000000000..1ed600697
--- /dev/null
+++ b/lib/vusb/libs-device/osccal.h
@@ -0,0 +1,62 @@
+/* Name: osccal.h
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-10
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+General Description:
+This module contains a function which calibrates the AVR's internal RC
+oscillator so that the CPU runs at F_CPU (F_CPU is a macro which must be
+defined when the module is compiled, best passed in the compiler command
+line). The time reference is the USB frame clock of 1 kHz available
+immediately after a USB RESET condition. Timing is done by counting CPU
+cycles, so all interrupts must be disabled while the calibration runs. For
+low level timing measurements, usbMeasureFrameLength() is called. This
+function must be enabled in usbconfig.h by defining
+USB_CFG_HAVE_MEASURE_FRAME_LENGTH to 1. It is recommended to call
+calibrateOscillator() from the reset hook in usbconfig.h:
+
+#ifndef __ASSEMBLER__
+#include <avr/interrupt.h>  // for sei()
+extern void calibrateOscillator(void);
+#endif
+#define USB_RESET_HOOK(resetStarts)  if(!resetStarts){cli(); calibrateOscillator(); sei();}
+
+This routine is an alternative to the continuous synchronization described
+in osctune.h.
+
+Algorithm used:
+calibrateOscillator() first does a binary search in the OSCCAL register for
+the best matching oscillator frequency. Then it does a next neighbor search
+to find the value with the lowest clock rate deviation. It is guaranteed to
+find the best match among neighboring values, but for version 5 oscillators
+(which have a discontinuous relationship between OSCCAL and frequency) a
+better match might be available in another OSCCAL region.
+
+Limitations:
+This calibration algorithm may try OSCCAL values of up to 192 even if the
+optimum value is far below 192. It may therefore exceed the allowed clock
+frequency of the CPU in low voltage designs!
+Precision depends on the OSCCAL vs. frequency dependency of the oscillator.
+Typical precision for an ATMega168 (derived from the OSCCAL vs. F_RC diagram
+in the data sheet) should be in the range of 0.4%. Only the 12.8 MHz and
+16.5 MHz versions of V-USB (with built-in receiver PLL) can tolerate this
+deviation! All other frequency modules require at least 0.2% precision.
+*/
+
+#ifndef __OSCCAL_H_INCLUDED__
+#define __OSCCAL_H_INCLUDED__
+
+void    calibrateOscillator(void);
+/* This function calibrates the RC oscillator so that the CPU runs at F_CPU.
+ * It MUST be called immediately after the end of a USB RESET condition!
+ * Disable all interrupts during the call!
+ * It is recommended that you store the resulting value in EEPROM so that a
+ * good guess value is available after the next reset.
+ */
+
+
+#endif /* __OSCCAL_H_INCLUDED__ */
diff --git a/lib/vusb/libs-device/osctune.h b/lib/vusb/libs-device/osctune.h
new file mode 100644
index 000000000..12961e504
--- /dev/null
+++ b/lib/vusb/libs-device/osctune.h
@@ -0,0 +1,87 @@
+/* Name: osctune.h
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-10-18
+ * Tabsize: 4
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ */
+
+/*
+General Description:
+This file is declared as C-header file although it is mostly documentation
+how the RC oscillator can be kept in sync to the USB frame rate. The code
+shown here must be added to usbconfig.h or this header file is included from
+there. This code works only if D- is wired to the interrupt, not D+!!!
+
+This is an alternative to the osccal routine in osccal.c. It has the advantage
+that the synchronization is done continuously and that it has more compact
+code size. The disadvantages are slow synchronization (it may take a while
+until the driver works), that messages immediately after the SOF pulse may be
+lost (and need to be retried by the host) and that the interrupt is on D-
+contrary to most examples.
+
+You may want to store a good calibration value in EEPROM for the next startup.
+You know that the calibration value is good when the first USB message is
+received. Do not store the value on every received message because the EEPROM
+has a limited endurance.
+
+Notes:
+(*) You must declare the global character variable "lastTimer0Value" in your
+main code.
+
+(*) Timer 0 must be free running (not written by your code) and the prescaling
+must be consistent with the TIMER0_PRESCALING define.
+
+(*) Good values for Timer 0 prescaling depend on how precise the clock must
+be tuned and how far away from the default clock rate the target clock is.
+For precise tuning, choose a low prescaler factor, for a broad range of tuning
+choose a high one. A prescaler factor of 64 is good for the entire OSCCAL
+range and allows a precision of better than +/-1%. A prescaler factor of 8
+allows tuning to slightly more than +/-6% of the default frequency and is
+more precise than one step of OSCCAL. It is therefore not suitable to tune an
+8 MHz oscillator to 12.5 MHz.
+
+Thanks to Henrik Haftmann for the idea to this routine!
+*/
+
+#define TIMER0_PRESCALING           64 /* must match the configuration for TIMER0 in main */
+#define TOLERATED_DEVIATION_PPT     5  /* max clock deviation before we tune in 1/10 % */
+/* derived constants: */
+#define EXPECTED_TIMER0_INCREMENT   ((F_CPU / (1000 * TIMER0_PRESCALING)) & 0xff)
+#define TOLERATED_DEVIATION         (TOLERATED_DEVIATION_PPT * F_CPU / (1000000 * TIMER0_PRESCALING))
+
+#ifdef __ASSEMBLER__
+macro tuneOsccal
+    push    YH                              ;[0]
+    in      YL, TCNT0                       ;[2]
+    lds     YH, lastTimer0Value             ;[3]
+    sts     lastTimer0Value, YL             ;[5]
+    sub     YL, YH                          ;[7] time passed since last frame
+    subi    YL, EXPECTED_TIMER0_INCREMENT   ;[8]
+#if OSCCAL > 0x3f   /* outside I/O addressable range */
+    lds     YH, OSCCAL                      ;[6]
+#else
+    in      YH, OSCCAL                      ;[6] assembler modle uses __SFR_OFFSET == 0
+#endif
+    cpi     YL, TOLERATED_DEVIATION + 1     ;[10]
+    brmi    notTooHigh                      ;[11]
+    subi    YH, 1                           ;[12] clock rate was too high
+;   brcs    tuningOverflow                  ; optionally check for overflow
+    rjmp    osctuneDone                     ;[13]
+notTooHigh:
+    cpi     YL, -TOLERATED_DEVIATION        ;[13]
+    brpl    osctuneDone                     ;[14] not too low
+    inc     YH                              ;[15] clock rate was too low
+;   breq    tuningOverflow                  ; optionally check for overflow
+osctuneDone:
+#if OSCCAL > 0x3f   /* outside I/O addressable range */
+    sts     OSCCAL, YH                      ;[12-13] store tuned value
+#else
+    out     OSCCAL, YH                      ;[12-13] store tuned value
+#endif
+tuningOverflow:
+    pop     YH                              ;[17]
+    endm                                    ;[19] max number of cycles
+#endif
+
+#define USB_SOF_HOOK        tuneOsccal
diff --git a/lib/vusb/libs-host/Readme.txt b/lib/vusb/libs-host/Readme.txt
new file mode 100644
index 000000000..5117d18f7
--- /dev/null
+++ b/lib/vusb/libs-host/Readme.txt
@@ -0,0 +1,26 @@
+This is the Readme file for the libs-host directory. This directory contains
+code snippets which may be useful for host side USB software.
+
+
+WHAT IS INCLUDED IN THIS DIRECTORY?
+===================================
+
+opendevice.c and opendevice.h
+  This module contains a function to find and open a device given its
+  numeric IDs (VID, PID), names (vendor name and product name) and serial
+  number. It is based on libusb/libusb-win32 and returns a libusb device
+  handle. See opendevice.h for an API documentation.
+
+hiddata.c and hiddata.h
+  This module contains functions for data transfer over HID feature reports.
+  It is based on libusb on Unix and native Windows functions on Windows. No
+  driver DLL is needed on Windows. See hiddata.h for an API documentation.
+
+hidsdi.h
+  This DDK header file is missing in the free MinGW version of the Windows
+  DDK. Use this version if you get an "include file not found" error.
+
+
+----------------------------------------------------------------------------
+(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+http://www.obdev.at/
diff --git a/lib/vusb/libs-host/hiddata.c b/lib/vusb/libs-host/hiddata.c
new file mode 100644
index 000000000..203ed19d6
--- /dev/null
+++ b/lib/vusb/libs-host/hiddata.c
@@ -0,0 +1,323 @@
+/* Name: hiddata.c
+ * Author: Christian Starkjohann
+ * Creation Date: 2008-04-11
+ * Tabsize: 4