diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2006-06-16 05:03:42 +0000 |
|---|---|---|
| committer | Hubert Figuiere <hub@figuiere.net> | 2006-06-16 05:03:42 +0000 |
| commit | ea017b5c18ed7831ed31b17078e50b22932f2716 (patch) | |
| tree | b69893fdda9686806a6a335a12babe11a9e7824c | |
| parent | e82a5ce81ae2f19f935f2190dd1b79488ab13a3a (diff) | |
| download | libgphoto2-ea017b5c18ed7831ed31b17078e50b22932f2716.tar.gz | |
port changes from HEAD for a few USB IDs
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_2/libgphoto2@8873 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/canon/canon.c | 3 | ||||
| -rw-r--r-- | camlibs/ptp2/library.c | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 91d21ec8d..23573cd8d 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -318,7 +318,10 @@ const struct canonCamModelData models[] = { /* I was not able to make A620 work with CLASS 5, 1 and 6. -Marcus */ +#if 0 + /* also reported as not working. */ {"Canon:PowerShot A610 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30fd, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, +#endif {NULL} /* *INDENT-ON* */ }; diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 812852b86..6a2a01536 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -554,6 +554,17 @@ static struct { {"Canon:EOS 30D (PTP mode)", 0x04a9, 0x3113, PTPBUG_DELETE_SENDS_EVENT}, {"Canon:Digital IXUS 750 (PTP mode)", 0x04a9, 0x3116, PTPBUG_DELETE_SENDS_EVENT}, {"Canon:PowerShot A700 (PTP mode)", 0x04a9, 0x3117, PTPBUG_DELETE_SENDS_EVENT}, + /* http://sourceforge.net/tracker/index.php?func=detail&aid=1498577&group_id=8874&atid=358874 */ + {"Canon:PowerShot SD700 (PTP mode)", 0x04a9, 0x3119, PTPBUG_DELETE_SENDS_EVENT}, + {"Canon:Digital IXUS 800 (PTP mode)", 0x04a9, 0x3119, PTPBUG_DELETE_SENDS_EVENT}, + /* Gert Vervoort <gert.vervoort@hccnet.nl> */ + {"Canon:PowerShot S3 IS (PTP mode)", 0x04a9, 0x311a, PTPBUG_DELETE_SENDS_EVENT}, + /* David Goodenough <david.goodenough at linkchoose.co.uk> */ + {"Canon:PowerShot A540 (PTP mode)", 0x04a9, 0x311b, PTPBUG_DELETE_SENDS_EVENT}, + /* Irc reporter */ + {"Canon:Digital IXUS 60 (PTP mode)", 0x04a9, 0x311c, PTPBUG_DELETE_SENDS_EVENT}, + /* Ales Kozumplik <kozumplik@gmail.com> */ + {"Canon:PowerShot A530 (PTP mode)", 0x04a9, 0x3126, PTPBUG_DELETE_SENDS_EVENT}, /* Konica-Minolta PTP cameras */ {"Konica-Minolta:DiMAGE A2 (PTP mode)", 0x132b, 0x0001, 0}, @@ -584,6 +595,8 @@ static struct { /* Jay MacDonald <jay@cheakamus.com> */ {"iRiver:T10 (alternate)", 0x4102, 0x1113, 0}, + /* Andreas Thienemann <andreas@bawue.de> */ + {"iRiver:T20 FM", 0x4102, 0x1114, 0}, /* Roger Pixley <skreech2@gmail.com> */ {"iRiver:U10", 0x4102, 0x1116, 0}, /* Freaky <freaky@bananateam.nl> */ |