diff options
| author | Matt Martin <matt.martin@ieee.org> | 2002-04-22 03:33:32 +0000 |
|---|---|---|
| committer | Matt Martin <matt.martin@ieee.org> | 2002-04-22 03:33:32 +0000 |
| commit | 77ae1550e748371693c9efe132f9f9d0f16ca129 (patch) | |
| tree | 1b01a4541f2e81adef2866b1e4e912525a4f3f0d /camlibs/fuji | |
| parent | a1a91914cbc8f488c57021f5febea6b744ccb9a7 (diff) | |
| download | libgphoto2-77ae1550e748371693c9efe132f9f9d0f16ca129.tar.gz | |
fuji.c Remove 0xff escaping code now done by libgphoto2_port
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4464 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/fuji')
| -rw-r--r-- | camlibs/fuji/ChangeLog | 11 | ||||
| -rw-r--r-- | camlibs/fuji/fuji.c | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/camlibs/fuji/ChangeLog b/camlibs/fuji/ChangeLog index 87b2b8fcb..4e11fb6db 100644 --- a/camlibs/fuji/ChangeLog +++ b/camlibs/fuji/ChangeLog @@ -1,3 +1,7 @@ +2002-04-21 Matt Martin <matt.martin@ieee.org> + + * fuji.c Remove 0xff escaping code now done by libgphoto2_port + 2002-04-21 Lutz Müller <lutz@users.sourceforge.net> * fuji.c: Formatting. @@ -11,6 +15,13 @@ * library.c: A fuji_reset doesn't seem to reset the speed to 9600. +2002-04-21 Matt Martin <matt.martin@ieee.org> + + * fuji.c: Fixed some pointer errors in CFR macro calls. Added + escaping of 0xff codes in downloads. Made provisions for DS-7 + which does not support file-length query. + # fuji.h: Fixed FUJI_CMD_PIC_GET vs PIC_GET_THUMB swap. + 2002-04-19 Lutz Müller <lutz@users.sourceforge.net> * library.c: Don't make the check for supported commands fatal. diff --git a/camlibs/fuji/fuji.c b/camlibs/fuji/fuji.c index 69b48727c..0e1903383 100644 --- a/camlibs/fuji/fuji.c +++ b/camlibs/fuji/fuji.c @@ -98,7 +98,6 @@ #define ESC 0x10 #define ETB 0x17 /* End of transmission block */ #define NAK 0x15 -#define PERR 0xff #define FUJI_ACK 0x00 #define FUJI_NAK 0x01 @@ -208,7 +207,6 @@ fuji_recv (Camera *camera, unsigned char *buf, unsigned int *buf_len, /* Read the data. Unescape it. Calculate the checksum. */ for (i = 0; i < *buf_len; i++) { CR (gp_port_read (camera->port, buf + i, 1)); - if (buf[i]==PERR) CR (gp_port_read (camera->port, buf + i, 1)); if (buf[i] == ESC) { CR (gp_port_read (camera->port, buf + i, 1)); if (buf[i] != ESC) { @@ -281,7 +279,6 @@ fuji_transmit (Camera *camera, unsigned char *cmd, unsigned int cmd_len, /* Receive ACK (hopefully) */ CR (gp_port_read (camera->port, &c, 1)); - if (c==PERR) CR (gp_port_read (camera->port, &c, 1)); switch (c) { case ACK: break; |