aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Starkjohann <cs+github@obdev.at>2009-08-03 17:01:21 +0000
committerChristian Starkjohann <cs+github@obdev.at>2009-08-03 17:01:21 +0000
commit32952d16b7f7681ca237b547b70df37ed825f01a (patch)
tree91457f8b2c365168b59cde8c6e34081d33ac5935
parentb6739c29d91ae840befd6f461699286d5ee04865 (diff)
downloadv-usb-32952d16b7f7681ca237b547b70df37ed825f01a.tar.gz
v-usb-32952d16b7f7681ca237b547b70df37ed825f01a.tar.bz2
v-usb-32952d16b7f7681ca237b547b70df37ed825f01a.zip
- reworked USBID-License into USB-IDs-for-free.txt and USB-ID-FAQ.txt
-rw-r--r--Readme.txt3
-rw-r--r--examples/drivertest/firmware/usbconfig.h10
-rw-r--r--libs-host/opendevice.h2
-rwxr-xr-xmkdist.sh2
-rw-r--r--tests/usbconfig.h10
-rw-r--r--usbdrv/Changelog.txt5
-rw-r--r--usbdrv/CommercialLicense.txt19
-rw-r--r--usbdrv/Readme.txt6
-rw-r--r--usbdrv/USB-ID-FAQ.txt79
-rw-r--r--usbdrv/USB-IDs-for-free.txt107
-rw-r--r--usbdrv/usbconfig-prototype.h10
-rw-r--r--usbdrv/usbdrv.h2
12 files changed, 227 insertions, 28 deletions
diff --git a/Readme.txt b/Readme.txt
index 1ba2a43..87632ee 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -20,7 +20,8 @@ for device and host and fully working examples for device and host:
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.
- USBID-License.txt ....... Terms and conditions for free USB VID/PID pairs.
+ 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.
diff --git a/examples/drivertest/firmware/usbconfig.h b/examples/drivertest/firmware/usbconfig.h
index a46ac37..0e2e25a 100644
--- a/examples/drivertest/firmware/usbconfig.h
+++ b/examples/drivertest/firmware/usbconfig.h
@@ -230,14 +230,14 @@ tuningOverflow:
#define USB_CFG_VENDOR_ID 0xc0, 0x16
/* USB vendor ID for the device, low byte first. If you have registered your
* own Vendor ID, define it here. Otherwise you use one of obdev's free shared
- * VID/PID pairs. Be sure to read USBID-License.txt for rules!
+ * VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
*/
#define USB_CFG_DEVICE_ID 0xdc, 0x05
/* This is the ID of the product, low byte first. It is interpreted in the
* scope of the vendor ID. If you have registered your own VID with usb.org
* or if you have licensed a PID from somebody else, define it here. Otherwise
* you use obdev's free shared VID/PID pair. Be sure to read the rules in
- * USBID-License.txt!
+ * USB-IDs-for-free.txt!
*/
#define USB_CFG_DEVICE_VERSION 0x00, 0x01
/* Version number of the device: Minor number first, then major number.
@@ -249,14 +249,14 @@ tuningOverflow:
* are interpreted as Unicode (UTF-16) entities.
* If you don't want a vendor name string, undefine these macros.
* ALWAYS define a vendor name containing your Internet domain name if you use
- * obdev's free shared VID/PID pair. See the file USBID-License.txt for
+ * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for
* details.
*/
#define USB_CFG_DEVICE_NAME 'T', 'e', 's', 't'
#define USB_CFG_DEVICE_NAME_LEN 4
/* Same as above for the device name. If you don't want a device name, undefine
- * the macros. See the file USBID-License.txt before you assign a name if you
- * use a shared VID/PID.
+ * the macros. See the file USB-IDs-for-free.txt before you assign a name if
+ * you use a shared VID/PID.
*/
/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */
/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */
diff --git a/libs-host/opendevice.h b/libs-host/opendevice.h
index df70a50..6440cb3 100644
--- a/libs-host/opendevice.h
+++ b/libs-host/opendevice.h
@@ -66,7 +66,7 @@ int usbOpenDevice(usb_dev_handle **device, int vendorID, char *vendorNamePattern
#define USBOPEN_ERR_NOTFOUND 3 /* device not found */
-/* Obdev's free USB IDs, see USBID-License.txt for details */
+/* Obdev's free USB IDs, see USB-IDs-for-free.txt for details */
#define USB_VID_OBDEV_SHARED 5824 /* obdev's shared vendor ID */
#define USB_PID_OBDEV_SHARED_CUSTOM 1500 /* shared PID for custom class devices */
diff --git a/mkdist.sh b/mkdist.sh
index 388b826..987b7c0 100755
--- a/mkdist.sh
+++ b/mkdist.sh
@@ -134,7 +134,7 @@ find . -name 'make-files.sh' -exec rm '{}' \; # remove helper scripts
rm -f mkdist.sh make-files.sh
(
cd usbdrv
- cp Changelog.txt License.txt CommercialLicense.txt USBID-License.txt ..
+ cp Changelog.txt License.txt CommercialLicense.txt USB-IDs-for-free.txt USB-ID-FAQ.txt ..
)
cd ..
echo "Creating /tmp/$pkgname.zip and /tmp/$pkgname.tar.gz"
diff --git a/tests/usbconfig.h b/tests/usbconfig.h
index d7f0215..857d7a4 100644
--- a/tests/usbconfig.h
+++ b/tests/usbconfig.h
@@ -145,14 +145,14 @@ features. Don't use it as a prototype, use usbconfig-prototype.h instead!
#define USB_CFG_VENDOR_ID 0xc0, 0x16
/* USB vendor ID for the device, low byte first. If you have registered your
* own Vendor ID, define it here. Otherwise you use one of obdev's free shared
- * VID/PID pairs. Be sure to read USBID-License.txt for rules!
+ * VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
*/
#define USB_CFG_DEVICE_ID 0x08, 0x3e /* 1000 dec, "free for lab use" */
/* This is the ID of the product, low byte first. It is interpreted in the
* scope of the vendor ID. If you have registered your own VID with usb.org
* or if you have licensed a PID from somebody else, define it here. Otherwise
* you use obdev's free shared VID/PID pair. Be sure to read the rules in
- * USBID-License.txt!
+ * USB-IDs-for-free.txt!
*/
#define USB_CFG_DEVICE_VERSION 0x00, 0x01
/* Version number of the device: Minor number first, then major number.
@@ -164,14 +164,14 @@ features. Don't use it as a prototype, use usbconfig-prototype.h instead!
* are interpreted as Unicode (UTF-16) entities.
* If you don't want a vendor name string, undefine these macros.
* ALWAYS define a vendor name containing your Internet domain name if you use
- * obdev's free shared VID/PID pair. See the file USBID-License.txt for
+ * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for
* details.
*/
#define USB_CFG_DEVICE_NAME 'T', 'e', 's', 't'
#define USB_CFG_DEVICE_NAME_LEN 4
/* Same as above for the device name. If you don't want a device name, undefine
- * the macros. See the file USBID-License.txt before you assign a name if you
- * use a shared VID/PID.
+ * the macros. See the file USB-IDs-for-free.txt before you assign a name if
+ * you use a shared VID/PID.
*/
/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */
/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */
diff --git a/usbdrv/Changelog.txt b/usbdrv/Changelog.txt
index 041268e..b45f97e 100644
--- a/usbdrv/Changelog.txt
+++ b/usbdrv/Changelog.txt
@@ -275,3 +275,8 @@ Scroll down to the bottom to see the most recent changes.
background of USB ID registration clearer.
* Release 2009-04-15
+
+ - Changed CommercialLicense.txt to reflect the new range of PIDs from
+ Jason Kotzin.
+ - Removed USBID-License.txt in favor of USB-IDs-for-free.txt and
+ USB-ID-FAQ.txt
diff --git a/usbdrv/CommercialLicense.txt b/usbdrv/CommercialLicense.txt
index 33c9311..f9cd011 100644
--- a/usbdrv/CommercialLicense.txt
+++ b/usbdrv/CommercialLicense.txt
@@ -1,5 +1,5 @@
V-USB Driver Software License Agreement
-Version 2009-04-14
+Version 2009-08-03
THIS LICENSE AGREEMENT GRANTS YOU CERTAIN RIGHTS IN A SOFTWARE. YOU CAN
ENTER INTO THIS AGREEMENT AND ACQUIRE THE RIGHTS OUTLINED BELOW BY PAYING
@@ -34,11 +34,18 @@ the source code and your copy of V-USB according to your needs.
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.
+you. OBJECTIVE DEVELOPMENT has obtained USB Product ID ranges under the
+Vendor ID 5824 from Wouter van Ooijen (Van Ooijen Technische Informatica)
+and under the Vendor ID 8352 from Jason Kotzin (Clay Logic). Both owners of
+the Vendor IDs have obtained these IDs from the USB Implementers Forum, Inc.
+(www.usb.org).
+
+2.5 USB Certification. Although not part of this agreement, we want to make
+it clear that you cannot become USB certified when you use V-USB or a USB
+Product ID assigned by OBJECTIVE DEVELOPMENT. AVR microcontrollers don't
+meet the electrical specifications required by the USB specification and
+the USB Implementers Forum certifies only members who own a Vendor ID of
+their own.
3 LICENSE RESTRICTIONS
diff --git a/usbdrv/Readme.txt b/usbdrv/Readme.txt
index aade7c0..a010d97 100644
--- a/usbdrv/Readme.txt
+++ b/usbdrv/Readme.txt
@@ -39,8 +39,8 @@ The driver consists of the following files:
with IAR's tools.
License.txt ............ Open Source license for this driver.
CommercialLicense.txt .. Optional commercial license for this driver.
- USBID-License.txt ...... Terms and conditions for using particular USB ID
- values for particular purposes.
+ 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.
(*) ... These files should be linked to your project.
@@ -105,7 +105,7 @@ can assign PIDs at will.
Since an entry level cost of 1,500 USD is too high for most small companies
and hobbyists, we provide some VID/PID pairs for free. See the file
-USBID-License.txt for details.
+USB-IDs-for-free.txt for details.
Objective Development also has some license offerings which include product
IDs. See http://www.obdev.at/vusb/ for details.
diff --git a/usbdrv/USB-ID-FAQ.txt b/usbdrv/USB-ID-FAQ.txt
new file mode 100644
index 0000000..dcfefd6
--- /dev/null
+++ b/usbdrv/USB-ID-FAQ.txt
@@ -0,0 +1,79 @@
+==========================
+WHY DO WE NEED THESE IDs?
+==========================
+
+USB is more than a low level protocol for data transport. It also defines a common set of requests which must be understood by all devices. And as part of these common requests, the standard defines data structures, the Descriptors, which are used to describe the properties of the device.
+
+From the perspective of an operating system, it is therefore possible to find out basic properties of a device (such as e.g. the manufacturer and the name of the device) without a device-specific driver. This is essential because the operating system can choose a driver to load based on this information.
+
+Among the most important properties in the Device Descriptor are the USB Vendor- and Product-ID. Both are 16 bit integers. The most simple form of driver matching is based on these IDs. The driver announces the Vendor- and Product-IDs of the devices it can handle and the operating system loads the appropriate driver when the device is connected.
+
+It is obvious that this technique works only if the pair Vendor- plus Product-ID is unique: Two devices which may require separate drivers must not have the same pair of IDs.
+
+
+=====================================================
+HOW DOES THE USB STANDARD ENSURE THAT IDs ARE UNIQUE?
+=====================================================
+
+Since it is so important that USB IDs are unique, the USB Implementers Forum, Inc. (usb.org) needs a way to enforce this legally. It is not forbidden by law to build a device and assign it any random numbers as IDs, only by an agreement set forth by usb.org. The agreement binds only parties who agreed to it, of course. Everybody else is free to use any numbers for their IDs.
+
+So how can usb.org ensure that every manufacturer of USB devices enters into an agreement with them? They do it via trademark licensing. Usb.org has registered the trademark "USB", all associated logos and related terms. If you want to put an USB logo on your product or claim that it is USB compliant, you must license these trademarks from usb.org. And this is where you enter into an agreement. See the "USB-IF Trademark License Agreement and Usage Guidelines for the USB-IF Logo" at http://www.usb.org/developers/logo_license/.
+
+Licensing the USB trademarks requires that you buy a USB Vendor-ID from usb.org (one-time fee of ca. 2,000 USD), that you become a member of usb.org (yearly fee of ca. 4,000 USD) and that you meet all the technical specifications from the USB spec.
+
+This means that most hobbyists and small companies will never be able to become USB compliant, just because membership is so expensive. And you can't be compliant with a driver based on V-USB anyway, because the AVR's port pins don't meet the electrical specifications for USB. So, in principle, all hobbyists and small companies are free to choose any random numbers for their IDs. They have nothing to lose...
+
+There is one exception worth noting, though: If you use a sub-component which implements USB, the vendor of the sub-components may guarantee USB compliance. This might apply to some or all of FTDI's solutions.
+
+
+=======================================================================
+WHY SHOULD YOU OBTAIN USB IDs EVEN IF YOU DON'T LICENSE USB TRADEMARKS?
+=======================================================================
+
+You have learned in the previous section that you are free to choose any numbers for your IDs anyway. So why not do exactly this? There is still the technical issue. If you choose IDs which are already in use by somebody else, operating systems will load the wrong drivers and your device won't work. Even if you choose IDs which are not currently in use, they may be in use in the next version of the operating system or in an automatic update.
+
+So what you need is a pair of Vendor- and Product-IDs for which you have the guarantee that no USB compliant product uses them. This implies that no operating system will ever ship with drivers responsible for these IDs.
+
+
+==============================================
+HOW DOES OBJECTIVE DEVELOPMENT HANDLE USB IDs?
+==============================================
+
+Objective Development gives away pairs of USB-IDs with their V-USB licenses. In order to ensure that these IDs are unique, Objective Development has an agreement with the company/person who has bought the USB Vendor-ID from usb.org. This agreement ensures that a range of USB Product-IDs is reserved for assignment by Objective Development and that the owner of the Vendor-ID won't give it to anybody else.
+
+This means that you have to trust three parties that they ensure uniqueness for your IDs:
+
+ - Objective Development, that they don't give the same PID to more than
+ one person.
+ - The owner of the Vendor-ID that they don't assign PIDs from the range
+ assigned to Objective Development to anybody else
+ - Usb.org that they don't assign the same Vendor-ID a second time.
+
+
+==================================
+WHO IS THE OWNER OF THE VENDOR-ID?
+==================================
+
+Objective Development has obtained three ranges of USB Product-IDs. Two ranges under the Vendor-ID 5824 from Wouter van Ooijen (Van Ooijen Technische Informatica, www.voti.nl): 1500-1509 and 10200-10299 and one under the Vendor-ID 8352 from Jason Kotzin (Clay Logic): 16384-32767. Both VID owners have received their Vendor-ID directly from usb.org.
+
+
+=========================================================================
+CAN I USE USB-IDs FROM OBJECTIVE DEVELOPMENT WITH OTHER DRIVERS/HARDWARE?
+=========================================================================
+
+The short answer is: Yes. All you get is a guarantee that the IDs are never assigned to anybody else. What more do you need?
+
+
+============================
+WHAT ABOUT SHARED ID PAIRS?
+============================
+
+Objective Development has reserved some PID/VID pairs for shared use. You have no guarantee of uniqueness for them, except that no USB compliant device uses them. In order to avoid technical problems, we must ensure that all devices with the same pair of IDs use the same driver on kernel level. For details, see the text which describes the shared IDs.
+
+
+======================================================
+I HAVE HEARD THAT SUB-LICENSING OF USB-IDs IS ILLEGAL?
+======================================================
+
+A 16 bit integer number cannot be protected by copyright laws. It is not sufficiently complex. And since none of the parties involved entered into the USB-IF Trademark License Agreement, we are not bound to this agreement. So there is no reason why it should be illegal to sub-license USB-IDs.
+
diff --git a/usbdrv/USB-IDs-for-free.txt b/usbdrv/USB-IDs-for-free.txt
new file mode 100644
index 0000000..e2586b2
--- /dev/null
+++ b/usbdrv/USB-IDs-for-free.txt
@@ -0,0 +1,107 @@
+Version 2009-08-03
+
+===========================
+FREE USB-IDs FOR SHARED USE
+===========================
+
+Objective Development has reserved a set of USB Product-IDs for use according to the guidelines outlined below. For more information about the concept of USB IDs please see the file USB-ID-FAQ.txt. Objective Development guarantees that the IDs listed below are not used by any USB compliant devices.
+
+
+====================
+MECHANISM OF SHARING
+====================
+
+From a technical point of view, two different devices can share the same USB Vendor- and Product-ID if they require the same driver on operating system level. We make use of this fact by assigning separate IDs for various device classes. On application layer, devices must be distinguished by their textual name or serial number. We offer separate sets of IDs for discrimination by textual name and for serial number.
+
+Examples for shared use of USB IDs are included with V-USB in the "examples" subdirectory.
+
+
+======================================
+IDs FOR DISCRIMINATION BY TEXTUAL NAME
+======================================
+
+If you use one of the IDs listed below, your device and host-side software must conform to these rules:
+
+(1) The USB device MUST provide a textual representation of the
+manufacturer and product identification. The manufacturer identification
+MUST be available at least in USB language 0x0409 (English/US).
+
+(2) The textual manufacturer identification MUST contain either an Internet
+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/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.
+
+(4) You may choose any string for the textual product identification, as long as this string is unique within the scope of your textual manufacturer identification.
+
+(5) Application side device look-up MUST be based on the textual manufacturer and product identification in addition to VID/PID matching. The driver matching MUST be a comparison of the entire strings, NOT a sub-string match.
+
+(6) For devices which implement a particular USB device class (e.g. HID), the operating system's default class driver MUST be used. If an operating system driver for Vendor Class devices is needed, this driver must be libusb or libusb-win32 (see http://libusb.org/ and http://libusb-win32.sourceforge.net/).
+
+Table if IDs for discrimination by textual name:
+
+PID dec (hex) | VID dec (hex) | Description of use
+==============+===============+============================================
+1500 (0x05dc) | 5824 (0x16c0) | For Vendor Class devices with libusb
+--------------+---------------+--------------------------------------------
+1503 (0x05df) | 5824 (0x16c0) | For generic HID class devices (which are
+ | | NOT mice, keyboards or joysticks)
+--------------+---------------+--------------------------------------------
+1505 (0x05e1) | 5824 (0x16c0) | For CDC-ACM class devices (modems)
+--------------+---------------+--------------------------------------------
+1508 (0x05e4) | 5824 (0x16c0) | For MIDI class devices
+--------------+---------------+--------------------------------------------
+
+Note that Windows caches the textual product- and vendor-description for mice, keyboards and joysticks. Name-bsed discrimination is therefore not recommended for these device classes.
+
+
+=======================================
+IDs FOR DISCRIMINATION BY SERIAL NUMBER
+=======================================
+
+If you use one of the IDs listed below, your device and host-side software must conform to these rules:
+
+(1) The USB device MUST provide a textual representation of the serial number. The serial number string MUST be available at least in USB language 0x0409 (English/US).
+
+(2) The serial number MUST start with either an Internet 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 MAY append any string you like for further discrimination of your devices.
+
+(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.
+
+(5) Application side device look-up MUST be based on the serial number string in addition to VID/PID matching. The matching must start at the first character of the serial number string and MUST include your entire domain name or e-mail address. It MAY stop anywhere after that.
+
+(6) For devices which implement a particular USB device class (e.g. HID), the operating system's default class driver MUST be used. If an operating system driver for Vendor Class devices is needed, this driver must be libusb or libusb-win32 (see http://libusb.org/ and http://libusb-win32.sourceforge.net/).
+
+Table if IDs for discrimination by serial number string:
+
+PID dec (hex) | VID dec (hex) | Description of use
+===============+===============+===========================================
+10200 (0x27d8) | 5824 (0x16c0) | For Vendor Class devices with libusb
+---------------+---------------+-------------------------------------------
+10201 (0x27d9) | 5824 (0x16c0) | For generic HID class devices (which are
+ | | NOT mice, keyboards or joysticks)
+---------------+---------------+-------------------------------------------
+10202 (0x27da) | 5824 (0x16c0) | For USB Mice
+---------------+---------------+-------------------------------------------
+10203 (0x27db) | 5824 (0x16c0) | For USB Keyboards
+---------------+---------------+-------------------------------------------
+10204 (0x27db) | 5824 (0x16c0) | For USB Joysticks
+---------------+---------------+-------------------------------------------
+10205 (0x27dc) | 5824 (0x16c0) | For CDC-ACM class devices (modems)
+---------------+---------------+-------------------------------------------
+10206 (0x27dd) | 5824 (0x16c0) | For MIDI class devices
+---------------+---------------+-------------------------------------------
+
+
+=================
+ORIGIN OF USB-IDs
+=================
+
+OBJECTIVE DEVELOPMENT Software GmbH has obtained all VID/PID pairs listed here 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".
+
+==========
+DISCLAIMER
+==========
+OBJECTIVE DEVELOPMENT Software GmbH disclaims all liability for any
+problems which are caused by the shared use of these VID/PID pairs.
diff --git a/usbdrv/usbconfig-prototype.h b/usbdrv/usbconfig-prototype.h
index 812f83b..71c7acf 100644
--- a/usbdrv/usbconfig-prototype.h
+++ b/usbdrv/usbconfig-prototype.h
@@ -207,7 +207,7 @@ section at the end of this file).
#define USB_CFG_VENDOR_ID 0xc0, 0x16
/* USB vendor ID for the device, low byte first. If you have registered your
* own Vendor ID, define it here. Otherwise you use one of obdev's free shared
- * VID/PID pairs. Be sure to read USBID-License.txt for rules!
+ * VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
* + This template uses obdev's shared VID/PID pair: 0x16c0/0x5dc.
* + Use this VID/PID pair ONLY if you understand the implications!
*/
@@ -216,7 +216,7 @@ section at the end of this file).
* scope of the vendor ID. If you have registered your own VID with usb.org
* or if you have licensed a PID from somebody else, define it here. Otherwise
* you use obdev's free shared VID/PID pair. Be sure to read the rules in
- * USBID-License.txt!
+ * USB-IDs-for-free.txt!
* + This template uses obdev's shared VID/PID pair: 0x16c0/0x5dc.
* + Use this VID/PID pair ONLY if you understand the implications!
*/
@@ -230,14 +230,14 @@ section at the end of this file).
* are interpreted as Unicode (UTF-16) entities.
* If you don't want a vendor name string, undefine these macros.
* ALWAYS define a vendor name containing your Internet domain name if you use
- * obdev's free shared VID/PID pair. See the file USBID-License.txt for
+ * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for
* details.
*/
#define USB_CFG_DEVICE_NAME 'T', 'e', 'm', 'p', 'l', 'a', 't', 'e'
#define USB_CFG_DEVICE_NAME_LEN 8
/* Same as above for the device name. If you don't want a device name, undefine
- * the macros. See the file USBID-License.txt before you assign a name if you
- * use a shared VID/PID.
+ * the macros. See the file USB-IDs-for-free.txt before you assign a name if
+ * you use a shared VID/PID.
*/
/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */
/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */
diff --git a/usbdrv/usbdrv.h b/usbdrv/usbdrv.h
index fd1083e..ba1ad4b 100644
--- a/usbdrv/usbdrv.h
+++ b/usbdrv/usbdrv.h
@@ -513,7 +513,7 @@ int usbDescriptorStringSerialNumber[];
#if !defined __ASSEMBLER__ && (!defined USB_CFG_VENDOR_ID || !defined USB_CFG_DEVICE_ID)
#warning "You should define USB_CFG_VENDOR_ID and USB_CFG_DEVICE_ID in usbconfig.h"
/* If the user has not defined IDs, we default to obdev's free IDs.
- * See USBID-License.txt for details.
+ * See USB-IDs-for-free.txt for details.
*/
#endif