From owner-freebsd-bugs@FreeBSD.ORG Mon May 24 00:40:51 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AF8F16A4CE for ; Mon, 24 May 2004 00:40:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 304FE43D31 for ; Mon, 24 May 2004 00:40:51 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i4O7eE5j000398 for ; Mon, 24 May 2004 00:40:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i4O7eE5l000397; Mon, 24 May 2004 00:40:14 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 24 May 2004 00:40:14 -0700 (PDT) Resent-Message-Id: <200405240740.i4O7eE5l000397@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jukka A. Ukkonen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83D1616A4CF for ; Mon, 24 May 2004 00:31:25 -0700 (PDT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D63B43D39 for ; Mon, 24 May 2004 00:31:25 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.11/8.12.11) with ESMTP id i4O7UjAl043543 for ; Mon, 24 May 2004 00:30:45 -0700 (PDT) (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.11/8.12.11/Submit) id i4O7Uj2F043542; Mon, 24 May 2004 00:30:45 -0700 (PDT) (envelope-from nobody) Message-Id: <200405240730.i4O7Uj2F043542@www.freebsd.org> Date: Mon, 24 May 2004 00:30:45 -0700 (PDT) From: "Jukka A. Ukkonen" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: kern/67115: Added support for Neodio-3260 8-in-1 multi format USB memory card / flash controller X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2004 07:40:51 -0000 >Number: 67115 >Category: kern >Synopsis: Added support for Neodio-3260 8-in-1 multi format USB memory card / flash controller >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 24 00:40:14 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Jukka A. Ukkonen >Release: 4.10-PRERELEASE >Organization: Mawit Ltd. >Environment: FreeBSD mjolnir 4.10-PRERELEASE FreeBSD 4.10-PRERELEASE #16: Mon May 24 09:39:44 EEST 2004 root@mjolnir:/usr/src/sys/compile/Mjolnir i386 >Description: These changes allow FreeBSD to mount various types of memory cards via Neodio-3260 multi port/format control devices. >How-To-Repeat: No problem. Added functionality. >Fix: Find the unidiff formatted patch below. (The tab characters have been preserved.) --- umass.c.old Mon May 24 09:53:27 2004 +++ umass.c Mon May 24 09:55:39 2004 @@ -596,6 +596,28 @@ dd = usbd_get_device_descriptor(udev); + /* + * Some examples about the inquiry fuzz... + * http://www.harald-schreiber.de/linux-2.4.2-Casio-QV.diff + * http://guillaume.valerie-et-guillaume.com/C1700T/ + */ + + if (UGETW(dd->idVendor) == USB_VENDOR_NEODIO) { + switch (UGETW(dd->idProduct)) { + case USB_PRODUCT_NEODIO_ND3260: + case USB_PRODUCT_NEODIO_ND5010: + sc->proto = UMASS_PROTO_SCSI | UMASS_PROTO_BBB; + sc->quirks |= FORCE_SHORT_INQUIRY; + + return(UMATCH_VENDOR_PRODUCT); + break; + + default: + /* void */; + break; + } + } + /* XXX ATAPI support is untested. Don't use it for the moment */ if (UGETW(dd->idVendor) == USB_VENDOR_SHUTTLE && UGETW(dd->idProduct) == USB_PRODUCT_SHUTTLE_EUSB) { --- usbdevs.old Thu May 20 19:12:54 2004 +++ usbdevs Mon May 24 09:56:25 2004 @@ -1004,6 +1004,7 @@ /* NEODIO products */ product NEODIO ND5010 0x5010 Multi-format Flash Controller +product NEODIO ND3260 0x3260 8-in-1 Multi-format Flash Controller /* NetChip Technology Products */ product NETCHIP TURBOCONNECT 0x1080 Turbo-Connect >Release-Note: >Audit-Trail: >Unformatted: