Revision: 13898
http://gphoto.svn.sourceforge.net/gphoto/?rev=13898&view=rev
Author: marcusmeissner
Date: 2012-03-11 22:51:08 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
disable G5 here, ptp mode works better
Modified Paths:
--------------
branches/libgphoto2-2_4/libgphoto2/camlibs/canon/canon.c
Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/canon/canon.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/canon/canon.c 2012-03-11 22:37:27 UTC (rev 13897)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/canon/canon.c 2012-03-11 22:51:08 UTC (rev 13898)
@@ -212,8 +212,11 @@
{"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},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|