darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle ixus30 in ptp2 driver

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10623 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2007-09-02 18:56:55 +00:00
parent f8e1075baf
commit 647d06eb38
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/canon/ChangeLog
View File

@@ -1,3 +1,7 @@
2007-09-02 Marcus Meissner <marcus@jet.franken.de>
* canon.c: Handle IXUS 30 also in ptp driver.
2007-06-03 Paul Walmsley <paul@booyaka.com>
* usb.c: remove one last CANON_EXPERIMENTAL_SECONDARY_IMAGE ifdef

3
camlibs/canon/canon.c
View File

@@ -286,9 +286,12 @@ const struct canonCamModelData models[] = {
/* 0x30bf is PowerShot SD300/Digital IXUS 40 in PTP mode */
/* Another block of cameras that share the ID for PTP and Canon modes */
#if 0 /* in ptp driver due to hangs :( */
{"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},
#endif
{"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},