libgphoto2/camlibs/canon/canon.c
o canon_usb_capture_dialogue() now gets error context
o Added extra NUL to end of "delete file" command; this
eliminates an error code 0200000086.
libgphoto2/camlibs/canon/library.c
o canon_usb_unlock_keys() now gets error context and reports
errors (non-zero status code in 0x50 of reply).
libgphoto2/camlibs/canon/usb.c
o Better error checking in canon_usb_lock_keys(); now we
*do* know what those bytes mean (they are a 32-bit status
code).
o Change locking code so that older "default" cameras are
now explicit; the new default is like S45 and G3, on the
assumption that new cameras will probably behave like this.
o canon_usb_capture_dialogue() now gets error context to
pass to canon_usb_capture_dialogue().
libgphoto2/camlibs/canon/usb.h
o canon_usb_capture_dialogue() now gets error context
o canon_usb_unlock_keys() now gets error context
----------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6212 67ed7778-7388-44ab-90cf-0a291f65f57c
sierra-desc.h, sierra.c, sierra.h: Remove use_extended_protocol
field and use a bit in the flags field instead.
* sierra.c: cleanup some of the init code
* sierra-desc.h: cleanup a comment
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6203 67ed7778-7388-44ab-90cf-0a291f65f57c
o Corrected comment explaining path returned from capture.
libgphoto2/camlibs/canon/canon.h
o Added labels for all values of canonCamModel, for gtk-doc.
libgphoto2/camlibs/canon/usb.c
o Added PowerShot G3 to special-case locking: use non-EOS locking,
but no "get photo abilities" command.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6202 67ed7778-7388-44ab-90cf-0a291f65f57c
libgphoto2/camlibs/canon/canon.c
o Tidy comments (esp. for gtk-doc)
o Return "*UNKNOWN*" for both path and file names, since I don't
know how to get the information after capture. Previously, random
garbage was returned.
o Flag GP_DEBUG messages with name of originating function.
o Revised key locking. This is now different for PowerShot and
EOS cameras.
o Clean up better on error (exit control mode).
o Convert many constant #define's to enum's.
libgphoto2/camlibs/canon/canon.h
o Tidy comments (esp. for gtk-doc)
o Convert all constant #define's to enum's except GP_MODULE,
CANON_MASK_BATTERY.
o Move many constant #define's from library.h.
libgphoto2/camlibs/canon/library.c
o Tidy comments (esp. for gtk-doc)
o Unlock PowerShot keys in camera_exit().
libgphoto2/camlibs/canon/library.h
o Moved various constant #define's to canon.h and converted to
enum's.
libgphoto2/camlibs/canon/usb.c
o Tidy comments (esp. for gtk-doc)
o Move macro IS_EOS() to canon.h.
o Supply unique serial number in each command.
o Alter "already awake" initialization for EOS cameras.
This still doesn't work :(.
o Alter key locking. EOS cameras are locked just before
"release shutter" command and unlocked as soon as possible
afterward. PowerShot cameras are unlocked at initialization
and can't be unlocked from software. The user must unplug the
USB cable to unlock the keys on these cameras.
o Unify polling of interrupt pipe in canon_usb_poll_interrupt_pipe().
o Read interrupt pipe to clear it, both before "release shutter"
command and after an error (interrupt messages out of sequence)
in capture.
o Increase timeout for "release shutter" command. EOS cameras
sometimes take a long time (>10sec) to complete this command.
Is this because of a buffer flush?
o Improve handling of interrupt messages in "release shutter".
o Check status at 0x50 in response, where appropriate, and report
a non-zero status code via GP_DEBUG (in canon_usb_dialogue).
libgphoto2/camlibs/canon/usb.h
o Increase MAX_INTERRUPT_TRIES from 4000 to 12000 to allow worst-case
timing: a D60 writing a raw file to CF.
libgphoto2/camlibs/canon/doc/canon-sections.txt
o Track the conversion of various constant #define's to enum's.
----------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6200 67ed7778-7388-44ab-90cf-0a291f65f57c
register 47 return no data - use other registers to get the data.
* sierra.c: Use register 43 to get audio, not sierra_get_pic_info,
so register 47 is not used prior to downloading.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6171 67ed7778-7388-44ab-90cf-0a291f65f57c
* sierra.c: call sierra_get_size to get sizes via register 12 or
13, only call sierra_get_pic_info to get sizes for audio files.
Treat 0 length file size as unsupported.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6169 67ed7778-7388-44ab-90cf-0a291f65f57c
libgphoto2/camlibs/canon/canon.c
Major cleanup of comments to make gtk-doc work.
libgphoto2/camlibs/canon/canon.h
Major cleanup of comments to make gtk-doc work.
Moved "defines for error handling" from canon.h to serial.h.
Moved JPEG stream byte #defines from serial.h to canon.h.
libgphoto2/camlibs/canon/crc.c
Cleanup of comments to make gtk-doc work.
libgphoto2/camlibs/canon/library.c
Major cleanup of comments to make gtk-doc work.
Slight update of doc string for screen widget.
libgphoto2/camlibs/canon/serial.c
Major cleanup of comments to make gtk-doc work.
libgphoto2/camlibs/canon/serial.h
Major cleanup of comments to make gtk-doc work.
Moved "defines for error handling" from canon.h to serial.h.
Moved JPEG stream byte #defines from serial.h to canon.h.
libgphoto2/camlibs/canon/urb-interpret
Minor improvements.
libgphoto2/camlibs/canon/usb.c libgphoto2/camlibs/canon/usb.h
Major cleanup of comments to make gtk-doc work.
Moved MAX_RETRIES from usb.c to usb.h, renamed MAX_INTERRUPT_RETRIES.
Rewrite of interrupt-pipe reads based on new insight
into communication structure.
Now seems to work with EOS D30 as well as PowerShot cameras.
Not yet working with EOS D60.
libgphoto2/camlibs/canon/util.c
Major cleanup of comments to make gtk-doc work.
libgphoto2/camlibs/canon/util.h
Commented prototype for dump_hex, as it isn't actually defined
anywhere.
libgphoto2/camlibs/canon/doc/canon-api.sgml
Created this with tentative structure for documentation.
libgphoto2/camlibs/canon/doc/canon-sections.txt
Created this with tentative structure for documentation.
----------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6154 67ed7778-7388-44ab-90cf-0a291f65f57c