From owner-cvs-all Fri Jan 31 17: 1:12 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A20937B401 for ; Fri, 31 Jan 2003 17:01:11 -0800 (PST) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id 3486943F75 for ; Fri, 31 Jan 2003 17:01:06 -0800 (PST) (envelope-from nate@rootlabs.com) Received: (qmail 97929 invoked by uid 1000); 1 Feb 2003 01:01:05 -0000 Date: Fri, 31 Jan 2003 17:01:05 -0800 (PST) From: Nate Lawson To: Tom Rhodes Cc: cvs-all@freebsd.org, cvs-committers@freebsd.org Subject: Re: cvs commit: src/sys/dev/usb umass.c usbdevs usbdevs.h usbdevs_data.h In-Reply-To: <20030131223423.A5C8537B411@hub.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 31 Jan 2003, Tom Rhodes wrote: > Modified files: (Branch: RELENG_4) > sys/dev/usb umass.c usbdevs usbdevs.h usbdevs_data.h > Log: > MFC: Add support for the Trek Thumbdrive 8MB USB Drive. > > PR: 46004 > Submitted by: Brian J. McGovern (original version) > > --- src/sys/dev/usb/umass.c:1.11.2.13 Thu Nov 21 13:26:14 2002 > +++ src/sys/dev/usb/umass.c Fri Jan 31 14:34:16 2003 > @@ -377,7 +377,10 @@ > # define XFER_CBI_RESET1 5 > # define XFER_CBI_RESET2 6 > # define XFER_CBI_RESET3 7 > - > + { USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB, RID_WILDCARD, > + UMASS_PROTO_ATAPI | UMASS_PROTO_BBB, > + IGNORE_RESIDUE > + }, > # define XFER_NR 9 /* maximum number */ > > usbd_xfer_handle transfer_xfer[XFER_NR]; /* for ctrl xfers */ Um, this can't be right. Please check your merges before committing (cvs diff or better, make). -Nate To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message