diff options
| author | Lutz Mueller <lutz@users.sourceforge.net> | 2004-03-23 19:50:48 +0000 |
|---|---|---|
| committer | Lutz Mueller <lutz@users.sourceforge.net> | 2004-03-23 19:50:48 +0000 |
| commit | c3eef5e387d5ceca2bf0032931713e48b09fb3bc (patch) | |
| tree | 5a31c6debdc036b82b2c8cf7a67490f110065bad /camlibs/casio | |
| parent | e9f75395039d13173be723bb735bf741e179b543 (diff) | |
| download | libgphoto2-c3eef5e387d5ceca2bf0032931713e48b09fb3bc.tar.gz | |
2004-03-23 Lutz Mueller <lutz@users.sourceforge.net>
* casio-qv.c (camera_init): Patch by Michael Haardt
<michael@moria.de>.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7143 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/casio')
| -rw-r--r-- | camlibs/casio/ChangeLog | 5 | ||||
| -rw-r--r-- | camlibs/casio/casio-qv.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/camlibs/casio/ChangeLog b/camlibs/casio/ChangeLog index 00add16ea..488593d95 100644 --- a/camlibs/casio/ChangeLog +++ b/camlibs/casio/ChangeLog @@ -1,3 +1,8 @@ +2004-03-23 Lutz Mueller <lutz@users.sourceforge.net> + + * casio-qv.c (camera_init): Patch by Michael Haardt + <michael@moria.de>. + 2003-12-03 Hubert Figuiere <hfiguiere@teaser.fr> * casio-qv.c (camera_init): hardcode speed to 9600 bauds diff --git a/camlibs/casio/casio-qv.c b/camlibs/casio/casio-qv.c index e8fabfa0f..b0b6943c6 100644 --- a/camlibs/casio/casio-qv.c +++ b/camlibs/casio/casio-qv.c @@ -214,7 +214,6 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, int camera_init (Camera *camera, GPContext *context) { - int result = GP_OK, i; gp_port_settings settings; /* First, set up all the function pointers */ @@ -233,7 +232,10 @@ camera_init (Camera *camera, GPContext *context) /* speed is hardcoded to 9600 as per the protocol */ settings.serial.speed = 9600; CHECK_RESULT (gp_port_set_settings (camera->port, settings)); - result = QVping (camera); + gp_port_set_pin (camera->port, GP_PIN_RTS, GP_LEVEL_HIGH); + gp_port_set_pin (camera->port, GP_PIN_DTR, GP_LEVEL_LOW); + gp_port_set_pin (camera->port, GP_PIN_CTS, GP_LEVEL_LOW); + CHECK_RESULT (QVping (camera)); - return (result); + return GP_OK; } |