Date: Fri, 31 Jan 2003 17:01:05 -0800 (PST) From: Nate Lawson <nate@root.org> To: Tom Rhodes <trhodes@FreeBSD.org> 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 Message-ID: <Pine.BSF.4.21.0301311659340.97916-100000@root.org> In-Reply-To: <20030131223423.A5C8537B411@hub.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <mcgovern@tick.beta.com> (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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0301311659340.97916-100000>