aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Starkjohann <cs+github@obdev.at>2009-08-22 11:39:22 +0000
committerChristian Starkjohann <cs+github@obdev.at>2009-08-22 11:39:22 +0000
commit0d51bdaf9b7b853571a35ac98190e1df47cb37db (patch)
tree920b1562a6473231c141153c023a2c0eecaed9f3
parent5348331e712d4917932d46ced310b62bebddc842 (diff)
downloadv-usb-0d51bdaf9b7b853571a35ac98190e1df47cb37db.tar.gz
v-usb-0d51bdaf9b7b853571a35ac98190e1df47cb37db.tar.bz2
v-usb-0d51bdaf9b7b853571a35ac98190e1df47cb37db.zip
- documentation updates for clay logic and USB-IDs
-rw-r--r--usbdrv/CommercialLicense.txt13
-rw-r--r--usbdrv/USB-ID-FAQ.txt12
-rw-r--r--usbdrv/USB-IDs-for-free.txt10
-rw-r--r--usbdrv/usbconfig-prototype.h26
4 files changed, 33 insertions, 28 deletions
diff --git a/usbdrv/CommercialLicense.txt b/usbdrv/CommercialLicense.txt
index 01ed8e9..11d07d9 100644
--- a/usbdrv/CommercialLicense.txt
+++ b/usbdrv/CommercialLicense.txt
@@ -32,12 +32,13 @@ 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 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. 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.
+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. OBJECTIVE DEVELOPMENT has obtained USB Product ID
+ranges under the Vendor ID 5824 from Wouter van Ooijen (Van Ooijen
+Technische Informatica, www.voti.nl) and under the Vendor ID 8352 from
+Jason Kotzin (Clay Logic, www.claylogic.com). Both owners of the Vendor IDs
+have obtained these IDs from the USB Implementers Forum, Inc.
(www.usb.org). OBJECTIVE DEVELOPMENT disclaims all liability which might
arise from the assignment of USB IDs.
diff --git a/usbdrv/USB-ID-FAQ.txt b/usbdrv/USB-ID-FAQ.txt
index 82e8b03..d1de8fb 100644
--- a/usbdrv/USB-ID-FAQ.txt
+++ b/usbdrv/USB-ID-FAQ.txt
@@ -1,4 +1,4 @@
-Version 2009-08-03
+Version 2009-08-22
==========================
WHY DO WE NEED THESE IDs?
@@ -104,11 +104,11 @@ your IDs:
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.
+Objective Development has obtained ranges of USB Product-IDs under two
+Vendor-IDs: Under Vendor-ID 5824 from Wouter van Ooijen (Van Ooijen
+Technische Informatica, www.voti.nl) and under Vendor-ID 8352 from Jason
+Kotzin (Clay Logic, www.claylogic.com). Both VID owners have received their
+Vendor-ID directly from usb.org.
=========================================================================
diff --git a/usbdrv/USB-IDs-for-free.txt b/usbdrv/USB-IDs-for-free.txt
index fd064c6..2f4d59a 100644
--- a/usbdrv/USB-IDs-for-free.txt
+++ b/usbdrv/USB-IDs-for-free.txt
@@ -1,4 +1,4 @@
-Version 2009-08-03
+Version 2009-08-22
===========================
FREE USB-IDs FOR SHARED USE
@@ -91,16 +91,16 @@ number. The serial number string MUST be available at least in USB language
(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.
+control (e.g. "myname@gmx.net"), both terminated with a colon (":") character.
+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.
+character of the serial number string and include the colon character
+terminating your domain 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
diff --git a/usbdrv/usbconfig-prototype.h b/usbdrv/usbconfig-prototype.h
index 238b45a..0eb3499 100644
--- a/usbdrv/usbconfig-prototype.h
+++ b/usbdrv/usbconfig-prototype.h
@@ -212,21 +212,25 @@ section at the end of this file).
/* -------------------------- Device Description --------------------------- */
-#define USB_CFG_VENDOR_ID 0xc0, 0x16
+#define USB_CFG_VENDOR_ID 0xc0, 0x16 /* = 0x16c0 = 5824 = voti.nl */
/* 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 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!
- */
-#define USB_CFG_DEVICE_ID 0xdc, 0x05
+ * own Vendor ID, define it here. Otherwise you may use one of obdev's free
+ * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
+ * *** IMPORTANT NOTE ***
+ * This template uses obdev's shared VID/PID pair for Vendor Class devices
+ * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
+ * the implications!
+ */
+#define USB_CFG_DEVICE_ID 0xdc, 0x05 /* = 0x05dc = 1500 */
/* 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
- * 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!
+ * you may use one of obdev's free shared VID/PID pairs. See the file
+ * USB-IDs-for-free.txt for details!
+ * *** IMPORTANT NOTE ***
+ * This template uses obdev's shared VID/PID pair for Vendor Class devices
+ * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
+ * the implications!
*/
#define USB_CFG_DEVICE_VERSION 0x00, 0x01
/* Version number of the device: Minor number first, then major number.