From kstailey@surfbest.net  Tue Feb 19 18:20:22 2002
Return-Path: <kstailey@surfbest.net>
Received: from server11.safepages.com (server11.safepages.com [216.127.146.25])
	by hub.freebsd.org (Postfix) with ESMTP id 99CAC37B4DA
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Feb 2002 18:20:17 -0800 (PST)
Received: from hermes.surfbest.net (reston-gnap-ip-216007-31.dynamic.ziplink.net [216.8.7.31])
	by server11.safepages.com (Postfix) with ESMTP id 90D9014F537
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 20 Feb 2002 02:20:09 +0000 (GMT)
Received: (from kstailey@localhost)
	by hermes.surfbest.net (8.11.6/8.11.6) id g1K2Ihp28722;
	Tue, 19 Feb 2002 21:18:43 -0500 (EST)
	(envelope-from kstailey)
Message-Id: <200202200218.g1K2Ihp28722@hermes.surfbest.net>
Date: Tue, 19 Feb 2002 21:18:43 -0500 (EST)
From: Ken Stailey <kstailey@surfbest.net>
Reply-To: Ken Stailey <kstailey@surfbest.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Canon Powershot A20 support for s20sh
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         35128
>Category:       ports
>Synopsis:       Canon Powershot A20 support for s20sh
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 19 18:30:00 PST 2002
>Closed-Date:    Sat Apr 20 16:07:04 PDT 2002
>Last-Modified:  Sat Apr 20 16:07:04 PDT 2002
>Originator:     Ken Stailey
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
self
>Environment:
System: FreeBSD hermes.surfbest.net 4.5-STABLE FreeBSD 4.5-STABLE #7: Mon Feb 4 22:33:35 EST 2002 kstailey@hermes.surfbest.net:/usr/src/sys/compile/HERMES i386


	
>Description:
s10sh does not recognize the A20 even though it can support it.

>How-To-Repeat:
N/A

>Fix:

--- usb.c.DIST	Tue Mar 13 08:46:18 2001
+++ usb.c	Sun Dec 30 07:20:47 2001
@@ -84,6 +84,12 @@
 						printf("Canon S20 found\n");
 					return USB_INIT_S20;
 					break;
+				case PRODUCT_ID_A20:
+					*camera_dev = dev;
+					if (opt_debug)
+						printf("Canon A20 found\n");
+					return USB_INIT_A20;
+					break;
 				case PRODUCT_ID_S100_EU:
 				case PRODUCT_ID_S100_US:
 					*camera_dev = dev;
--- usb.h.DIST	Sun Dec 30 07:18:23 2001
+++ usb.h	Sun Dec 30 07:20:42 2001
@@ -19,12 +19,14 @@
 #define USB_INIT_S20            2       /* S20 found */
 #define USB_INIT_S100		3	/* S100 (Digital Ixus) found */
 #define USB_INIT_G1		4	/* G1 found */
+#define USB_INIT_A20		5	/* A20 found */
 #define USB_INIT_NEW		100	/* Unsupported PowerShot found! */
 #define USB_INIT_FAILED         -1      /* Unable to initialize USB */
 
 #define VENDOR_ID_CANON         0x04A9
 #define PRODUCT_ID_S10          0x3041	/* PowerShot S10 */
 #define PRODUCT_ID_S20          0x3043	/* PowerShot S20 */
+#define PRODUCT_ID_A20		0x304E  /* PowerShot A20 */
 #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 */
>Release-Note:
>Audit-Trail:

From: Anders Nordby <anders@fix.no>
To: freebsd-gnats-submit@FreeBSD.org, johnjen@reynoldsnet.org
Cc: kstailey@surfbest.net
Subject: Re: ports/35128: Canon Powershot A20 support for s20sh
Date: Sat, 20 Apr 2002 01:24:30 +0200

 Hello,
 
 John, are you OK with this patch?
 
 Cheers,
 
 -- 
 Anders.

From: John Reynolds <johnjen@reynoldsnet.org>
To: Anders Nordby <anders@fix.no>
Cc: freebsd-gnats-submit@FreeBSD.org, kstailey@surfbest.net
Subject: Re: ports/35128: Canon Powershot A20 support for s20sh
Date: Sat, 20 Apr 2002 06:36:46 -0700

 Anders Nordby wrote:
 > 
 > Hello,
 > 
 > John, are you OK with this patch?
 > 
 > Cheers,
 
 Sorry for the delayed response ....
 
 Sure thing. It looks pretty harmless to me. However, I'm wondering
 if the author of the patch has contacted the author of s10sh
 himself first (Antirez). I have found him very willing to 
 incorporate patches (I gave him a huge mega-patch which is the 
 meat of the differences between the previous version and 0.2.0).
 
 I'd say commit it now so that people can use it, but if at all
 possible, work with Antirez to get it in the next revision. Then
 if that happens we can roll back the patch. 
 
 -Jr
State-Changed-From-To: open->closed 
State-Changed-By: anders 
State-Changed-When: Sat Apr 20 16:06:30 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=35128 
>Unformatted:
