Update for port s10sh -- add Elph S400
Sean Welch
welchsm at earthlink.net
Sun Jun 29 17:25:39 PDT 2003
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
More information about the freebsd-ports
mailing list