sync and cleanup in ubsa(4)

3 files changed, 81 insertions, 21 deletions

diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 5e067a38445..d98bcc7fbe8 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.9 2005/01/16 04:53:00 dlg Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.10 2005/03/18 00:33:28 reyk Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -234,8 +234,12 @@ Static const struct usb_devno ubsa_devs[] = {
 	{ USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 },
 	/* Peracom */
 	{ USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 },
-	/* Vodafone */
-	{ USB_VENDOR_VODAFONE, USB_PRODUCT_VODAFONE_MOBILE_3G }
+	/* Option Vodafone Mobile Connect 3G */
+	{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G },
+	/* Option GlobeTrotter 3G FUSION */
+	{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GFUSION },
+	/* Option GlobeTrotter 3G QUAD */
+	{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD },
 };
 #define ubsa_lookup(v, p) usb_lookup(ubsa_devs, v, p)
 
@@ -447,7 +451,7 @@ ubsa_request(struct ubsa_softc *sc, u_int8_t request, u_int16_t value)
 	USETW(req.wLength, 0);
 
 	err = usbd_do_request(sc->sc_udev, &req, 0);
-	if (err)
+	if (err && err != USBD_STALLED)
 		printf("%s: ubsa_request: %s\n",
 		    USBDEVNAME(sc->sc_dev), usbd_errstr(err));
 	return (err);
@@ -533,9 +537,9 @@ ubsa_baudrate(struct ubsa_softc *sc, speed_t speed)
 		value = B230400 / speed;
 		break;
 	default:
-		printf("%s: ubsa_param: unsupported baudrate, "
+		DPRINTF(("%s: ubsa_param: unsupported baudrate, "
 		    "forcing default of 9600\n",
-		    USBDEVNAME(sc->sc_dev));
+		    USBDEVNAME(sc->sc_dev)));
 		value = B230400 / B9600;
 		break;
 	};
@@ -576,9 +580,9 @@ ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag)
 	case CS7: value = 2; break;
 	case CS8: value = 3; break;
 	default:
-		printf("%s: ubsa_param: unsupported databits requested, "
+		DPRINTF(("%s: ubsa_param: unsupported databits requested, "
 		    "forcing default of 8\n",
-		    USBDEVNAME(sc->sc_dev));
+		    USBDEVNAME(sc->sc_dev)));
 		value = 3;
 	}
 
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 67467085e3a..f315e6d14b5 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.147 2005/03/16 21:22:14 damien Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.148 2005/03/18 00:33:28 reyk Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.142 2005/03/14 04:08:50 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.144 2005/03/18 00:32:18 reyk Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -357,7 +357,7 @@
 #define	USB_VENDOR_GREENHOUSE	0x0a6b		/* GREENHOUSE */
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
 #define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
-#define	USB_VENDOR_VODAFONE	0x0af0		/* Vodafone */
+#define	USB_VENDOR_OPTION	0x0af0		/* Option */
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_ASUS	0x0b05		/* ASUS */
 #define	USB_VENDOR_SIIG2	0x0b39		/* SIIG */
@@ -1800,8 +1800,10 @@
 /* Vivitar products */
 #define	USB_PRODUCT_VIVITAR_DSC350	0x0003		/* DSC350 */
 
-/* Vodafone products */
-#define	USB_PRODUCT_VODAFONE_MOBILE_3G	0x5000		/* Mobile Connect 3G */
+/* Option products */
+#define	USB_PRODUCT_OPTION_VODAFONEMC3G	0x5000		/* Vodafone Mobile Connect 3G */
+#define	USB_PRODUCT_OPTION_GT3GFUSION	0x6000		/* GlobeTrotter 3G FUSION */
+#define	USB_PRODUCT_OPTION_GT3GQUAD	0x6300		/* GlobeTrotter 3G QUAD */
 
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 78d04442d46..bd66b3161f6 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.146 2005/03/14 04:08:53 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.147 2005/03/18 00:33:28 reyk Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.142 2005/03/14 04:08:50 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.144 2005/03/18 00:32:18 reyk Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -587,6 +587,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB 2.0 10/100 ethernet controller",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2570,
+	    0,
+	    "ASUS",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL140,
 	    0,
 	    "ASUSTeK Computer",
@@ -986,7 +992,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G,
 	    0,
 	    "Cisco-Linksys",
-	    "Wireless-G USB Network Adapter",
+	    "RT2570",
+	},
+	{
+	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP,
+	    0,
+	    "Cisco-Linksys",
+	    "RT2570",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC,
@@ -1289,6 +1301,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWL-120 rev F",
 	},
 	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RT2570,
+	    0,
+	    "D-Link",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    0,
 	    "D-Link",
@@ -4169,6 +4187,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "i-Key 2000",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570,
+	    0,
+	    "Ralink Technology",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
 	    0,
 	    "RATOC Systems",
@@ -4613,6 +4637,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "EZ Connect 11Mbps v2",
 	},
 	{
+	    USB_VENDOR_SMC, USB_PRODUCT_SMC_RT2570,
+	    0,
+	    "Standard Microsystems",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
 	    0,
 	    "SOHOware",
@@ -5117,10 +5147,22 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DSC350",
 	},
 	{
-	    USB_VENDOR_VODAFONE, USB_PRODUCT_VODAFONE_MOBILE_3G,
+	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G,
+	    0,
+	    "Option",
+	    "Vodafone Mobile Connect 3G",
+	},
+	{
+	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GFUSION,
+	    0,
+	    "Option",
+	    "GlobeTrotter 3G FUSION",
+	},
+	{
+	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD,
 	    0,
-	    "Vodafone",
-	    "Mobile Connect 3G",
+	    "Option",
+	    "GlobeTrotter 3G QUAD",
 	},
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
@@ -7001,9 +7043,9 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    USB_VENDOR_VODAFONE, 0,
+	    USB_VENDOR_OPTION, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Vodafone",
+	    "Option",
 	    NULL,
 	},
 	{
@@ -7013,6 +7055,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ASUS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ASUS",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SIIG2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "SIIG",
@@ -7277,6 +7325,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_RALINK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Ralink Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SILICONPORTALS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Silicon Portals",