From owner-freebsd-usb@FreeBSD.ORG Sun Dec 16 07:20:02 2007 Return-Path: Delivered-To: freebsd-usb@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EB8D16A417 for ; Sun, 16 Dec 2007 07:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7D3DF13C468 for ; Sun, 16 Dec 2007 07:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lBG7K2SY001824 for ; Sun, 16 Dec 2007 07:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lBG7K2fS001823; Sun, 16 Dec 2007 07:20:02 GMT (envelope-from gnats) Resent-Date: Sun, 16 Dec 2007 07:20:02 GMT Resent-Message-Id: <200712160720.lBG7K2fS001823@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-usb@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yuri Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B9C016A418 for ; Sun, 16 Dec 2007 07:19:27 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 29C1A13C4CC for ; Sun, 16 Dec 2007 07:19:27 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id lBG7JDkB002441 for ; Sun, 16 Dec 2007 07:19:13 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id lBG7JDop002440; Sun, 16 Dec 2007 07:19:13 GMT (envelope-from nobody) Message-Id: <200712160719.lBG7JDop002440@www.freebsd.org> Date: Sun, 16 Dec 2007 07:19:13 GMT From: Yuri To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: usb/118741: [PATCH] Support for Nikon D300 digital camera (as USB mass storage device) X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Dec 2007 07:20:02 -0000 >Number: 118741 >Category: usb >Synopsis: [PATCH] Support for Nikon D300 digital camera (as USB mass storage device) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-usb >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Dec 16 07:20:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Yuri >Release: 7.0-BETA4 >Organization: n/a >Environment: >Description: Support for new Nikon high end digital camera D300. This patch makes the camera to be identified as umassN device and can be mounted as /dev/da0s1. In my opinion this patch should be applied to 7.0 and 6.X There is a caveat though: D300 has USB mode selection in menu: either [MTP/PTP] (default) or [Mass Storage]. In [MTP/PTP] mode camera is designed to work with proprietary Nikon software for Windows only and is not a mass storage device. So in order for it to work with FreeBSD [Mass Storage] mode should first be selected in menu. Thanks, Yuri >How-To-Repeat: >Fix: Patch attached with submission follows: diff -u sys/dev/usb.orig/umass.c sys/dev/usb/umass.c --- sys/dev/usb.orig/umass.c 2007-07-04 22:26:08.000000000 -0700 +++ sys/dev/usb/umass.c 2007-12-15 23:07:48.000000000 -0800 @@ -568,6 +568,10 @@ UMASS_PROTO_ATAPI, NO_INQUIRY }, + { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_D300, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_QUIRKS + }, { USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, WRONG_CSWSIG diff -u sys/dev/usb.orig/usbdevs sys/dev/usb/usbdevs --- sys/dev/usb.orig/usbdevs 2007-12-05 19:10:36.000000000 -0800 +++ sys/dev/usb/usbdevs 2007-12-15 23:07:32.000000000 -0800 @@ -1754,6 +1754,7 @@ /* Nikon products */ product NIKON E990 0x0102 Digital Camera E990 product NIKON LS40 0x4000 CoolScan LS40 ED +product NIKON D300 0x041a Digital Camera D300 /* NovaTech Products */ product NOVATECH NV902 0x9020 NovaTech NV-902W >Release-Note: >Audit-Trail: >Unformatted: