diff --git a/VersionNum b/VersionNum
index 08f1d67379b4f9e4bc067ec7e9638374034fd2d3..11b0de8f53e6b16ca532b57f54876964fa79d35f 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.18)
+/* (0.19)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
-#define Module_MajorVersion_CMHG 0.18
+#define Module_MajorVersion_CMHG 0.19
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 03 Jun 2003
+#define Module_Date_CMHG 16 Jun 2003
-#define Module_MajorVersion "0.18"
-#define Module_Version 18
+#define Module_MajorVersion "0.19"
+#define Module_Version 19
#define Module_MinorVersion ""
-#define Module_Date "03 Jun 2003"
+#define Module_Date "16 Jun 2003"
-#define Module_ApplicationDate "03-Jun-03"
+#define Module_ApplicationDate "16-Jun-03"
#define Module_ComponentName "NetBSD"
#define Module_ComponentPath "RiscOS/Sources/HWSupport/USB/NetBSD"
-#define Module_FullVersion "0.18"
-#define Module_HelpVersion "0.18 (03 Jun 2003)"
-#define Module_LibraryVersionInfo "0:18"
+#define Module_FullVersion "0.19"
+#define Module_HelpVersion "0.19 (16 Jun 2003)"
+#define Module_LibraryVersionInfo "0:19"
diff --git a/build/Version b/build/Version
index e2bc86628b4fd0b8b647dad3998b9773d126f53a..5e09d0f3bc56c1464f8b22d328bc621540c6ebff 100644
--- a/build/Version
+++ b/build/Version
@@ -2,8 +2,8 @@
VersionNum file really,as a work around define them here so the CMHG
file remains unaltered */
-#define OHCIDriverModule_Module_Date_CMHG 14 Apr 2003
-#define OHCIDriverModule_MajorVersion_CMHG 0.13
+#define OHCIDriverModule_Module_Date_CMHG 16 Jun 2003
+#define OHCIDriverModule_MajorVersion_CMHG 0.14
#define USBDriverModule_Module_Date_CMHG 03 Jun 2003
#define USBDriverModule_MajorVersion_CMHG 0.25
diff --git a/dev/usb/h/usbdevs b/dev/usb/h/usbdevs
index c0e6473453e679831dc34457ea7d63c8739b058a..c73b80bcf720553afd1887f5b5d4fe442055291f 100644
--- a/dev/usb/h/usbdevs
+++ b/dev/usb/h/usbdevs
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.327 2003/05/10 17:52:02 hamajima Exp $ */
+/* $NetBSD: usbdevs.h,v 1.332 2003/06/08 13:34:23 grant Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp
+ * NetBSD: usbdevs,v 1.326 2003/06/07 17:00:41 augustss Exp
*/
/*
@@ -244,6 +244,7 @@
#define USB_VENDOR_SMC 0x0707 /* Standard Microsystems */
#define USB_VENDOR_PUTERCOM 0x0708 /* Putercom */
#define USB_VENDOR_MCT 0x0711 /* MCT */
+#define USB_VENDOR_EICON 0x0734 /* Eicon Networks */
#define USB_VENDOR_DIGITALSTREAM 0x074e /* Digital Stream */
#define USB_VENDOR_AUREAL 0x0755 /* Aureal Semiconductor */
#define USB_VENDOR_MIDIMAN 0x0763 /* Midiman */
@@ -354,6 +355,7 @@
#define USB_VENDOR_PLX 0x10b5 /* PLX */
#define USB_VENDOR_ASANTE 0x10bd /* Asante */
#define USB_VENDOR_JRC 0x1145 /* Japan Radio Company */
+#define USB_VENDOR_SERVERWORKS 0x1166 /* ServerWorks */
#define USB_VENDOR_ACERCM 0x1189 /* Acer Communications & Multimedia */
#define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components */
#define USB_VENDOR_MOBILITY 0x1342 /* Mobility */
@@ -365,11 +367,13 @@
#define USB_VENDOR_ENTREGA 0x1645 /* Entrega */
#define USB_VENDOR_ACTIONTEC 0x1668 /* Actiontec Electronics */
#define USB_VENDOR_DLINK 0x2001 /* D-Link */
+#define USB_VENDOR_MOTOROLA2 0x22b8 /* Motorola */
#define USB_VENDOR_NHJ 0x2770 /* NHJ */
#define USB_VENDOR_PQI 0x3538 /* PQI */
#define USB_VENDOR_DAISY 0x3579 /* Daisy Technology */
#define USB_VENDOR_NI 0x3923 /* National Instruments */
#define USB_VENDOR_IODATA2 0x40bb /* I-O Data */
+#define USB_VENDOR_ONSPEC2 0x55aa /* OnSpec Electronic Inc. */
#define USB_VENDOR_INTEL 0x8086 /* Intel */
#define USB_VENDOR_HP2 0xf003 /* Hewlett Packard */
@@ -402,6 +406,7 @@
#define USB_PRODUCT_ABOCOM_XX7 0x400c /* XX7 */
#define USB_PRODUCT_ABOCOM_XX8 0x4102 /* XX8 */
#define USB_PRODUCT_ABOCOM_XX9 0x4104 /* XX9 */
+#define USB_PRODUCT_ABOCOM_UFE2000 0x420a /* UFE2000 USB2.0 Fast Ethernet Adapter */
#define USB_PRODUCT_ABOCOM_XX10 0xabc1 /* XX10 */
/* Accton products */
@@ -482,6 +487,7 @@
/* Asahi Optical products */
#define USB_PRODUCT_ASAHIOPTICAL_OPTIO230 0x0004 /* PENTAX Optio230 */
+#define USB_PRODUCT_ASAHIOPTICAL_OPTIO330 0x0006 /* Digital camera */
/* Asante products */
#define USB_PRODUCT_ASANTE_EA 0x1427 /* Ethernet Adapter */
@@ -640,6 +646,9 @@
/* EasyDisk products */
#define USB_PRODUCT_EASYDISK_EASYDISK 0x0005 /* Flash Disk */
+/* Eicon Networks */
+#define USB_PRODUCT_EICON_DIVA852 0x4905 /* Diva 852 ISDN TA */
+
/* EIZO products */
#define USB_PRODUCT_EIZO_HUB 0x0000 /* hub */
#define USB_PRODUCT_EIZO_MONITOR 0x0001 /* monitor */
@@ -696,17 +705,6 @@
/* Extended Systems products */
#define USB_PRODUCT_EXTENDED_XTNDACCESS 0x0100 /* XTNDAccess IrDA */
-/* Gravis products */
-#define USB_PRODUCT_GRAVIS_GAMEPADPRO 0x4001 /* GamePad Pro */
-
-/* GREENHOUSE products */
-#define USB_PRODUCT_GREENHOUSE_KANA21 0x0001 /* CF-writer with Portable MP3 Player */
-#define USB_PRODUCT_GREENHOUSE2_USBKR100 0x8150 /* USB Ethernet Adapter GH-USB100B */
-
-/* Griffin Technology */
-#define USB_PRODUCT_GRIFFIN_IMATE 0x0405 /* iMate, ADB adapter */
-#define USB_PRODUCT_GRIFFIN_POWERMATE 0x0410 /* PowerMate Assignable Controller */
-
/* Freecom products */
#define USB_PRODUCT_FREECOM_DVD 0xfc01 /* Connector for DVD drive */
@@ -727,6 +725,17 @@
/* GoHubs products */
#define USB_PRODUCT_GOHUBS_GOCOM232 0x1001 /* GoCOM232 Serial converter */
+/* Gravis products */
+#define USB_PRODUCT_GRAVIS_GAMEPADPRO 0x4001 /* GamePad Pro */
+
+/* GREENHOUSE products */
+#define USB_PRODUCT_GREENHOUSE_KANA21 0x0001 /* CF-writer with Portable MP3 Player */
+#define USB_PRODUCT_GREENHOUSE2_USBKR100 0x8150 /* USB Ethernet Adapter GH-USB100B */
+
+/* Griffin Technology */
+#define USB_PRODUCT_GRIFFIN_IMATE 0x0405 /* iMate, ADB adapter */
+#define USB_PRODUCT_GRIFFIN_POWERMATE 0x0410 /* PowerMate Assignable Controller */
+
/* Hagiwara products */
#define USB_PRODUCT_HAGIWARA_FGSM 0x0002 /* FlashGate SmartMedia Card Reader */
#define USB_PRODUCT_HAGIWARA_FGCF 0x0003 /* FlashGate CompactFlash Card Reader */
@@ -1033,6 +1042,7 @@
/* Motorola products */
#define USB_PRODUCT_MOTOROLA_MC141555 0x1555 /* MC141555 hub controller */
#define USB_PRODUCT_MOTOROLA_SB4100 0x4100 /* SB4100 USB Cable Modem */
+#define USB_PRODUCT_MOTOROLA2_T720C 0x2822 /* T720c */
/* MultiTech products */
#define USB_PRODUCT_MULTITECH_ATLAS 0xf101 /* MT5634ZBA-USB modem */
@@ -1269,6 +1279,7 @@
#define USB_PRODUCT_SHUTTLE_EUSCSI_B 0x000b /* eUSCSI Bridge */
#define USB_PRODUCT_SHUTTLE_EUSCSI_C 0x000c /* eUSCSI Bridge */
#define USB_PRODUCT_SHUTTLE_CDRW 0x0101 /* CD-RW Device */
+#define USB_PRODUCT_SHUTTLE_SCM 0x1010 /* SCM Micro */
/* Siemens products */
#define USB_PRODUCT_SIEMENS_SPEEDSTREAM 0x1001 /* SpeedStream USB */
diff --git a/dev/usb/h/usbdevs_data b/dev/usb/h/usbdevs_data
index 0f3e32a79089c150c7cc2cfc4a0ca48cba453af9..34d40e5df427c3419a9ab2eb0266a8b90ad68b41 100644
--- a/dev/usb/h/usbdevs_data
+++ b/dev/usb/h/usbdevs_data
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.328 2003/05/10 17:52:02 hamajima Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.333 2003/06/08 13:34:24 grant Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp
+ * NetBSD: usbdevs,v 1.326 2003/06/07 17:00:41 augustss Exp
*/
/*
@@ -171,6 +171,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"AboCom Systems",
"XX9",
},
+ {
+ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE2000,
+ 0,
+ "AboCom Systems",
+ "UFE2000 USB2.0 Fast Ethernet Adapter",
+ },
{
USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10,
0,
@@ -429,6 +435,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Asahi Optical",
"PENTAX Optio230",
},
+ {
+ USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO330,
+ 0,
+ "Asahi Optical",
+ "Digital camera",
+ },
{
USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA,
0,
@@ -927,6 +939,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"EasyDisk",
"Flash Disk",
},
+ {
+ USB_VENDOR_EICON, USB_PRODUCT_EICON_DIVA852,
+ 0,
+ "Eicon Networks",
+ "Diva 852 ISDN TA",
+ },
{
USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
0,
@@ -1167,36 +1185,6 @@ const struct usb_knowndev usb_knowndevs[] = {
"Extended Systems",
"XTNDAccess IrDA",
},
- {
- USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
- 0,
- "Advanced Gravis Computer Tech.",
- "GamePad Pro",
- },
- {
- USB_VENDOR_GREENHOUSE, USB_PRODUCT_GREENHOUSE_KANA21,
- 0,
- "GREENHOUSE",
- "CF-writer with Portable MP3 Player",
- },
- {
- USB_VENDOR_GREENHOUSE2, USB_PRODUCT_GREENHOUSE2_USBKR100,
- 0,
- "GREENHOUSE",
- "USB Ethernet Adapter GH-USB100B",
- },
- {
- USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
- 0,
- "Griffin Technology",
- "iMate, ADB adapter",
- },
- {
- USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_POWERMATE,
- 0,
- "Griffin Technology",
- "PowerMate Assignable Controller",
- },
{
USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
0,
@@ -1245,6 +1233,36 @@ const struct usb_knowndev usb_knowndevs[] = {
"GoHubs",
"GoCOM232 Serial converter",
},
+ {
+ USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
+ 0,
+ "Advanced Gravis Computer Tech.",
+ "GamePad Pro",
+ },
+ {
+ USB_VENDOR_GREENHOUSE, USB_PRODUCT_GREENHOUSE_KANA21,
+ 0,
+ "GREENHOUSE",
+ "CF-writer with Portable MP3 Player",
+ },
+ {
+ USB_VENDOR_GREENHOUSE2, USB_PRODUCT_GREENHOUSE2_USBKR100,
+ 0,
+ "GREENHOUSE",
+ "USB Ethernet Adapter GH-USB100B",
+ },
+ {
+ USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
+ 0,
+ "Griffin Technology",
+ "iMate, ADB adapter",
+ },
+ {
+ USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_POWERMATE,
+ 0,
+ "Griffin Technology",
+ "PowerMate Assignable Controller",
+ },
{
USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
0,
@@ -2547,6 +2565,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Motorola",
"SB4100 USB Cable Modem",
},
+ {
+ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_T720C,
+ 0,
+ "Motorola",
+ "T720c",
+ },
{
USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
0,
@@ -3411,6 +3435,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Shuttle Technology",
"CD-RW Device",
},
+ {
+ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SCM,
+ 0,
+ "Shuttle Technology",
+ "SCM Micro",
+ },
{
USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
0,
@@ -5049,6 +5079,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"MCT",
NULL,
},
+ {
+ USB_VENDOR_EICON, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Eicon Networks",
+ NULL,
+ },
{
USB_VENDOR_DIGITALSTREAM, 0,
USB_KNOWNDEV_NOPROD,
@@ -5709,6 +5745,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Japan Radio Company",
NULL,
},
+ {
+ USB_VENDOR_SERVERWORKS, 0,
+ USB_KNOWNDEV_NOPROD,
+ "ServerWorks",
+ NULL,
+ },
{
USB_VENDOR_ACERCM, 0,
USB_KNOWNDEV_NOPROD,
@@ -5775,6 +5817,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"D-Link",
NULL,
},
+ {
+ USB_VENDOR_MOTOROLA2, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Motorola",
+ NULL,
+ },
{
USB_VENDOR_NHJ, 0,
USB_KNOWNDEV_NOPROD,
@@ -5805,6 +5853,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"I-O Data",
NULL,
},
+ {
+ USB_VENDOR_ONSPEC2, 0,
+ USB_KNOWNDEV_NOPROD,
+ "OnSpec Electronic Inc.",
+ NULL,
+ },
{
USB_VENDOR_INTEL, 0,
USB_KNOWNDEV_NOPROD,