From b123d99633da2e0f099f3d4a8d644098d0dbdda3 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 2 Nov 2002 15:57:06 +0000 Subject: [PATCH] added support for Canon PowerShot S45 git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5526 67ed7778-7388-44ab-90cf-0a291f65f57c --- CHANGES | 3 ++- camlibs/canon/ChangeLog | 4 ++++ camlibs/canon/canon.c | 1 + camlibs/canon/canon.h | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 7cd0f37f1..a4a5e4794 100644 --- a/CHANGES +++ b/CHANGES @@ -9,7 +9,8 @@ drivers (camlibs): * Ricoh * Canon driver: - - added support for Canon PowerShot A100, Canon PowerShot A200 + - added support for Canon PowerShot A100, Canon PowerShot A200, + Canon PowerShot S45 - fixed Canon EOS D60 unlocking * PTP driver: diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog index c98ccc7e6..1242989e6 100644 --- a/camlibs/canon/ChangeLog +++ b/camlibs/canon/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Hans Ulrich Niedermann + + * canon.[ch]: support for PowerShot S45 + 2002-10-25 Hans Ulrich Niedermann * usb.c: added fix for EOS D60 unlocking by Fredrik (reported to work) diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index a6dad5cf8..2a7de0d3b 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -112,6 +112,7 @@ const struct canonCamModelData models[] = { {"Canon PowerShot S200", CANON_PS_S200, 0x04A9, 0x3065, 0, S10M, S32K}, {"Canon Digital IXUS v2", CANON_PS_S200, 0x04A9, 0x3065, 0, S10M, S32K}, {"Canon Digital IXUS 330", CANON_PS_S330, 0x04A9, 0x3066, 0, S10M, S32K}, + {"Canon PowerShot S45", CANON_PS_S45, 0x04A9, 0x306C, 0, S10M, S32K}, {NULL} /* *INDENT-ON* */ }; diff --git a/camlibs/canon/canon.h b/camlibs/canon/canon.h index a74f7dd0e..3fa269f1a 100644 --- a/camlibs/canon/canon.h +++ b/camlibs/canon/canon.h @@ -66,7 +66,8 @@ typedef enum { CANON_PS_S200, CANON_EOS_D60, CANON_PS_A100, - CANON_PS_A200 + CANON_PS_A200, + CANON_PS_S45 } canonCamModel; #define CON_CHECK_PARAM_NULL(param) \