diff -ruN libgphoto2-2.1.1-vanilla/camlibs/canon/canon.c libgphoto2-2.1.1/camlibs/canon/canon.c --- libgphoto2-2.1.1-vanilla/camlibs/canon/canon.c 2002-12-01 23:45:44.000000000 +0200 +++ libgphoto2-2.1.1/camlibs/canon/canon.c 2003-07-10 02:44:02.000000000 +0300 @@ -120,6 +120,7 @@ {"Canon PowerShot G3 (normal mode)", CANON_PS_G3, 0x04A9, 0x306E, 0, S99M, S32K}, /* 0x306F is G3 in PTP mode */ {"Canon PowerShot S230 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, 0, S99M, S32K}, /* 0x3071 is S230 in PTP mode */ {"Canon Digital IXUS v3 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, 0, S99M, S32K}, /* 0x3071 is IXUS v3 in PTP mode */ + {"Canon EOS 10D", CANON_EOS_10D, 0x04A9, 0x3083, 0, S10M, S32K}, {NULL} /* *INDENT-ON* */ }; diff -ruN libgphoto2-2.1.1-vanilla/camlibs/canon/canon.h libgphoto2-2.1.1/camlibs/canon/canon.h --- libgphoto2-2.1.1-vanilla/camlibs/canon/canon.h 2002-12-01 23:45:44.000000000 +0200 +++ libgphoto2-2.1.1/camlibs/canon/canon.h 2003-07-10 02:44:12.000000000 +0300 @@ -67,7 +67,8 @@ CANON_PS_A200, CANON_PS_S45, CANON_PS_S230, - CANON_PS_G3 + CANON_PS_G3, + CANON_EOS_10D } canonCamModel; #define CON_CHECK_PARAM_NULL(param) \ diff -ruN libgphoto2-2.1.1-vanilla/camlibs/canon/usb.c libgphoto2-2.1.1/camlibs/canon/usb.c --- libgphoto2-2.1.1-vanilla/camlibs/canon/usb.c 2002-12-01 23:45:44.000000000 +0200 +++ libgphoto2-2.1.1/camlibs/canon/usb.c 2003-07-10 02:44:28.000000000 +0300 @@ -284,6 +284,7 @@ case CANON_EOS_D30: case CANON_EOS_D60: case CANON_PS_S230: + case CANON_EOS_10D: GP_DEBUG ("Locking camera keys and turning off LCD using 'EOS' locking code..."); memset (payload, 0, sizeof (payload));