-ubsa needs to be attached as whole device on USB, because it sets

the configuration. The match/attach code was assuming whole-device
 attach args all the time.
-Use the first (ie index 0) configuration for ubsa -- it makes the
 code work in at least one case (PR kern/39211 by Frank Wille), and
 there is no indication that an alternative configuration would
 be needed. (I've admittedly never seen a usb device with more than
 one configuration.)
This fixes mistakes when uhmodem support was added, and the changes were
not tested with a Huawei device yet. So please test if you can.
This commit is contained in:
drochner 2008-07-31 22:01:15 +00:00
parent 9a87cf1721
commit 551e75d811
2 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: files.usb,v 1.84 2008/05/26 00:23:05 christos Exp $
# $NetBSD: files.usb,v 1.85 2008/07/31 22:01:15 drochner Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@ -237,8 +237,7 @@ file dev/usb/uvscom.c uvscom
define ubsa_common
file dev/usb/ubsa_common.c ubsa_common
device ubsa: ucombus, ubsa_common
#attach ubsa at usbdevif
attach ubsa at usbifif
attach ubsa at usbdevif
file dev/usb/ubsa.c ubsa
# Huawei E220 3G/HSDPA modem (ubsa)

View File

@ -1,4 +1,4 @@
/* $NetBSD: ubsavar.h,v 1.5 2008/05/24 16:40:58 cube Exp $ */
/* $NetBSD: ubsavar.h,v 1.6 2008/07/31 22:01:15 drochner Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@ -55,7 +55,7 @@
#define UBSA_MODVER 1 /* module version */
#define UBSA_DEFAULT_CONFIG_INDEX 1
#define UBSA_DEFAULT_CONFIG_INDEX 0
#define UBSA_IFACE_INDEX_OFFSET 0
#define UBSA_INTR_INTERVAL 100 /* ms */