darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2001-12-09 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

Browse Source 
* lowlevel.c: Do not read one byte after another - that makes
          debugging output easier to read.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3473 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-12-09 21:41:15 +00:00
parent e67157bede
commit c7edc71ecc
2 changed files with 71 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/konica/ChangeLog Normal file
View File

@@ -0,0 +1,4 @@
2001-12-09 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* lowlevel.c: Do not read one byte after another - that makes
debugging output easier to read.

72
camlibs/konica/lowlevel.c
View File

@@ -18,13 +18,18 @@
* Boston, MA 02111-1307, USA.
*/
#include <gphoto2-result.h>
#include <gphoto2-debug.h>
#include <config.h>
#include "lowlevel.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "library.h"
#include "lowlevel.h"
#include <gphoto2-result.h>
#include <gphoto2-debug.h>
#include <gphoto2-port-log.h>
#define GP_MODULE "konica"
#define DEFAULT_TIMEOUT 500
@@ -387,6 +392,59 @@ l_receive (GPPort *device, unsigned char **rb, unsigned int *rbs,
/* Read 'rbs_internal' bytes data plus ESC quotes. */
error_flag = 0;
#if 1
{
unsigned int read = 0, r = 0;
while (read < rbs_internal) {
/*
* Read the specified amount of bytes. We will probably read more
* because some bytes will be quoted.
*/
GP_DEBUG ("Reading %i bytes (%i of %i already read)...",
rbs_internal - read, read, rbs_internal);
result = gp_port_read (device, &((*rb)[*rbs + read]),
rbs_internal - read);
if (result < 0) {
error_flag = 1;
break;
}
r = rbs_internal - read;
/* Unescape the data we just read */
for (i = read; i < read + r; i++) {
unsigned char *c = &(*rb)[*rbs + i];
if ((*c == STX) || (*c == ETX) || (*c == ENQ ) ||
(*c == ACK) || (*c == XOFF) || (*c == XON) ||
(*c == NACK) || (*c == ETB)) {
GP_DEBUG ("Wrong ESC masking!");
error_flag = 1;
break;
} else if (*c == ESC) {
if (i == read + r - 1) {
CHECK (gp_port_read (device,
&((*rb)[*rbs + i + 1]), 1));
r++;
}
*c = (~*(c + 1) & 0xff);
if ((*c != STX ) && (*c != ETX ) && (*c != ENQ) &&
(*c != ACK ) && (*c != XOFF) && (*c != XON) &&
(*c != NACK) && (*c != ETB ) && (*c != ESC)) {
GP_DEBUG ("Wrong ESC masking!");
error_flag = 1;
break;
}
memmove (c + 1, c + 2, read + r - i);
r--;
}
checksum += (*rb)[*rbs + i];
}
if (error_flag)
break;
read += r;
}}
#else
for (i = 0; i < rbs_internal; i++) {
result = l_esc_read (device, &((*rb)[*rbs + i]));
switch (result) {
@@ -411,6 +469,7 @@ l_receive (GPPort *device, unsigned char **rb, unsigned int *rbs,
if (error_flag)
break;
}
#endif
if (!error_flag) {
CHECK (gp_port_read (device, &d, 1));
switch (d) {
@@ -420,6 +479,7 @@ l_receive (GPPort *device, unsigned char **rb, unsigned int *rbs,
* ETX received. This is the last
* packet.
*/
GP_DEBUG ("Last packet.");
break;
case ETB:
@@ -428,6 +488,7 @@ l_receive (GPPort *device, unsigned char **rb, unsigned int *rbs,
* ETB received. There are more
* packets to come.
*/
GP_DEBUG ("More packets coming.");
break;
default:
@@ -466,6 +527,8 @@ l_receive (GPPort *device, unsigned char **rb, unsigned int *rbs,
* camera will send us the data at the most
* three times.
*/
GP_DEBUG ("Checksum wrong: expected %i, "
"got %i.", c, checksum);
if (j == 2)
return (GP_ERROR_CORRUPTED_DATA);
@@ -529,7 +592,6 @@ l_receive (GPPort *device, unsigned char **rb, unsigned int *rbs,
}
}
int
l_send_receive (
GPPort *device,