From b5ffebfadfc441e01d1eb9efa1ea79e93bd61383 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 15 Nov 2010 16:30:15 +0000 Subject: [PATCH] disable G5 here git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13402 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/canon/canon.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 21a3bd1e2..040fad224 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -212,8 +212,12 @@ const struct canonCamModelData models[] = { {"Canon:EOS 300D (normal mode)", CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, {"Canon:EOS Digital Rebel (normal mode)",CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, {"Canon:EOS Kiss Digital (normal mode)",CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + +#if 0 /* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */ + /* Use PTP driver, as this driver had broken reports - Marcus*/ {"Canon:PowerShot G5 (normal mode)", CANON_CLASS_5, 0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, +#endif /* Elura 50 camcorder is 0x3087 in PTP mode; 3088 in Canon mode? */ {"Canon:Elura 50 (normal mode)", CANON_CLASS_1, 0x04A9, 0x3088, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},