From owner-freebsd-stable@FreeBSD.ORG Wed Jun 9 20:44:58 2004 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D525B16A4CE for ; Wed, 9 Jun 2004 20:44:58 +0000 (GMT) Received: from dastardly.newsbastards.org.72.27.172.IN-addr.ARPA.NOSPAM.dyndns.dk (80-219-172-121.dclient.hispeed.ch [80.219.172.121]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CCE643D46 for ; Wed, 9 Jun 2004 20:44:57 +0000 (GMT) (envelope-from bounce@NOSPAM.dyndns.dk) Received: from Mail.NOSPAM.DynDNS.dK (ipv6.NOSPAM.dyndns.dk [2002:50db:ac79:0:250:daff:fe5a:2107]) (8.11.6/8.11.6-SPAMMERS-DeLiGHt) with ESMTP id i59Kih651623 verified NO) for ; Wed, 9 Jun 2004 22:44:51 +0200 (CEST) (envelope-from bounce@NOSPAM.dyndns.dk) Received: (from beer@localhost) by Mail.NOSPAM.DynDNS.dK (8.11.6/FNORD) id i59KigE51622; Wed, 9 Jun 2004 22:44:42 +0200 (CEST) (envelope-from bounce@NOSPAM.dyndns.dk) Date: Wed, 9 Jun 2004 22:44:42 +0200 (CEST) Message-Id: <200406092044.i59KigE51622@Mail.NOSPAM.DynDNS.dK> X-Authentication-Warning: localhost.newsbastards.org.72.27.172.IN-addr.A: beer set sender to bounce@NOSPAM.dyndns.dk using -f X-Authentication-Warning: localhost.newsbastards.org.72.27.172.IN-addr.A: Processed from queue /tmp X-Authentication-Warning: localhost.newsbastards.org.72.27.172.IN-addr.A: Processed by beer with -C /etc/mail/sendmail.cf-LOCAL To: stable@freebsd.org References: <200404070340.i373exE00357@NOSPAM.spam.NOSPAM.spam.NOSPAM.dyndns.dk> <200406081008.i58A8VR01792@Mail.NOSPAM.DynDNS.dK> <20040608201057.GB43208@hal9000.halplant.com> From: Barry Bouwsma Subject: Re: HEADSUP!!! USB MFC committed.. X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 20:44:59 -0000 Andrew J Caines said thusly: > Any chance these changes might fix the urio/rioutil problem I reported[1]? Probably not (not having looked at the urio source to verify it's independent of umass). > From what I can tell these are addressed to umass issues, so I suspect > not, but since something broke in 4.x and not in 5.x, I'm optimistic it'll > work again in 4.x. The nice thing about the merge that started this thread, is that it made it much easier to substitute the code from -current in place of that in 4.x, as you could tell from the first diff that I posted. It might be worth a try to simply copy the -current src/sys/dev/usb/urio.c into your 4.x source tree (assuming it's recent enough to include the MFC as per Subject: header), and fix where it breaks your kernel/ module build. Giant locking and related headers were the only minor stumbling stones I encountered, and I have no idea what I'm doing. I'm afraid I have no such hardware to be able to build/test such a diff myself. However, looking at the diff between -current and 4.10-ish, there's just two lines added/removed from urio.c: @@ -115,16 +115,16 @@ d_write_t uriowrite; d_ioctl_t urioioctl; -#define URIO_CDEV_MAJOR 143 Static struct cdevsw urio_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, .d_open = urioopen, .d_close = urioclose, .d_read = urioread, .d_write = uriowrite, .d_ioctl = urioioctl, .d_name = "urio", - .d_maj = URIO_CDEV_MAJOR, #if __FreeBSD_version < 500014 .d_bmaj = -1 #endif D_NEEDGIANT is inapplicable to 4.x; I don't see that the other lines would make much difference, but nevertheless, it looks like you could substitute the source with minor difficulties. Beyond this, you'd need to grep around in the source to verify that d_maj is properly set. (And that d_bmaj isn't needed in -stable.) Sorry I can't help here... Anyway, this advice should be relevant to all the usb devices, in case others are having problems. barry bouwsma