From owner-freebsd-hackers  Mon Dec  3 15:19: 9 2001
Delivered-To: freebsd-hackers@freebsd.org
Received: from boreas.isi.edu (boreas.isi.edu [128.9.160.161])
	by hub.freebsd.org (Postfix) with ESMTP
	id 64B0F37B416; Mon,  3 Dec 2001 15:19:06 -0800 (PST)
Received: from isi.edu (ahsv95wvp2bulkk1@hbo.isi.edu [128.9.160.75])
	by boreas.isi.edu (8.11.6/8.11.2) with ESMTP id fB3NJ3N23695;
	Mon, 3 Dec 2001 15:19:03 -0800 (PST)
Message-ID: <3C0C0867.6090209@isi.edu>
Date: Mon, 03 Dec 2001 15:19:03 -0800
From: Lars Eggert <larse@ISI.EDU>
Organization: USC Information Sciences Institute
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:0.9.6) Gecko/20011121
X-Accept-Language: en, de
MIME-Version: 1.0
To: Bernd Walter <ticso@cicely8.cicely.de>
Cc: n_hibma@FreeBSD.ORG, hackers@FreeBSD.ORG
Subject: Success! [with patch] (was Re: umass & ATAPI)
References: <3C0BC364.9080904@isi.edu> <20011203213300.H63943@cicely8.cicely.de> <3C0BE3E7.4010003@isi.edu> <20011203220224.I63943@cicely8.cicely.de>
Content-Type: multipart/mixed;
 boundary="------------010001060904070205000502"
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.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-hackers>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG

This is a multi-part message in MIME format.
--------------010001060904070205000502
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Bernd Walter wrote:

> But from memory it sounds like a new device for the quirk table.

Yes, adding quirks to scsi_da.c and enabling ATAPI in umass.c made the 
camera attach and mount correctly. Copying also works fine. Patches 
attached, if someone would like to commit them.

Thanks for the help! That was quite painless...

Lars
-- 
Lars Eggert <larse@isi.edu>               Information Sciences Institute
http://www.isi.edu/larse/              University of Southern California

--------------010001060904070205000502
Content-Type: text/plain;
 name="scsi_da.c.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="scsi_da.c.patch"

--- /usr/src/sys/cam/scsi/scsi_da.c	Sun Jul 29 17:48:20 2001
+++ scsi_da.c	Mon Dec  3 14:52:55 2001
@@ -246,6 +246,14 @@
 		/*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE
 	},
 	{
+		/*
+		 * Pentax Optio 430 Digital Camera
+		 * (will probably also work for the Optio 330)
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "PENTAX", "DIGITAL_CAMERA", "*"},
+		/*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE
+	},
+	{
 		{T_OPTICAL, SIP_MEDIA_REMOVABLE, "FUJITSU", "MCF3064AP", "*"},
 		/*quirks*/ DA_Q_NO_6_BYTE
 	}

--------------010001060904070205000502
Content-Type: text/plain;
 name="umass.c.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="umass.c.patch"

--- /usr/src/sys/dev/usb/umass.c	Sat Jan  6 14:36:15 2001
+++ umass.c	Mon Dec  3 14:47:47 2001
@@ -575,7 +575,7 @@
 
 	dd = usbd_get_device_descriptor(udev);
 
-#if 0
+#if 1
 	/* 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) {
@@ -656,7 +656,7 @@
 		break;
 	case USUBCLASS_SFF8020I:
 	case USUBCLASS_SFF8070I:
-#if 0
+#if 1
 		/* XXX ATAPI support is untested. Don't use it for the moment */
 		sc->proto |= PROTO_ATAPI;
 		break;

--------------010001060904070205000502--


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