Module Name: src
Committed By: garbled
Date: Thu Mar 28 04:07:55 UTC 2013
Modified Files:
src/sys/dev/usb: usb_quirks.c usbdevs.h usbdevs_data.h
Log Message:
Regen usbdevs.
Modify quirks to allow a product id of ALL
Set all TRIPPWIRE2 vendor devices to ignore hid. Three in a row means they
are all probably like this.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.633 -r1.634 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.634 -r1.635 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.78 src/sys/dev/usb/usb_quirks.c:1.79
--- src/sys/dev/usb/usb_quirks.c:1.78 Wed Mar 20 15:40:29 2013
+++ src/sys/dev/usb/usb_quirks.c Thu Mar 28 04:07:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.78 2013/03/20 15:40:29 garbled Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.79 2013/03/28 04:07:55 garbled Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.78 2013/03/20 15:40:29 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.79 2013/03/28 04:07:55 garbled Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,10 +60,7 @@ Static const struct usbd_quirk_entry {
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MICROCHIP, USB_PRODUCT_MICROCHIP_PICKIT1,
ANY, { UQ_HID_IGNORE }},
- { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS,
- ANY, { UQ_HID_IGNORE }},
- { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMARTLCD,
- ANY, { UQ_HID_IGNORE }},
+ { USB_VENDOR_TRIPPLITE2, ANY, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE, 0x100, { UQ_NO_SET_PROTO}},
@@ -160,7 +157,7 @@ usbd_find_quirk(usb_device_descriptor_t
for (t = usb_quirks; t->idVendor != 0; t++) {
if (t->idVendor == vendor &&
- t->idProduct == product &&
+ (t->idProduct == ANY || t->idProduct == product) &&
(t->bcdDevice == ANY || t->bcdDevice == revision))
break;
}
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.633 src/sys/dev/usb/usbdevs.h:1.634
--- src/sys/dev/usb/usbdevs.h:1.633 Sun Mar 24 23:00:48 2013
+++ src/sys/dev/usb/usbdevs.h Thu Mar 28 04:07:55 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.633 2013/03/24 23:00:48 cheusov Exp $ */
+/* $NetBSD: usbdevs.h,v 1.634 2013/03/28 04:07:55 garbled Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp
+ * NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp
*/
/*
@@ -3096,6 +3096,7 @@
#define USB_PRODUCT_TRIPPLITE_U209 0x2008 /* U209 Serial adapter */
#define USB_PRODUCT_TRIPPLITE2_UPS 0x1007 /* Tripp Lite UPS */
#define USB_PRODUCT_TRIPPLITE2_SMARTLCD 0x2009 /* SmartLCD UPS */
+#define USB_PRODUCT_TRIPPLITE2_AVR550U 0x2010 /* Tripp Lite AVR550U */
/* Trumpion products */
#define USB_PRODUCT_TRUMPION_T33521 0x1003 /* USB/MP3 decoder */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.634 src/sys/dev/usb/usbdevs_data.h:1.635
--- src/sys/dev/usb/usbdevs_data.h:1.634 Sun Mar 24 23:00:48 2013
+++ src/sys/dev/usb/usbdevs_data.h Thu Mar 28 04:07:55 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.634 2013/03/24 23:00:48 cheusov Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.635 2013/03/28 04:07:55 garbled Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp
+ * NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp
*/
/*
@@ -9343,6 +9343,10 @@ const struct usb_product usb_products[]
"SmartLCD UPS",
},
{
+ USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_AVR550U,
+ "Tripp Lite AVR550U",
+ },
+ {
USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
"USB/MP3 decoder",
},
@@ -9879,4 +9883,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1940;
+const int usb_nproducts = 1941;
