From owner-freebsd-current  Mon Mar 18  4:38: 4 2002
Delivered-To: freebsd-current@freebsd.org
Received: from outel.org (outel.org [207.173.133.28])
	by hub.freebsd.org (Postfix) with ESMTP id CD0DD37B404
	for <freebsd-current@FreeBSD.ORG>; Mon, 18 Mar 2002 04:38:00 -0800 (PST)
Received: from [192.168.1.20] (athlon [192.168.1.20])
	by outel.org (8.11.6/8.11.6) with ESMTP id g2ICbrM20374
	for <freebsd-current@FreeBSD.ORG>; Mon, 18 Mar 2002 04:37:54 -0800 (PST)
	(envelope-from qumqats@outel.org)
Date: Mon, 18 Mar 2002 04:37:38 -0800
From: "Joel M. Baldwin" <qumqats@outel.org>
To: freebsd-current@FreeBSD.ORG
Subject: dev/usb/uhci.c is messed up again
Message-ID: <98076166.1016426258@[192.168.1.20]>
In-Reply-To: <20020318111846.GA10893@elvis.mu.org>
References:  <20020318111846.GA10893@elvis.mu.org>
X-Mailer: Mulberry/2.1.2 (Win32)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG


/usr/src/sys/dev/usb/uhci.c is messed up again for those
of us that have the kernel compiled with UHCI_DEBUG.  The
following patch appears to get it to at least compile.

problem summary:

1.)	uhci_dump_ii is defined twice,
	 starting at lines 805 and 920.

2.)	a missing ; at the end of line 2764.



805,841d804
< void
< uhci_dump_ii(uhci_intr_info_t *ii)
< {
<       usbd_pipe_handle pipe;
<       usb_endpoint_descriptor_t *ed;
<       usbd_device_handle dev;
<
< #ifdef DIAGNOSTIC
< #define DONE ii->isdone
< #else
< #define DONE 0
< #endif
<       if (ii == NULL) {
<               printf("ii NULL\n");
<               return;
<       }
<       if (ii->xfer == NULL) {
<               printf("ii %p: done=%d xfer=NULL\n",
<                      ii, DONE);
<               return;
<       }
<       pipe = ii->xfer->pipe;
<       if (pipe == NULL) {
<               printf("ii %p: done=%d xfer=%p pipe=NULL\n",
<                      ii, DONE, ii->xfer);
<               return;
<       }
<       ed = pipe->endpoint->edesc;
<       dev = pipe->device;
<       printf("ii %p: done=%d xfer=%p dev=%p vid=0x%04x pid=0x%04x 
addr=%d pipe=%p ep=0x%02x attr=0x%02x\n",
<              ii, DONE, ii->xfer, dev,
<               UGETW(dev->ddesc.idVendor),
<               UGETW(dev->ddesc.idProduct),
<              dev->address, pipe,
<              ed->bEndpointAddress, ed->bmAttributes);
< #undef DONE
< }
2764c2727
<       splx(s)
---
>       splx(s);


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message