kern/67115: Added support for Neodio-3260 8-in-1 multi format USB memory card / flash controller

[Jukka A. Ukkonen]

>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 at 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: