diff options
| author | Anders Nordby <anders@FreeBSD.org> | 2002-04-20 23:04:29 +0000 |
|---|---|---|
| committer | Anders Nordby <anders@FreeBSD.org> | 2002-04-20 23:04:29 +0000 |
| commit | 4f3833c8ff40150267adae9396203f954f6c5040 (patch) | |
| tree | ab3b9f6b7156c49a94092c8cc4682111ae058c83 /graphics/s10sh | |
| parent | Update maintainer e-mail address. (diff) | |
Add support for Canon Powershot A20.
PR: 35128
Submitted by: Ken Stailey <kstailey@surfbest.net>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=57943
Diffstat (limited to 'graphics/s10sh')
| -rw-r--r-- | graphics/s10sh/files/patch-usb.c | 15 | ||||
| -rw-r--r-- | graphics/s10sh/files/patch-usb.h | 17 | ||||
| -rw-r--r-- | graphics/s10sh/pkg-descr | 1 |
3 files changed, 33 insertions, 0 deletions
diff --git a/graphics/s10sh/files/patch-usb.c b/graphics/s10sh/files/patch-usb.c new file mode 100644 index 000000000000..f7ad38e32f55 --- /dev/null +++ b/graphics/s10sh/files/patch-usb.c @@ -0,0 +1,15 @@ +--- usb.c.orig Tue Mar 13 14:46:18 2001 ++++ usb.c Sun Apr 21 00:59:11 2002 +@@ -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; diff --git a/graphics/s10sh/files/patch-usb.h b/graphics/s10sh/files/patch-usb.h new file mode 100644 index 000000000000..ab79e3dfb234 --- /dev/null +++ b/graphics/s10sh/files/patch-usb.h @@ -0,0 +1,17 @@ +--- usb.h.orig Tue Mar 13 14:46:18 2001 ++++ usb.h Sun Apr 21 00:59:11 2002 +@@ -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 */ diff --git a/graphics/s10sh/pkg-descr b/graphics/s10sh/pkg-descr index fa77a627bdf5..2afdb027ef60 100644 --- a/graphics/s10sh/pkg-descr +++ b/graphics/s10sh/pkg-descr @@ -8,6 +8,7 @@ S10sh supports the following PowerShot models: S10 (serial and USB) S20 (serial and USB) S100 aka Digital Ixus (USB only, since it lacks the serial interface) + A20 (needs testing) A50 (serial only, supported with problems) Pro70 (serial only, supported with problems) |