diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2006-06-16 05:10:22 +0000 |
|---|---|---|
| committer | Hubert Figuiere <hub@figuiere.net> | 2006-06-16 05:10:22 +0000 |
| commit | 34ba090b1b5ca57897c8ae983316c7940bef9234 (patch) | |
| tree | 90453f12fdff113e9def1a43abebb41d8bd778b7 | |
| parent | ea017b5c18ed7831ed31b17078e50b22932f2716 (diff) | |
| download | libgphoto2-34ba090b1b5ca57897c8ae983316c7940bef9234.tar.gz | |
* library.c: 30D has DCIM ROOT bug
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_2/libgphoto2@8875 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/ptp2/ChangeLog | 4 | ||||
| -rw-r--r-- | camlibs/ptp2/library.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog index 653c383ff..58f5caa8f 100644 --- a/camlibs/ptp2/ChangeLog +++ b/camlibs/ptp2/ChangeLog @@ -1,3 +1,7 @@ +2006-06-16 Hubert Figuiere <hub@figuiere.net> + + * library.c: 30D has DCIM ROOT bug + 2006-04-27 Marcus Meissner <marcus@jet.franken.de> * ptp.c: The iRiver devices occasionaly send a byte more than diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 6a2a01536..80ba90cc3 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -519,11 +519,6 @@ static struct { {"Canon:PowerShot A510 (PTP mode)", 0x04a9, 0x30c2, PTPBUG_DELETE_SENDS_EVENT}, {"Canon:EOS 1D Mark II (PTP mode)", 0x04a9, 0x30ea, PTPBUG_DCIM_WRONG_PARENT}, {"Canon:EOS 20D (PTP mode)", 0x04a9, 0x30ec, PTPBUG_DCIM_WRONG_PARENT}, - /* Jeff Mock <jeff@mock.com> */ - {"Canon:EOS 5D (PTP mode)", 0x04a9, 0x3101, PTPBUG_DCIM_WRONG_PARENT}, - - {"Canon:Optura 600 (PTP mode)", 0x04a9, 0x3105, 0}, - /* 30ef is the ID in explicit PTP mode. * 30ee is the ID with the camera in Canon mode, but the camera reacts to * PTP commands according to: @@ -548,10 +543,13 @@ static struct { /* Rob Lensen <rob@bsdfreaks.nl> */ {"Canon:Digital IXUS 55 (PTP mode)", 0x04a9, 0x30ff, PTPBUG_DELETE_SENDS_EVENT}, {"Canon:PowerShot SD450 (PTP mode)", 0x04a9, 0x30ff, PTPBUG_DELETE_SENDS_EVENT}, + {"Canon:Optura 600 (PTP mode)", 0x04a9, 0x3105, 0}, + /* Jeff Mock <jeff@mock.com> */ + {"Canon:EOS 5D (PTP mode)", 0x04a9, 0x3101, PTPBUG_DCIM_WRONG_PARENT}, /* Nick Richards <nick@nedrichards.com> */ {"Canon:Digital IXUS 50 (PTP mode)", 0x04a9, 0x310e, PTPBUG_DELETE_SENDS_EVENT}, /* https://sourceforge.net/tracker/?func=detail&atid=358874&aid=1456391&group_id=8874 */ - {"Canon:EOS 30D (PTP mode)", 0x04a9, 0x3113, PTPBUG_DELETE_SENDS_EVENT}, + {"Canon:EOS 30D (PTP mode)", 0x04a9, 0x3113, PTPBUG_DCIM_WRONG_PARENT}, {"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 */ |