From 998b1e80fc2a39a01ba3030d36229ccbd86318b8 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Sun, 14 May 2000 19:51:38 +0000
Subject: [PATCH] Sync with NetBSD: Add quirks for self-powered hubs that are
 not.

---
 sys/dev/usb/usb_quirks.c | 6 +++++-
 sys/dev/usb/usb_quirks.h | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 6be08179f707..109de72cee0a 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_quirks.c,v 1.21 2000/01/17 01:43:31 augustss Exp $	*/
+/*	$NetBSD: usb_quirks.c,v 1.26 2000/04/27 15:26:50 augustss Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -62,9 +62,13 @@ Static struct usbd_quirk_entry {
  { USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,	    0x100, { UQ_NO_STRINGS }},
  { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,	    0x002, { UQ_NO_STRINGS }},
  { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1, 0x101, { UQ_NO_STRINGS }},
+ { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,     0x101, { UQ_NO_STRINGS }},
  { USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,	    0x0a2, { UQ_BAD_ADC }},
+ { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,	    0x103, { UQ_BAD_ADC }},
  { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,      0x000, { UQ_BAD_AUDIO }},
  { USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,    0x110, { UQ_SPUR_BUT_UP }},
+ { USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100,         0x102, { UQ_BUS_POWERED }},
+ { USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232,          0x102, { UQ_BUS_POWERED }},
  { 0, 0, 0, { 0 } }
 };
 
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index eb263df6127f..db5f8306d4cb 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/dev/usb/usb_quirks.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_quirks.h,v 1.9 1999/11/15 22:04:15 augustss Exp $	*/
+/*	$NetBSD: usb_quirks.h,v 1.11 2000/04/27 15:26:50 augustss Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -48,8 +48,6 @@ struct usbd_quirks {
 #define UQ_BUS_POWERED	0x20	/* device is bus powered, despite claim */
 #define UQ_BAD_AUDIO	0x40	/* device claims audio class, but isn't */
 #define UQ_SPUR_BUT_UP	0x80	/* spurious mouse button up events */
-#define UQ_NO_TSLEEP	0x100	/* device needs to work at interrupt
-				 * context, must avoid tsleep! */
 };
 
 extern struct usbd_quirks usbd_no_quirk;