From f97752f36ee1ce74f8682a52cf8a237f50928e97 Mon Sep 17 00:00:00 2001 From: Scott Fritzinger Date: Tue, 11 Jul 2000 20:32:11 +0000 Subject: [PATCH] fixed camera_exit bug git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@651 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/fujitsu/fujitsu.c | 15 +++++++++++---- camlibs/fujitsu/library.c | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/camlibs/fujitsu/fujitsu.c b/camlibs/fujitsu/fujitsu.c index 09daa13a0..1268a66bb 100644 --- a/camlibs/fujitsu/fujitsu.c +++ b/camlibs/fujitsu/fujitsu.c @@ -83,12 +83,13 @@ int fujitsu_valid_packet (char *packet) { ((unsigned char)packet[3] * 256); length += 6; } else { - switch(packet[0]) { + switch((unsigned char)packet[0]) { case NUL: case ENQ: case ACK: case DC1: case NAK: + case TRM: return (GP_OK); break; default: @@ -580,6 +581,7 @@ int fujitsu_delete(gpio_device *dev, int picture_number) { int fujitsu_end_session(gpio_device *dev) { char packet[4096], buf[4096]; + unsigned char c; int r, done; fujitsu_build_packet(TYPE_COMMAND, 0, 3, packet); @@ -595,13 +597,18 @@ int fujitsu_end_session(gpio_device *dev) { if (fujitsu_read_packet(dev, buf)==GP_ERROR) return (GP_ERROR); - done = (buf[0] == NAK)? 0 : 1; + c = (unsigned char)buf[0]; + if (c==TRM) + return (GP_OK); + + done = (c == NAK)? 0 : 1; if (done) { /* read in the ENQ */ if (fujitsu_read_packet(dev, buf)==GP_ERROR) - return ((buf[0]==ENQ)? GP_OK : GP_ERROR); - + return (GP_ERROR); + c = (unsigned char)buf[0]; + return ((c==ENQ)? GP_OK : GP_ERROR); } } if (r > RETRIES) { diff --git a/camlibs/fujitsu/library.c b/camlibs/fujitsu/library.c index 338d9a309..073cb9831 100644 --- a/camlibs/fujitsu/library.c +++ b/camlibs/fujitsu/library.c @@ -140,7 +140,7 @@ int camera_init (CameraInit *init) { if (!glob_dev) return (GP_ERROR); - strcpy(settings.serial.port, init->port_settings.port); + strcpy(settings.serial.port, init->port_settings.path); settings.serial.speed = 19200; settings.serial.bits = 8; settings.serial.parity = 0;