[src/trunk]: src/sys/dev/usb Merge changes from FreeBSD:

[imp <imp%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/de416066f316
branches:  trunk
changeset: 541119:de416066f316
user:      imp <imp%NetBSD.org@localhost>
date:      Thu Jan 02 04:19:00 2003 +0000

description:
Merge changes from FreeBSD:
o HP 1220C
o Sanyo SCP-4900 (needs UQ_ASSUME_CM_OVER_DATA to work with umodem)

diffstat:

 sys/dev/usb/usb_quirks.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r e3a67ce7dad1 -r de416066f316 sys/dev/usb/usb_quirks.c
--- a/sys/dev/usb/usb_quirks.c  Thu Jan 02 04:04:23 2003 +0000
+++ b/sys/dev/usb/usb_quirks.c  Thu Jan 02 04:19:00 2003 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: usb_quirks.c,v 1.41 2002/08/26 21:34:28 uwe Exp $      */
-/*     $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.13 1999/11/17 22:33:47 n_hibma Exp $ */
+/*     $NetBSD: usb_quirks.c,v 1.42 2003/01/02 04:19:00 imp Exp $      */
+/*     $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $     */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.41 2002/08/26 21:34:28 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.42 2003/01/02 04:19:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,6 +78,8 @@
  { USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232,          0x102, { UQ_BUS_POWERED }},
  { USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
        0x100, { UQ_ASSUME_CM_OVER_DATA | UQ_NO_STRINGS }},
+ { USB_VENDOR_SANYO, USB_PRODUCT_SANYO_SCP4900,
+       0x000, { UQ_ASSUME_CM_OVER_DATA | UQ_NO_STRINGS }},
  { USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,          0x110, { UQ_POWER_CLAIM }},
  { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U,
                                                    0x000, { UQ_NO_STRINGS }},
@@ -91,6 +93,7 @@
  { USB_VENDOR_HP, USB_PRODUCT_HP_815C,             ANY,   { UQ_BROKEN_BIDIR }},
  { USB_VENDOR_HP, USB_PRODUCT_HP_810C,             ANY,   { UQ_BROKEN_BIDIR }},
  { USB_VENDOR_HP, USB_PRODUCT_HP_830C,             ANY,   { UQ_BROKEN_BIDIR }},
+ { USB_VENDOR_HP, USB_PRODUCT_HP_1220C,                    ANY,   { UQ_BROKEN_BIDIR }},
 
  { 0, 0, 0, { 0 } }
 };