Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of UQ_ASSUME_CM_OVER_DATA quirk; it's handled differently now.

This commit is contained in:
augustss 2000-12-11 05:41:00 +00:00
parent 0f17615da7
commit 6e11678a15
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/usb/umodem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umodem.c,v 1.33 2000/11/10 14:08:32 augustss Exp $ */
/* $NetBSD: umodem.c,v 1.34 2000/12/11 05:41:00 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -258,9 +258,6 @@ USB_ATTACH(umodem)
goto bad;
}
if (usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_ASSUME_CM_OVER_DATA) {
sc->sc_cm_over_data = 1;
} else {
if (sc->sc_cm_cap & USB_CDC_CM_OVER_DATA) {
if (sc->sc_acm_cap & USB_CDC_ACM_HAS_FEATURE)
err = umodem_set_comm_feature(sc,
@ -274,7 +271,6 @@ USB_ATTACH(umodem)
}
sc->sc_cm_over_data = 1;
}
}
sc->sc_dtr = -1;
uca.portno = UCOM_UNK_PORTNO;

4
sys/dev/usb/usb_quirks.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_quirks.c,v 1.32 2000/11/14 15:33:04 augustss Exp $ */
/* $NetBSD: usb_quirks.c,v 1.33 2000/12/11 05:41:00 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.13 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@ -72,7 +72,7 @@ Static struct usbd_quirk_entry {
{ USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100, 0x102, { UQ_BUS_POWERED }},
{ 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 }},
0x100, { 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 }},

5
sys/dev/usb/usb_quirks.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_quirks.h,v 1.15 2000/10/24 14:56:09 augustss Exp $ */
/* $NetBSD: usb_quirks.h,v 1.16 2000/12/11 05:41:00 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.9 1999/11/12 23:31:03 n_hibma Exp $ */
/*
@ -49,8 +49,7 @@ struct usbd_quirks {
#define UQ_BAD_AUDIO 0x0040 /* device claims audio class, but isn't */
#define UQ_SPUR_BUT_UP 0x0080 /* spurious mouse button up events */
#define UQ_NO_XU 0x0100 /* audio device has broken extension unit */
#define UQ_ASSUME_CM_OVER_DATA 0x0200 /* modem device breaks on cm over data */
#define UQ_POWER_CLAIM 0x0400 /* hub lies about power status */
#define UQ_POWER_CLAIM 0x0200 /* hub lies about power status */
};
extern struct usbd_quirks usbd_no_quirk;