diff options
| -rw-r--r-- | camlibs/canon/ChangeLog | 4 | ||||
| -rw-r--r-- | camlibs/canon/canon.c | 1 | ||||
| -rw-r--r-- | camlibs/canon/canon.h | 3 | ||||
| -rw-r--r-- | camlibs/canon/usb.c | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog index 4fea6be42..5a1ecd512 100644 --- a/camlibs/canon/ChangeLog +++ b/camlibs/canon/ChangeLog @@ -1,3 +1,7 @@ +2002-05-01 Hans Ulrich Niedermann <gp@n-dimensional.de> + + * canon.c, canon.h, usb.c: added support for EOS D60 + 2002-04-19 Fredrik <fredrik@krixor.xy.org> * canon.c, canon.h: Added support for the IXUS 330, diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 04db4375c..8cbaceb80 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -99,6 +99,7 @@ const struct canonCamModelData models[] = { {"Canon PowerShot S40", CANON_PS_S40, 0x04A9, 0x3056, 0, S10M, S32K}, {"Canon PowerShot S30", CANON_PS_S30, 0x04A9, 0x3057, 0, S10M, S32K}, {"Canon PowerShot A40", CANON_PS_A40, 0x04A9, 0x3058, 0, S10M, S32K}, + {"Canon EOS D60", CANON_EOS_D60, 0x04A9, 0x3060, 0, S10M, S32K}, {"Canon PowerShot S200", CANON_PS_S200, 0x04A9, 0x3065, 0, S10M, S32K}, {"Canon Digital IXUS 330", CANON_PS_S330, 0x04A9, 0x3066, 0, S10M, S32K}, {NULL} diff --git a/camlibs/canon/canon.h b/camlibs/canon/canon.h index 113574bd5..d6194944c 100644 --- a/camlibs/canon/canon.h +++ b/camlibs/canon/canon.h @@ -62,7 +62,8 @@ typedef enum { CANON_EOS_D30, CANON_PS_PRO90_IS, CANON_PS_S330, - CANON_PS_S200 + CANON_PS_S200, + CANON_EOS_D60 } canonCamModel; #define CON_CHECK_PARAM_NULL(param) \ diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index 9163221d0..393d0e16a 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -283,6 +283,7 @@ canon_usb_lock_keys (Camera *camera, GPContext *context) GP_DEBUG ("canon_usb_lock_keys: Your camera model does not support keylocking."); break; case CANON_EOS_D30: + case CANON_EOS_D60: memset (payload, 0, sizeof (payload)); payload[0] = 0x06; |