From 0e13b57166e6c79e4a83080c91cc2fe2fe8bbcda Mon Sep 17 00:00:00 2001 From: Donn Morrison Date: Fri, 21 Dec 2001 03:56:28 +0000 Subject: [PATCH] if selected speed = 0 (Best), set to 115200 git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3548 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/kodak/dc3200/dc3200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c index fb3772587..f992be362 100644 --- a/camlibs/kodak/dc3200/dc3200.c +++ b/camlibs/kodak/dc3200/dc3200.c @@ -64,8 +64,8 @@ int init(Camera *camera) if (ret < 0) return (ret); - /* Remember the selected speed */ - selected_speed = settings.serial.speed; + /* Remember the selected speed 0 == fastest */ + selected_speed = settings.serial.speed == 0 ? 115200 : settings.serial.speed; settings.serial.speed = 9600; settings.serial.bits = 8; @@ -310,7 +310,7 @@ static int camera_manual (Camera *camera, CameraText *manual) "\n" "2. If you cancel a picture transfer, the driver will be left " "in an unknown state, and will most likely need to be " - "reinitialized.")); + "re-initialized.")); return (GP_OK); }