- great renaming: project is now renamed from AVR-USB to V-USB

31 files changed, 111 insertions, 98 deletions

diff --git a/Readme.txt b/Readme.txt
index f72a0bc..4aef36d 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -1,6 +1,6 @@
-This is the Readme file to Objective Development's firmware-only USB driver
-for Atmel AVR microcontrollers and related code. For more information please
-visit http://www.obdev.at/avrusb/.
+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/.
 
 
 WHAT IS INCLUDED IN THIS PACKAGE?
@@ -9,10 +9,10 @@ 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 .................. AVR-USB firmware, to be included in your project.
+  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 device drivers.
+  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).
@@ -25,10 +25,10 @@ contents.
 
 PREREQUISITES
 =============
-The AVR code of AVR-USB is written in C and assembler. You need either
+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 AVR-USB. Not every release is tested with
+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.
 
@@ -55,12 +55,12 @@ 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=avrusb-wiki.
+http://www.obdev.at/goto.php?t=vusb-wiki.
 
 
 LICENSE
 =======
-AVR-USB and related code is distributed under the terms of the GNU General
+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
@@ -72,5 +72,5 @@ GPL. See CommercialLicense.txt for details.
 
 
 ----------------------------------------------------------------------------
-(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+(c) 2009 by OBJECTIVE DEVELOPMENT Software GmbH.
 http://www.obdev.at/
diff --git a/circuits/Readme.txt b/circuits/Readme.txt
index 427241b..1aa5218 100644
--- a/circuits/Readme.txt
+++ b/circuits/Readme.txt
@@ -1,4 +1,4 @@
-This is the Readme file for the AVR-USB example circuits directory.
+This is the Readme file for the V-USB example circuits directory.
 
 
 CIRCUITS IN THIS DIRECTORY
diff --git a/examples/Readme.txt b/examples/Readme.txt
index 2e2f92f..82b10fe 100644
--- a/examples/Readme.txt
+++ b/examples/Readme.txt
@@ -1,4 +1,4 @@
-This is the Readme file for the directory "examples" of AVR-USB, a firmware-
+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?
@@ -60,14 +60,14 @@ 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/avrusb/projects.html. Most of these
+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=avrusb-wiki.
+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 AVR-USB have been designed to cope
+  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
@@ -75,7 +75,7 @@ Using RC oscillator for system clock
 
 Dynamically generated descriptors
   Sometimes you want to implement different typtes of USB device depending
-  on a jumper or other condition. AVR-USB has a very flexible interface for
+  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.
 
@@ -86,17 +86,17 @@ Virtual COM port
   see AVR-CDC.
 
 Implementing suspend mode
-  AVR-USB does not implement suspend mode. This means that the device does
+  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/avrusb/prjall.html
+    http://www.obdev.at/vusb/prjall.html
 
 where all projects are listed.
 
 ----------------------------------------------------------------------------
-(c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH.
+(c) 2009 by OBJECTIVE DEVELOPMENT Software GmbH.
 http://www.obdev.at/
diff --git a/examples/drivertest/firmware/usbconfig.h b/examples/drivertest/firmware/usbconfig.h
index 1198b46..a46ac37 100644
--- a/examples/drivertest/firmware/usbconfig.h
+++ b/examples/drivertest/firmware/usbconfig.h
@@ -1,5 +1,5 @@
 /* Name: usbconfig.h
- * Project: AVR USB driver
+ * Project: V-USB for AVR(r) Microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2005-04-01
  * Tabsize: 4
@@ -14,7 +14,7 @@
 /*
 General Description:
 This file is an example configuration (with inline documentation) for the USB
-driver. It configures AVR-USB for USB D+ connected to Port D bit 2 (which is
+driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is
 also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may
 wire the lines to any other port, as long as D+ is also wired to INT0 (or any
 other hardware interrupt, as long as it is the highest level interrupt, see
diff --git a/examples/usbtool/usbtool.c b/examples/usbtool/usbtool.c
index 173f491..d9b1b3e 100644
--- a/examples/usbtool/usbtool.c
+++ b/examples/usbtool/usbtool.c
@@ -1,5 +1,5 @@
 /* Name: usbtool.c
- * Project: AVR-USB examples, host side
+ * Project: V-USB examples, host side
  * Author: Christian Starkjohann
  * Creation Date: 2008-04-06
  * Tabsize: 4
diff --git a/libs-device/osccal.h b/libs-device/osccal.h
index f51580b..fd28efa 100644
--- a/libs-device/osccal.h
+++ b/libs-device/osccal.h
@@ -44,7 +44,7 @@ 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 AVR-USB (with built-in receiver PLL) can tolerate this
+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.
 */
 
diff --git a/libs-host/opendevice.c b/libs-host/opendevice.c
index 0cfdbe2..f088e43 100644
--- a/libs-host/opendevice.c
+++ b/libs-host/opendevice.c
@@ -1,5 +1,5 @@
 /* Name: opendevice.c
- * Project: AVR-USB host-side library
+ * Project: V-USB host-side library
  * Author: Christian Starkjohann
  * Creation Date: 2008-04-10
  * Tabsize: 4
diff --git a/libs-host/opendevice.h b/libs-host/opendevice.h
index 2311f54..df70a50 100644
--- a/libs-host/opendevice.h
+++ b/libs-host/opendevice.h
@@ -1,5 +1,5 @@
 /* Name: opendevice.h
- * Project: AVR-USB host-side library
+ * Project: V-USB host-side library
  * Author: Christian Starkjohann
  * Creation Date: 2008-04-10
  * Tabsize: 4
diff --git a/mkdist.sh b/mkdist.sh
index 92dc09d..388b826 100755
--- a/mkdist.sh
+++ b/mkdist.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Name: mkdist.sh
-# Project: avr-usb
+# Project: v-usb
 # Author: Christian Starkjohann
 # Creation Date: 2008-04-18
 # Tabsize: 4
@@ -12,7 +12,7 @@
 # The "open" command is specific to Mac OS X and is used to start GUI
 # applications or open files and directories.
 
-name=avrusb
+name=vusb
 
 PATH="$PATH:/usr/local/EAGLE/bin"
 eagle=eagle
diff --git a/tests/Readme.txt b/tests/Readme.txt
index f9fdeda..3f0d36d 100644
--- a/tests/Readme.txt
+++ b/tests/Readme.txt
@@ -1,4 +1,4 @@
-This is the Readme file for the directory "tests" of AVR-USB, a firmware-only
+This is the Readme file for the directory "tests" of V-USB, a firmware-only
 USB driver for AVR microcontrollers.
 
 WHAT IS IN THIS DIRECTORY?
diff --git a/tests/compare-sizes.awk b/tests/compare-sizes.awk
index 659599e..8135729 100755
--- a/tests/compare-sizes.awk
+++ b/tests/compare-sizes.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 # Name: compare-sizes.awk
-# Project: avr-usb
+# Project: v-usb
 # Author: Christian Starkjohann
 # Creation Date: 2008-04-29
 # Tabsize: 4
diff --git a/tests/usbconfig.h b/tests/usbconfig.h
index b585c2f..b5293cb 100644
--- a/tests/usbconfig.h
+++ b/tests/usbconfig.h
@@ -1,5 +1,5 @@
 /* Name: usbconfig.h
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2005-04-01
  * Tabsize: 4
@@ -14,7 +14,7 @@
 /*
 General Description:
 This file is an example configuration (with inline documentation) for the USB
-driver. It configures AVR-USB for USB D+ connected to Port D bit 2 (which is
+driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is
 also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may
 wire the lines to any other port, as long as D+ is also wired to INT0 (or any
 other hardware interrupt, as long as it is the highest level interrupt, see
diff --git a/usbdrv/Changelog.txt b/usbdrv/Changelog.txt
index c07bca9..d7a2fbe 100644
--- a/usbdrv/Changelog.txt
+++ b/usbdrv/Changelog.txt
@@ -268,3 +268,7 @@ Scroll down to the bottom to see the most recent changes.
   - Integrated a module with CRC checks at 18 MHz by Lukas Schrittwieser.
 
 * Release 2009-03-23
+
+  - Renamed project to V-USB due to a trademark issue with Atmel(r).
+  - Changed CommercialLicense.txt and USBID-License.txt to make the
+    background of USB ID registration clearer.
diff --git a/usbdrv/CommercialLicense.txt b/usbdrv/CommercialLicense.txt
index 6d8bf39..33c9311 100644
--- a/usbdrv/CommercialLicense.txt
+++ b/usbdrv/CommercialLicense.txt
@@ -1,5 +1,5 @@
-AVR-USB Driver Software License Agreement
-Version 2008-10-07
+V-USB Driver Software License Agreement
+Version 2009-04-14
 
 THIS LICENSE AGREEMENT GRANTS YOU CERTAIN RIGHTS IN A SOFTWARE. YOU CAN
 ENTER INTO THIS AGREEMENT AND ACQUIRE THE RIGHTS OUTLINED BELOW BY PAYING
@@ -13,8 +13,8 @@ Grosse Schiffgasse 1A/7, 1020 Wien, AUSTRIA.
 
 1.2 "You" shall mean the Licensee.
 
-1.3 "AVR-USB" shall mean all files included in the package distributed under
-the name "avrusb" by OBJECTIVE DEVELOPMENT (http://www.obdev.at/avrusb/)
+1.3 "V-USB" shall mean all files included in the package distributed under
+the name "vusb" by OBJECTIVE DEVELOPMENT (http://www.obdev.at/vusb/)
 unless otherwise noted. This includes the firmware-only USB device
 implementation for Atmel AVR microcontrollers, some simple device examples
 and host side software examples and libraries.
@@ -23,21 +23,22 @@ and host side software examples and libraries.
 2 LICENSE GRANTS
 
 2.1 Source Code. OBJECTIVE DEVELOPMENT shall furnish you with the source
-code of AVR-USB.
+code of V-USB.
 
 2.2 Distribution and Use. OBJECTIVE DEVELOPMENT grants you the
-non-exclusive right to use, copy and distribute AVR-USB with your hardware
+non-exclusive right to use, copy and distribute V-USB with your hardware
 product(s), restricted by the limitations in section 3 below.
 
 2.3 Modifications. OBJECTIVE DEVELOPMENT grants you the right to modify
-the source code and your copy of AVR-USB according to your needs.
+the source code and your copy of V-USB according to your needs.
 
-2.4 USB IDs. OBJECTIVE DEVELOPMENT grants you the exclusive rights to use
-USB Product ID(s) sent to you in e-mail after receiving your payment in
-conjunction with USB Vendor ID 5824. OBJECTIVE DEVELOPMENT has acquired an
-exclusive license for this pair of USB identifiers from Wouter van Ooijen
-(www.voti.nl), who has licensed the VID from the USB Implementers Forum,
-Inc. (www.usb.org).
+2.4 USB IDs. OBJECTIVE DEVELOPMENT furnishes you with one or two USB Product
+ID(s), sent to you in e-mail. These Product IDs are reserved exclusively for
+you. They have been obtained from Wouter van Ooijen (www.voti.nl), who has
+reserved the Vendor ID 5824 (decimal) at the USB Implementers Forum, Inc.
+(www.usb.org). This mechanism ensures that there are no Product ID conflicts,
+but you cannot become USB certified (enter into the USB-IF Trademark License
+Agreement) as you would need your own Vendor ID for that.
 
 
 3 LICENSE RESTRICTIONS
@@ -46,21 +47,21 @@ Inc. (www.usb.org).
 applicable. Which one is determined by the amount you pay to OBJECTIVE
 DEVELOPMENT, see section 4 ("Payment") below.
 
-Hobby License: You may use AVR-USB according to section 2 above in no more
+Hobby License: You may use V-USB according to section 2 above in no more
 than 5 hardware units. These units must not be sold for profit.
 
-Entry Level License: You may use AVR-USB according to section 2 above in no
+Entry Level License: You may use V-USB according to section 2 above in no
 more than 150 hardware units.
 
-Professional License: You may use AVR-USB according to section 2 above in
+Professional License: You may use V-USB according to section 2 above in
 any number of hardware units, except for large scale production ("unlimited
 fair use"). Quantities below 10,000 units are not considered large scale
 production. If your reach quantities which are obviously large scale
 production, you must pay a license fee of 0.10 EUR per unit for all units
 above 10,000.
 
-3.2 Rental. You may not rent, lease, or lend AVR-USB or otherwise encumber
-any copy of AVR-USB, or any of the rights granted herein.
+3.2 Rental. You may not rent, lease, or lend V-USB or otherwise encumber
+any copy of V-USB, or any of the rights granted herein.
 
 3.3 Transfer. You may not transfer your rights under this Agreement to
 another party without OBJECTIVE DEVELOPMENT's prior written consent. If
@@ -78,7 +79,7 @@ non-exclusive.
 by third parties. In particular, you are not allowed to use the USB logo or
 other trademarks owned by the USB Implementers Forum, Inc. without their
 consent. Since such consent depends on USB certification, it should be
-noted that AVR-USB will not pass certification because it does not
+noted that V-USB will not pass certification because it does not
 implement checksum verification and the microcontroller ports do not meet
 the electrical specifications.
 
@@ -88,15 +89,15 @@ the electrical specifications.
 The payment amount depends on the variation of this agreement (according to
 section 3.1) into which you want to enter. Concrete prices are listed on
 OBJECTIVE DEVELOPMENT's web site, usually at
-http://www.obdev.at/avrusb/license.html. You agree to pay the amount listed
+http://www.obdev.at/vusb/license.html. You agree to pay the amount listed
 there to OBJECTIVE DEVELOPMENT or OBJECTIVE DEVELOPMENT's payment processor
 or reseller.
 
 
 5 COPYRIGHT AND OWNERSHIP
 
-AVR-USB is protected by copyright laws and international copyright
-treaties, as well as other intellectual property laws and treaties. AVR-USB
+V-USB is protected by copyright laws and international copyright
+treaties, as well as other intellectual property laws and treaties. V-USB
 is licensed, not sold.
 
 
@@ -112,12 +113,12 @@ and limitation of liability shall survive termination of this agreement.
 
 7 DISCLAIMER OF WARRANTY AND LIABILITY
 
-LIMITED WARRANTY. AVR-USB IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+LIMITED WARRANTY. V-USB IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
 KIND. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, OBJECTIVE
 DEVELOPMENT AND ITS SUPPLIERS HEREBY DISCLAIM ALL WARRANTIES, EITHER
 EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND
-NON-INFRINGEMENT, WITH REGARD TO AVR-USB, AND THE PROVISION OF OR FAILURE
+NON-INFRINGEMENT, WITH REGARD TO V-USB, AND THE PROVISION OF OR FAILURE
 TO PROVIDE SUPPORT SERVICES. THIS LIMITED WARRANTY GIVES YOU SPECIFIC LEGAL
 RIGHTS. YOU MAY HAVE OTHERS, WHICH VARY FROM STATE/JURISDICTION TO
 STATE/JURISDICTION.
@@ -127,11 +128,11 @@ IN NO EVENT SHALL OBJECTIVE DEVELOPMENT OR ITS SUPPLIERS BE LIABLE FOR ANY
 SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER
 (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS,
 BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY
-LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE AVR-USB OR THE
+LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE V-USB OR THE
 PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES, EVEN IF OBJECTIVE
 DEVELOPMENT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ANY
 CASE, OBJECTIVE DEVELOPMENT'S ENTIRE LIABILITY UNDER ANY PROVISION OF THIS
-AGREEMENT SHALL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY YOU FOR AVR-USB.
+AGREEMENT SHALL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY YOU FOR V-USB.
 
 
 8 MISCELLANEOUS TERMS
diff --git a/usbdrv/License.txt b/usbdrv/License.txt
index e9b2752..4460cfb 100644
--- a/usbdrv/License.txt
+++ b/usbdrv/License.txt
@@ -1,18 +1,18 @@
-OBJECTIVE DEVELOPMENT GmbH's AVR-USB driver software is distributed under the
+OBJECTIVE DEVELOPMENT GmbH's V-USB driver software is distributed under the
 terms and conditions of the GNU GPL version 2 or the GNU GPL version 3. It is
 your choice whether you apply the terms of version 2 or version 3. The full
 text of GPLv2 is included below. In addition to the requirements in the GPL,
 we STRONGLY ENCOURAGE you to do the following:
 
 (1) Publish your entire project on a web site and drop us a note with the URL.
-Use the form at http://www.obdev.at/avrusb/feedback.html for your submission.
+Use the form at http://www.obdev.at/vusb/feedback.html for your submission.
 
 (2) Adhere to minimum publication standards. Please include AT LEAST:
     - a circuit diagram in PDF, PNG or GIF format
     - full source code for the host software
     - a Readme.txt file in ASCII format which describes the purpose of the
       project and what can be found in which directories and which files
-    - a reference to http://www.obdev.at/avrusb/
+    - a reference to http://www.obdev.at/vusb/
 
 (3) If you improve the driver firmware itself, please give us a free license
 to your modifications for our commercial license offerings.
diff --git a/usbdrv/Readme.txt b/usbdrv/Readme.txt
index a7aad3e..aade7c0 100644
--- a/usbdrv/Readme.txt
+++ b/usbdrv/Readme.txt
@@ -1,6 +1,6 @@
 This is the Readme file to Objective Development's firmware-only USB driver
 for Atmel AVR microcontrollers. For more information please visit
-http://www.obdev.at/avrusb/
+http://www.obdev.at/vusb/
 
 This directory contains the USB firmware only. Copy it as-is to your own
 project and add all .c and .S files to your project (these files are marked
@@ -53,7 +53,7 @@ actual clock rate must be configured in usbdrv.h unless you use the default
 12 MHz.
 
 12 MHz Clock
-This is the traditional clock rate of AVR-USB because it's the lowest clock
+This is the traditional clock rate of V-USB because it's the lowest clock
 rate where the timing constraints of the USB spec can be met.
 
 15 MHz Clock
@@ -78,7 +78,7 @@ oscillator can reach 16.5 MHz with the RC oscillator. This includes the very
 popular ATTiny25, ATTiny45, ATTiny85 series as well as the ATTiny26. Almost
 all AVRs can reach 12.8 MHz, although this is outside the specified range.
 
-See the EasyLogger example at http://www.obdev.at/avrusb/easylogger.html for
+See the EasyLogger example at http://www.obdev.at/vusb/easylogger.html for
 code which calibrates the RC oscillator based on the USB frame clock.
 
 18 MHz Clock
@@ -108,14 +108,14 @@ and hobbyists, we provide some VID/PID pairs for free. See the file
 USBID-License.txt for details.
 
 Objective Development also has some license offerings which include product
-IDs. See http://www.obdev.at/avrusb/ for details.
+IDs. See http://www.obdev.at/vusb/ for details.
 
 
 DEVELOPMENT SYSTEM
 ==================
 This driver has been developed and optimized for the GNU compiler version 3
 (gcc 3). It does work well with gcc 4, but with bigger code size. We recommend
-that you use the GNU compiler suite because it is freely available. AVR-USB
+that you use the GNU compiler suite because it is freely available. V-USB
 has also been ported to the IAR compiler and assembler. It has been tested
 with IAR 4.10B/W32 and 4.12A/W32 on an ATmega8 with the "small" and "tiny"
 memory model. Not every release is tested with IAR CC and the driver may
@@ -123,8 +123,8 @@ therefore fail to compile with IAR. Please note that gcc is more efficient for
 usbdrv.c because this module has been deliberately optimized for gcc.
 
 
-USING AVR-USB FOR FREE
-======================
+USING V-USB FOR FREE
+====================
 The AVR firmware driver is published under the GNU General Public License
 Version 2 (GPL2) and the GNU General Public License Version 3 (GPL3). It is
 your choice whether you apply the terms of version 2 or version 3.
@@ -133,26 +133,26 @@ If you decide for the free GPL2 or GPL3, we STRONGLY ENCOURAGE you to do the
 following things IN ADDITION to the obligations from the GPL:
 
 (1) Publish your entire project on a web site and drop us a note with the URL.
-Use the form at http://www.obdev.at/avrusb/feedback.html for your submission.
+Use the form at http://www.obdev.at/vusb/feedback.html for your submission.
 If you don't have a web site, you can publish the project in obdev's
 documentation wiki at
-http://www.obdev.at/goto.php?t=avrusb-wiki&p=hosted-projects.
+http://www.obdev.at/goto.php?t=vusb-wiki&p=hosted-projects.
 
 (2) Adhere to minimum publication standards. Please include AT LEAST:
     - a circuit diagram in PDF, PNG or GIF format
     - full source code for the host software
     - a Readme.txt file in ASCII format which describes the purpose of the
       project and what can be found in which directories and which files
-    - a reference to http://www.obdev.at/avrusb/
+    - a reference to http://www.obdev.at/vusb/
 
 (3) If you improve the driver firmware itself, please give us a free license
 to your modifications for our commercial license offerings.
 
 
-COMMERCIAL LICENSES FOR AVR-USB
-===============================
+COMMERCIAL LICENSES FOR V-USB
+=============================
 If you don't want to publish your source code under the terms of the GPL,
-you can simply pay money for AVR-USB. As an additional benefit you get
-USB PIDs for free, licensed exclusively to you. See the file
+you can simply pay money for V-USB. As an additional benefit you get
+USB PIDs for free, reserved exclusively to you. See the file
 "CommercialLicense.txt" for details.
 
diff --git a/usbdrv/USBID-License.txt b/usbdrv/USBID-License.txt
index 984c9ee..c40be92 100644
--- a/usbdrv/USBID-License.txt
+++ b/usbdrv/USBID-License.txt
@@ -1,10 +1,17 @@
-Royalty-Free Non-Exclusive License USB Product-ID
+Royalty-Free Non-Exclusive Use of USB Product-IDs
 =================================================
 
-Version 2008-04-07
+Version 2009-04-13
+
+Strictly speaking, this is not a license. You can't give a license to use
+a simple number (such as e.g. 1500) for any purpose. This is a set of rules
+which should make it possible to build USB devices without the requirement
+for individual USB IDs. If you break one of the rules, you will run into
+technical problems sooner or later, but you don't risk legal trouble.
+
 
 OBJECTIVE DEVELOPMENT Software GmbH hereby grants you the non-exclusive
-right to use three USB.org vendor-ID (VID) / product-ID (PID) pairs with
+right to use four USB.org vendor-ID (VID) / product-ID (PID) pairs with
 products based on Objective Development's firmware-only USB driver for
 Atmel AVR microcontrollers:
 
@@ -27,10 +34,11 @@ used by many companies and individuals for different products. To avoid
 conflicts, your device and host driver software MUST adhere to the rules
 outlined below.
 
-OBJECTIVE DEVELOPMENT Software GmbH has licensed these VID/PID pairs from
-Wouter van Ooijen (see www.voti.nl), who has licensed the VID from the USB
-Implementers Forum, Inc. (see www.usb.org). The VID is registered for the
-company name "Van Ooijen Technische Informatica".
+OBJECTIVE DEVELOPMENT Software GmbH has obtained these VID/PID pairs from
+Wouter van Ooijen (see www.voti.nl) for exclusive disposition. Wouter van
+Ooijen has obtained the VID from the USB Implementers Forum, Inc.
+(see www.usb.org). The VID is registered for the company name
+"Van Ooijen Technische Informatica".
 
 
 RULES AND RESTRICTIONS
@@ -44,7 +52,7 @@ MUST be available at least in USB language 0x0409 (English/US).
 domain name (e.g. "mycompany.com") registered and owned by you, or an
 e-mail address under your control (e.g. "myname@gmx.net"). You can embed
 the domain name or e-mail address in any string you like, e.g.  "Objective
-Development http://www.obdev.at/avrusb/".
+Development http://www.obdev.at/vusb/".
 
 (3) You are responsible for retaining ownership of the domain or e-mail
 address for as long as any of your products are in use.
@@ -142,5 +150,5 @@ violates the USB specification. If you do it, you do it at your own risk.
 
 To avoid possible incompatibilities, we highly recommend that you get your
 own VID/PID pair if you intend to sell your product. Objective
-Development's commercial licenses for AVR-USB include a PID for
+Development's commercial licenses for V-USB include a PID for
 unrestricted exclusive use.
diff --git a/usbdrv/asmcommon.inc b/usbdrv/asmcommon.inc
index 457de3b..07d692b 100644
--- a/usbdrv/asmcommon.inc
+++ b/usbdrv/asmcommon.inc
@@ -1,5 +1,5 @@
 /* Name: asmcommon.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2007-11-05
  * Tabsize: 4
diff --git a/usbdrv/usbconfig-prototype.h b/usbdrv/usbconfig-prototype.h
index a759e81..812f83b 100644
--- a/usbdrv/usbconfig-prototype.h
+++ b/usbdrv/usbconfig-prototype.h
@@ -1,5 +1,5 @@
 /* Name: usbconfig.h
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2005-04-01
  * Tabsize: 4
@@ -14,7 +14,7 @@
 /*
 General Description:
 This file is an example configuration (with inline documentation) for the USB
-driver. It configures AVR-USB for USB D+ connected to Port D bit 2 (which is
+driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is
 also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may
 wire the lines to any other port, as long as D+ is also wired to INT0 (or any
 other hardware interrupt, as long as it is the highest level interrupt, see
diff --git a/usbdrv/usbdrv.c b/usbdrv/usbdrv.c
index 35e084b..cd2ce62 100644
--- a/usbdrv/usbdrv.c
+++ b/usbdrv/usbdrv.c
@@ -1,5 +1,5 @@
 /* Name: usbdrv.c
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2004-12-29
  * Tabsize: 4
diff --git a/usbdrv/usbdrv.h b/usbdrv/usbdrv.h
index 2d948bd..61780ca 100644
--- a/usbdrv/usbdrv.h
+++ b/usbdrv/usbdrv.h
@@ -1,5 +1,5 @@
 /* Name: usbdrv.h
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2004-12-29
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm.S b/usbdrv/usbdrvasm.S
index 851a9be..46d27e2 100644
--- a/usbdrv/usbdrvasm.S
+++ b/usbdrv/usbdrvasm.S
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm.S
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2007-06-13
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm.asm b/usbdrv/usbdrvasm.asm
index a534b73..9cc4e4d 100644
--- a/usbdrv/usbdrvasm.asm
+++ b/usbdrv/usbdrvasm.asm
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm.asm
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2006-03-01
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm12.inc b/usbdrv/usbdrvasm12.inc
index 2b38157..cb74ceb 100644
--- a/usbdrv/usbdrvasm12.inc
+++ b/usbdrv/usbdrvasm12.inc
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm12.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2004-12-29
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm128.inc b/usbdrv/usbdrvasm128.inc
index 23b1f99..c98d363 100644
--- a/usbdrv/usbdrvasm128.inc
+++ b/usbdrv/usbdrvasm128.inc
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm128.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2008-10-11
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm15.inc b/usbdrv/usbdrvasm15.inc
index 1e9ddcb..ce10391 100644
--- a/usbdrv/usbdrvasm15.inc
+++ b/usbdrv/usbdrvasm15.inc
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm15.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: contributed by V. Bosch
  * Creation Date: 2007-08-06
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm16.inc b/usbdrv/usbdrvasm16.inc
index e4a0226..2430170 100644
--- a/usbdrv/usbdrvasm16.inc
+++ b/usbdrv/usbdrvasm16.inc
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm16.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2007-06-15
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm165.inc b/usbdrv/usbdrvasm165.inc
index fdf3a2a..d8a95ba 100644
--- a/usbdrv/usbdrvasm165.inc
+++ b/usbdrv/usbdrvasm165.inc
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm165.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2007-04-22
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm18-crc.inc b/usbdrv/usbdrvasm18-crc.inc
index 9c9bffd..dde09da 100644
--- a/usbdrv/usbdrvasm18-crc.inc
+++ b/usbdrv/usbdrvasm18-crc.inc
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm18.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Lukas Schrittwieser (based on 20 MHz usbdrvasm20.inc by Jeroen Benschop)
  * Creation Date: 2009-01-20
  * Tabsize: 4
diff --git a/usbdrv/usbdrvasm20.inc b/usbdrv/usbdrvasm20.inc
index 8f07d3c..0c74679 100644
--- a/usbdrv/usbdrvasm20.inc
+++ b/usbdrv/usbdrvasm20.inc
@@ -1,5 +1,5 @@
 /* Name: usbdrvasm20.inc
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Jeroen Benschop
  * Based on usbdrvasm16.inc from Christian Starkjohann
  * Creation Date: 2008-03-05
diff --git a/usbdrv/usbportability.h b/usbdrv/usbportability.h
index 3a28ccb..62a35d9 100644
--- a/usbdrv/usbportability.h
+++ b/usbdrv/usbportability.h
@@ -1,5 +1,5 @@
 /* Name: usbportability.h
- * Project: AVR USB driver
+ * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
  * Author: Christian Starkjohann
  * Creation Date: 2008-06-17
  * Tabsize: 4