From fcb249d6463171518b89d90dad9b410f3487b93e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 1 Nov 2015 17:12:02 +0100 Subject: let the canon driver support the IXUS 30 --- camlibs/canon/canon.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'camlibs/canon/canon.c') diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index da9444d4c..53abda4e5 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -278,11 +278,14 @@ const struct canonCamModelData models[] = { {"Canon:PowerShot A95 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* 0x30bf is PowerShot SD300/Digital IXUS 40 in PTP mode */ +#endif /* Another block of cameras that share the ID for PTP and Canon modes */ + /* keep these enabled as the PTP variant does not support capture */ {"Canon:PowerShot SD200 (normal mode)", CANON_CLASS_6, 0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:Digital IXUS 30 (normal mode)", CANON_CLASS_6, 0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:IXY Digital 40 (normal mode)", CANON_CLASS_6, 0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, +#if 0 {"Canon:PowerShot SD400 (normal mode)", CANON_CLASS_4, 0x04A9, 0x30c1, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:Digital IXUS 50 (normal mode)", CANON_CLASS_4, 0x04A9, 0x30c1, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:IXY Digital 55 (normal mode)", CANON_CLASS_4, 0x04A9, 0x30c1, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, -- cgit v1.2.1