sync to MECANIQUE change, and add a uftdi found there, spotted by Henrik Hellerstedt

4 files changed, 20 insertions, 14 deletions

diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index c2efa09cab6..d7673843da0 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.52 2009/04/21 05:22:51 deraadt Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.53 2009/04/22 18:56:56 deraadt Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -309,6 +309,7 @@ static const struct usb_devno uftdi_devs[] = {
 	{ USB_VENDOR_KOBIL, USB_PRODUCT_KOBIL_B1 },
 	{ USB_VENDOR_KOBIL, USB_PRODUCT_KOBIL_KAAN },
 	{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_PCOPRS1 },
+	{ USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_TELLSTICK },
 	{ USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_ED200H },
 	{ USB_VENDOR_OCT, USB_PRODUCT_OCT_US2308 },
 	{ USB_VENDOR_PAPOUCH, USB_PRODUCT_PAPOUCH_AD4USB },
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index c833cf259b3..6489265444a 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_quirks.c,v 1.50 2008/11/29 21:54:46 deraadt Exp $ */
+/*	$OpenBSD: usb_quirks.c,v 1.51 2009/04/22 18:56:56 deraadt Exp $ */
 /*	$NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
@@ -131,7 +131,7 @@ const struct usbd_quirk_entry {
  { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY760,	    ANY,   { UQ_BROKEN_BIDIR }},
  { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY920,	    ANY,   { UQ_BROKEN_BIDIR }},
  { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY800,	    ANY,   { UQ_BROKEN_BIDIR }},
- { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY, ANY,   { UQ_BAD_HID }},
+ { USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_WISPY, ANY,   { UQ_BAD_HID }},
  { USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BX35F,       ANY,   { UQ_BAD_HID }},
  { USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BX50F,       ANY,   { UQ_BAD_HID }},
  { USB_VENDOR_TENX, USB_PRODUCT_TENX_MISSILE,	    ANY,   { UQ_BAD_HID }},
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 9141235f198..ab7aeccbf22 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.435 2009/04/21 05:22:55 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.436 2009/04/22 18:56:56 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.425 2009/04/21 05:22:52 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.426 2009/04/22 18:56:33 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -524,7 +524,7 @@
 #define	USB_VENDOR_SENAO	0x1740		/* Senao */
 #define	USB_VENDOR_ASUS2	0x1761		/* ASUS */
 #define	USB_VENDOR_SWEEX2	0x177f		/* Sweex */
-#define	USB_VENDOR_METAGEEK	0x1781		/* MetaGeek */
+#define	USB_VENDOR_MECANIQUE	0x1781		/* Mecanique */
 #define	USB_VENDOR_DISPLAYLINK	0x17e9		/* DisplayLink */
 #define	USB_VENDOR_AMIT	0x18c5		/* AMIT */
 #define	USB_VENDOR_QCOM	0x18e8		/* Qcom */
@@ -2012,8 +2012,9 @@
 #define	USB_PRODUCT_MELCO_WLIUCAG300N	0x012e		/* WLI-UC-AG300N */
 #define	USB_PRODUCT_MELCO_WLIUCGN	0x015d		/* WLI-UC-GN */
 
-/* MetaGeek products */
-#define	USB_PRODUCT_METAGEEK_WISPY	0x083e		/* Wi-Spy */
+/* MetaGeek tagged products */
+#define	USB_PRODUCT_MECANIQUE_WISPY	0x083e		/* MetaGeek Wi-Spy */
+#define	USB_PRODUCT_MECANIQUE_TELLSTICK	0x0c30		/* Telldus Tellstick */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index e38871db8e8..86a78ab2af1 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.429 2009/04/21 05:22:55 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.430 2009/04/22 18:56:56 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.425 2009/04/21 05:22:52 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.426 2009/04/22 18:56:33 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -4090,8 +4090,12 @@ const struct usb_known_product usb_known_products[] = {
 	    "WLI-UC-GN",
 	},
 	{
-	    USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY,
-	    "Wi-Spy",
+	    USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_WISPY,
+	    "MetaGeek Wi-Spy",
+	},
+	{
+	    USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_TELLSTICK,
+	    "Telldus Tellstick",
 	},
 	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
@@ -9030,8 +9034,8 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sweex",
 	},
 	{
-	    USB_VENDOR_METAGEEK,
-	    "MetaGeek",
+	    USB_VENDOR_MECANIQUE,
+	    "Mecanique",
 	},
 	{
 	    USB_VENDOR_DISPLAYLINK,