From timon@memphis.mephi.ru  Tue Jul 22 01:33:05 2003
Return-Path: <timon@memphis.mephi.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EB69C37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Jul 2003 01:33:05 -0700 (PDT)
Received: from memphis.mephi.ru (memphis.mephi.ru [194.67.67.234])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C4CEE43FE1
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Jul 2003 01:32:55 -0700 (PDT)
	(envelope-from timon@memphis.mephi.ru)
Received: from memphis.mephi.ru (smmsp@localhost [127.0.0.1])
	by memphis.mephi.ru (8.12.6p2/8.12.6) with ESMTP id h6M8WYIP048986;
	Tue, 22 Jul 2003 12:32:43 +0400 (MSD)
	(envelope-from timon@memphis.mephi.ru)
Received: (from timon@localhost)
	by memphis.mephi.ru (8.12.6p2/8.12.6/Submit) id h6LFc5d9006824;
	Mon, 21 Jul 2003 19:38:05 +0400 (MSD)
Message-Id: <200307211538.h6LFc5d9006824@memphis.mephi.ru>
Date: Mon, 21 Jul 2003 19:38:05 +0400 (MSD)
From: "Artem 'Zazoobr' Ignatjev" <timon@memphis.mephi.ru>
Reply-To: "Artem 'Zazoobr' Ignatjev" <timon@memphis.mephi.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: antirez@invece.org, johnjen@reynoldsnet.org
Subject: Add support for Canon PowerShot A60 to s10sh port
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54743
>Category:       ports
>Synopsis:       Add support for Canon PowerShot A60 to s10sh port
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 22 01:40:18 PDT 2003
>Closed-Date:    Fri Aug 15 09:51:41 PDT 2003
>Last-Modified:  Fri Aug 15 10:00:30 PDT 2003
>Originator:     Artem 'Zazoobr' Ignatjev
>Release:        FreeBSD 5.0-RELEASE-p4 i386
>Organization:
PhML 1511 tied to MEPhI
>Environment:
System: FreeBSD memphis.mephi.ru 5.0-RELEASE-p4 FreeBSD 5.0-RELEASE-p4 #3: Wed Apr 2 22:44:43 MSD 2003 root@:/usr/src/sys/i386/compile/MEMPHIS.5 i386


	
>Description:
	Following patch lets s10sh talk to Canon PowerShot A60 cameras
	
>How-To-Repeat:
	# cd /usr/ports/graphics/s10sh && make install
	plug the Canon A60 PowerShot camera to your computer
	# s10sh -u -a
	 It will complain that no camera found
	
>Fix:

	apply following patch:

--- patch-s10sh-a60 begins here ---
diff -U3 /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.c s10sh-0.2.0/usb.c
--- /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.c	Mon Jul 21 19:24:25 2003
+++ s10sh-0.2.0/usb.c	Mon Jul 21 19:27:37 2003
@@ -90,6 +90,12 @@
 						printf("Canon A20 found\n");
 					return USB_INIT_A20;
 					break;
+				case PRODUCT_ID_A60:
+					*camera_dev = dev;
+					if (opt_debug)
+						printf("Canon A60 found\n");
+					return USB_INIT_A20;
+					break;
 				case PRODUCT_ID_S100_EU:
 				case PRODUCT_ID_S100_US:
 					*camera_dev = dev;
diff -U3 /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.h s10sh-0.2.0/usb.h
--- /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.h	Mon Jul 21 19:24:25 2003
+++ s10sh-0.2.0/usb.h	Mon Jul 21 19:25:25 2003
@@ -29,6 +29,7 @@
 #define PRODUCT_ID_S10          0x3041	/* PowerShot S10 */
 #define PRODUCT_ID_S20          0x3043	/* PowerShot S20 */
 #define PRODUCT_ID_A20		0x304E  /* PowerShot A20 */
+#define PRODUCT_ID_A60		0x3074	/* PowerShot A60 */
 #define PRODUCT_ID_S100_US	0x3045	/* S100, aka. Digital Ixus, Elph */
 #define PRODUCT_ID_S100_EU	0x3047	/* S100, aka. Digital Ixus, Elph */
 #define PRODUCT_ID_G1		0x3048	/* PowerShot G1 */
--- patch-s10sh-a60 ends here ---


>Release-Note:
>Audit-Trail:

From: Oliver Lehmann <lehmann@ans-netz.de>
To: freebsd-gnats-submit@FreeBSD.org, timon@memphis.mephi.ru
Cc:  
Subject: Re: ports/54743: Add support for Canon PowerShot A60 to s10sh port
Date: Sat, 2 Aug 2003 15:41:24 +0200

 Followups:
 	ports/54750
State-Changed-From-To: open->closed 
State-Changed-By: ceri 
State-Changed-When: Fri Aug 15 09:49:59 PDT 2003 
State-Changed-Why:  
Superceded by ports/55520, which is already committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54743 

From: Ceri Davies <ceri@FreeBSD.org>
To: FreeBSD Gnats Submit <freebsd-gnats-submit@FreeBSD.org>
Cc:  
Subject: Re: ports/54743: Add support for Canon PowerShot A60 to s10sh port
Date: Fri, 15 Aug 2003 17:48:39 +0100

 Adding to audit trail, from misfiled PR ports/55521:
 
 Date: Tue, 12 Aug 2003 22:19:58 -0700
 From: John Reynolds <johnjen@reynoldsnet.org>
 Message-Id: <16185.51838.258844.91311@whale.home-net>
 References: <200307211538.h6LFc5d9006824@memphis.mephi.ru>
 
  This PR can be closed now. I have just submited a PR to have the port rev'ed to
  0.2.1 which can be retreived (manually for now) at 
  
    http://www.reynoldsnet.org/s10sh/s10sh-0.2.1.tar.gz
  
  which integrates this patch as well as many others. Once the new PR (don't have
  a number yet) is handled and the port is updated, this ticket can be closed
  out.
  
  -jr
  
  -- 
  John & Jennifer Reynolds  johnjen at reynoldsnet.org        www.reynoldsnet.org
  Sr. Physical Design Engineer - WCCG/CCE PDE     jreynold at sedona.ch.intel.com
  Running FreeBSD since 2.1.5-RELEASE.               FreeBSD: The Power to Serve!
  "Unix is user friendly, it's just particular about the friends it chooses."
 
>Unformatted:
