diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2004-08-14 00:24:12 +0000 |
|---|---|---|
| committer | Hubert Figuiere <hub@figuiere.net> | 2004-08-14 00:24:12 +0000 |
| commit | bc2d89b2776e6f77bf20dd79c40d946cb6320297 (patch) | |
| tree | 7552101a71af864451108b3dd0063d77eb5c6b83 | |
| parent | 99841a91d64b37cc6a2b72c41d96b6396e9e1744 (diff) | |
| download | libgphoto2-bc2d89b2776e6f77bf20dd79c40d946cb6320297.tar.gz | |
* canon.[ch]: Added Powershot S60
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7276 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/canon/ChangeLog | 4 | ||||
| -rw-r--r-- | camlibs/canon/canon.c | 1 | ||||
| -rw-r--r-- | camlibs/canon/canon.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog index 8261d1698..97f24c0c4 100644 --- a/camlibs/canon/ChangeLog +++ b/camlibs/canon/ChangeLog @@ -1,3 +1,7 @@ +2004-08-12 Hubert Figuiere <hfiguiere@teaser.fr> + + * canon.[ch]: Added Powershot S60 + 2004-06-05 Hubert Figuiere <hfiguiere@teaser.fr> * canon.[ch]: Added A310 as reported in patch 966814 diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 335e5b517..e2c0ca402 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -187,6 +187,7 @@ const struct canonCamModelData models[] = { /* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */ {"Canon:PowerShot G5 (normal mode)", CANON_PS_G5, 0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot A80 (normal mode)",CANON_PS_A80, 0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S60 (normal mode)", CANON_PS_S60, 0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:Digital IXUS 500 (normal mode)",CANON_PS_S500, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot A75", CANON_PS_A75, 0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot A310", CANON_PS_A310, 0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, diff --git a/camlibs/canon/canon.h b/camlibs/canon/canon.h index 56f6951c8..d2767764a 100644 --- a/camlibs/canon/canon.h +++ b/camlibs/canon/canon.h @@ -95,6 +95,7 @@ typedef enum { * @CANON_PS_S410: Digital IXUS 430 * @CANON_PS_S500: Digital IXUS 500 * @CANON_PS_S45: PowerShot S45 + * @CANON_PS_S60: PowerShot S60 * @CANON_PS_G3: PowerShot G3 * @CANON_PS_G5: PowerShot G5 * @CANON_PS_S230: PowerShot S230, Digital IXUS v3 @@ -164,6 +165,7 @@ typedef enum { /* other cameras */ CANON_PS_S400, CANON_PS_S410, + CANON_PS_S60, CANON_PS_S500, CANON_PS_SD100, CANON_EOS_300D, |