From owner-freebsd-ports@FreeBSD.ORG Sun Jun 29 17:25:39 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64A7137B401 for ; Sun, 29 Jun 2003 17:25:39 -0700 (PDT) Received: from swan.mail.pas.earthlink.net (swan.mail.pas.earthlink.net [207.217.120.123]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECD214400B for ; Sun, 29 Jun 2003 17:25:38 -0700 (PDT) (envelope-from welchsm@earthlink.net) Received: from daisy.psp.pas.earthlink.net ([207.217.78.223]) by swan.mail.pas.earthlink.net with esmtp (Exim 3.33 #1) id 19WmUD-00066l-00; Sun, 29 Jun 2003 17:25:37 -0700 Received: from [207.217.78.11] by EarthlinkWAM via HTTP; Sun Jun 29 17:25:37 PDT 2003 Message-ID: <5165036.1056932737840.JavaMail.nobody@daisy.psp.pas.earthlink.net> Date: Sun, 29 Jun 2003 17:23:13 -0500 (GMT) From: Sean Welch To: johnjen@reynoldsnet.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Mailer: Earthlink Web Access Mail version 3.0 X-Mailman-Approved-At: Sun, 29 Jun 2003 18:21:55 -0700 Subject: Update for port s10sh -- add Elph S400 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Sean_Welch@alum.wofford.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 00:25:39 -0000 I seem to have successfully hacked in support for my new Canon Elph S400 camera. I only added a couple few lines, but I now get this output: Unsupported Canon digicam found, S10sh will try to use The s10, s20, s100, G1 protocol. Cross your fingers! [Canon PowerShot S400] D:> I'm able to download photos and movies without problem. This can probably be cleaned up a bit, but it works at any rate. The patches are below: --- patch-usb.c.orig Sun Dec 8 17:43:52 2002 +++ patch-usb.c Sun Jun 29 17:43:17 2003 @@ -13,7 +13,7 @@ case PRODUCT_ID_S100_EU: case PRODUCT_ID_S100_US: *camera_dev = dev; -@@ -97,6 +103,12 @@ +@@ -97,6 +103,13 @@ printf("Canon G1 found\n"); return USB_INIT_G1; break; @@ -23,10 +23,11 @@ + printf("Canon G3 found\n"); + return USB_INIT_G3; + break; ++ case PRODUCT_ID_S400: case PRODUCT_ID_NEXTDIGICAM1: case PRODUCT_ID_NEXTDIGICAM2: case PRODUCT_ID_NEXTDIGICAM3: -@@ -118,6 +130,7 @@ +@@ -118,6 +131,7 @@ dev->descriptor.idProduct); break; } --- patch-usb.h.orig Sun Dec 8 17:43:52 2002 +++ patch-usb.h Sun Jun 29 17:43:17 2003 @@ -1,12 +1,13 @@ --- usb.h.orig Tue Mar 13 06:46:18 2001 +++ usb.h Sat Dec 7 06:16:19 2002 -@@ -19,15 +19,20 @@ +@@ -19,15 +19,22 @@ #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_G2 6 /* G2 found */ +#define USB_INIT_G3 7 /* G3 found */ ++#define USB_INIT_S400 8 /* S400 (Digital Ixus) found */ #define USB_INIT_NEW 100 /* Unsupported PowerShot found! */ #define USB_INIT_FAILED -1 /* Unable to initialize USB */ @@ -18,6 +19,7 @@ #define PRODUCT_ID_S100_EU 0x3047 /* S100, aka. Digital Ixus, Elph */ #define PRODUCT_ID_G1 0x3048 /* PowerShot G1 */ +#define PRODUCT_ID_G3 0x306E ++#define PRODUCT_ID_S400 0x3075 /* PowerShot S400 */ /* The Canon USB protocol of the S10, S20, S100, G1 is the same. * We can hope that the next cameras will adopt a compatible protocol