kopia lustrzana https://gitlab.com/sane-project/website
252 wiersze
8.1 KiB
HTML
252 wiersze
8.1 KiB
HTML
<!-- received="Sun Dec 19 16:16:22 1999 PST" -->
|
|
<!-- sent="Sun, 19 Dec 1999 16:16:20 -0800" -->
|
|
<!-- name="David Mosberger-Tang" -->
|
|
<!-- email="David.Mosberger@acm.org" -->
|
|
<!-- subject="forwarded message from Peter Fales" -->
|
|
<!-- id="199912200016.QAA10712@panda.mostang.com" -->
|
|
<!-- inreplyto="" -->
|
|
<title>sane-devel: forwarded message from Peter Fales</title>
|
|
<h1>forwarded message from Peter Fales</h1>
|
|
<b>David Mosberger-Tang</b> (<a href="mailto:David.Mosberger@acm.org"><i>David.Mosberger@acm.org</i></a>)<br>
|
|
<i>Sun, 19 Dec 1999 16:16:20 -0800</i>
|
|
<p>
|
|
<ul>
|
|
<li> <b>Messages sorted by:</b> <a href="date.html#120">[ date ]</a><a href="index.html#120">[ thread ]</a><a href="subject.html#120">[ subject ]</a><a href="author.html#120">[ author ]</a>
|
|
<!-- next="start" -->
|
|
<li> <b>Next message:</b> <a href="0121.html">David Mosberger-Tang: "forwarded message from Stanislav Brabec"</a>
|
|
<li> <b>Previous message:</b> <a href="0119.html">Fred Willingham: "Re: Mustek 12000SP / V1.00"</a>
|
|
<!-- nextthread="start" -->
|
|
<!-- reply="end" -->
|
|
</ul>
|
|
<!-- body="start" -->
|
|
--pZZmKD1tXo<br>
|
|
Content-Type: text/plain; charset=us-ascii<br>
|
|
Content-Transfer-Encoding: 7bit<br>
|
|
<p>
|
|
I'm resending this as I currently don't have the time to do much SANE<br>
|
|
development. Could someone merge this patch into the CVS tree?<br>
|
|
<p>
|
|
Thanks,<br>
|
|
<p>
|
|
--david<br>
|
|
<p>
|
|
<p>
|
|
--pZZmKD1tXo<br>
|
|
Content-Type: message/rfc822<br>
|
|
Content-Transfer-Encoding: 7bit<br>
|
|
<p>
|
|
Mime-Version: 1.0<br>
|
|
Content-Type: multipart/mixed; boundary=dDRMvlgZJXvWKvBx<br>
|
|
Return-Path: <<a href="mailto:psfales@lucent.com">psfales@lucent.com</a>><br>
|
|
Received: from localhost (dyn1-tnt4-67.chicago.il.ameritech.net [199.179.164.67])<br>
|
|
by panda.mostang.com (8.9.3/8.9.3) with SMTP id SAA05007<br>
|
|
for <davidm@mostang.com>; Tue, 14 Dec 1999 18:07:42 -0800<br>
|
|
Received: from localhost (4764 bytes) by localhost<br>
|
|
via sendmail with P:stdio/R:inet_hosts/T:smtp<br>
|
|
(sender: <psfales>) (ident <psfales> using unix)<br>
|
|
id <m11y3rQ-00AIp8C@localhost><br>
|
|
for <davidm@mostang.com>; Tue, 14 Dec 1999 20:08:12 -0600 (CST)<br>
|
|
(Smail-3.2.0.101 1997-Dec-17 #3 built 1999-Jul-8)<br>
|
|
Message-ID: <<a href="mailto:19991214200811.A22601@lucent.com">19991214200811.A22601@lucent.com</a>><br>
|
|
X-Mailer: Mutt 0.95i<br>
|
|
From: Peter Fales <<a href="mailto:psfales@lucent.com">psfales@lucent.com</a>><br>
|
|
To: David Mosberger-Tang <<a href="mailto:davidm@mostang.com">davidm@mostang.com</a>><br>
|
|
Subject: Re: Kodak DC-20/25 Backend<br>
|
|
Date: Tue, 14 Dec 1999 20:08:12 -0600<br>
|
|
<p>
|
|
<p>
|
|
--dDRMvlgZJXvWKvBx<br>
|
|
Content-Type: text/plain; charset=us-ascii<br>
|
|
<p>
|
|
David,<br>
|
|
<p>
|
|
I saw that the 991212 version came out recently. Here are a few<br>
|
|
more patches to the DC-25 backend. I thought I sent these back in<br>
|
|
October, but apparently they didn't make it in:<br>
|
|
<p>
|
|
- The most significant is a retry capability for missing data or bad checksums<br>
|
|
in the data from the camera. This has resulted in a dramatic<br>
|
|
reduction in download failures.<br>
|
|
<p>
|
|
- Include HAVE_CFMAKERAW in config.h.in and dc25.c.<br>
|
|
<p>
|
|
- Updated dc25.desc<br>
|
|
<p>
|
|
- Symbol clash in xscanimage with recent version of the gimp library<br>
|
|
<p>
|
|
Peter Fales<br>
|
|
<p>
|
|
<p>
|
|
--dDRMvlgZJXvWKvBx<br>
|
|
Content-Type: text/plain; charset=us-ascii<br>
|
|
Content-Disposition: attachment; filename="sane-devel-19991212+DC25.patch"<br>
|
|
<p>
|
|
diff -r sane-devel-19991212/backend/dc25.c sane-devel-19991212+DC25/backend/dc25.c<br>
|
|
101a102<br>
|
|
<i>> #include <sane/config.h></i><br>
|
|
345a347,352<br>
|
|
<i>> /*</i><br>
|
|
<i>> * List of speeds to try to establish connection with the camera. </i><br>
|
|
<i>> * Check 9600 first, as it's the speed the camera comes up in, then</i><br>
|
|
<i>> * 115200, as that is the one most likely to be configured from a </i><br>
|
|
<i>> * previous run</i><br>
|
|
<i>> */</i><br>
|
|
347,348c354,356<br>
|
|
< { B19200, { 0x19, 0x20 } },<br>
|
|
< { B38400, { 0x38, 0x40 } },<br>
|
|
<pre>
|
|
---
|
|
> #ifdef B115200
|
|
> { B115200, { 0x11, 0x52 } },
|
|
> #endif
|
|
352,354c360,361
|
|
< #ifdef B115200
|
|
< { B115200, { 0x11, 0x52 } }
|
|
< #endif
|
|
<pre>
|
|
---
|
|
> { B38400, { 0x38, 0x40 } },
|
|
> { B19200, { 0x19, 0x20 } },
|
|
426c433
|
|
< #ifdef HAVE_cfmakeraw
|
|
<pre>
|
|
---
|
|
> #ifdef HAVE_CFMAKERAW
|
|
435c442
|
|
< tty_new.c_cc[VTIME] = 10;
|
|
<pre>
|
|
---
|
|
> tty_new.c_cc[VTIME] = 50;
|
|
584a592
|
|
> int retries=0;
|
|
589,590c597,604
|
|
< for (n = 0; n < sz && (r = read (fd, (char *)&buf[n], sz - n)) > 0; n += r)
|
|
< ;
|
|
<pre>
|
|
---
|
|
> while ( retries++ < 5 ) {
|
|
>
|
|
> /*
|
|
> * If this is not the first time through, then it must be
|
|
> * a retry - signal the camera that we didn't like what
|
|
> * we got. In either case, start filling the packet
|
|
> */
|
|
> if ( retries != 1 ) {
|
|
592,595c606,611
|
|
< if (r <= 0) {
|
|
< DBG (2,"read_data: error: read returned -1\n");
|
|
< return -1;
|
|
< }
|
|
<pre>
|
|
---
|
|
> DBG (2, "Attempt retry %d\n",retries);
|
|
> c=0xe3;
|
|
> if (write (fd, (char *)&c, 1) != 1) {
|
|
> DBG (2,"read_data: error: write ack\n");
|
|
> return -1;
|
|
> }
|
|
597,600c613
|
|
< if (n < sz || read (fd, &rcsum, 1) != 1) {
|
|
< DBG (2,"read_data: error: buffer underrun or no checksum\n");
|
|
< return -1;
|
|
< }
|
|
<pre>
|
|
---
|
|
> }
|
|
602,603c615,621
|
|
< for (i = 0, ccsum = 0; i < n; i++)
|
|
< ccsum ^= buf[i];
|
|
<pre>
|
|
---
|
|
> for (n = 0; n < sz && (r = read (fd, (char *)&buf[n], sz - n)) > 0; n += r)
|
|
> ;
|
|
>
|
|
> if (r <= 0) {
|
|
> DBG (2,"read_data: error: read returned -1\n");
|
|
> continue;
|
|
> }
|
|
605,607c623,637
|
|
< if (ccsum != rcsum) {
|
|
< DBG (2,"read_data: error: bad checksum (%02x != %02x)\n",rcsum, ccsum);
|
|
< return -1;
|
|
<pre>
|
|
---
|
|
> if (n < sz || read (fd, &rcsum, 1) != 1) {
|
|
> DBG (2,"read_data: error: buffer underrun or no checksum\n");
|
|
> continue;
|
|
> }
|
|
>
|
|
> for (i = 0, ccsum = 0; i < n; i++)
|
|
> ccsum ^= buf[i];
|
|
>
|
|
> if (ccsum != rcsum) {
|
|
> DBG (2,"read_data: error: bad checksum (%02x != %02x)\n",rcsum, ccsum);
|
|
> continue;
|
|
> }
|
|
>
|
|
> /* If we got this far, then the packet is OK */
|
|
> break;
|
|
diff -r sane-devel-19991212/backend/dc25.desc sane-devel-19991212+DC25/backend/dc25.desc
|
|
4,5c4,5
|
|
< :version "1.1" ; version of backend
|
|
< :status :alpha ; :alpha, :beta, :stable, :new
|
|
<pre>
|
|
---
|
|
> :version "1.2" ; version of backend
|
|
> :status :beta ; :alpha, :beta, :stable, :new
|
|
7c7
|
|
< :url "<a href="http://www.megsinet.net/~psfales/DC-25.html">http://www.megsinet.net/~psfales/DC-25.html</a>";
|
|
<pre>
|
|
---
|
|
> :url "<a href="http://peter.fales.com/DC-25.html">http://peter.fales.com/DC-25.html</a>";
|
|
13c13
|
|
< :comment "DC-20 is untested!" ;
|
|
<pre>
|
|
---
|
|
> :comment "DC-20 untested by author but reported to work" ;
|
|
diff -r sane-devel-19991212/frontend/xscanimage.c sane-devel-19991212+DC25/frontend/xscanimage.c
|
|
78c78
|
|
< STANDALONE, GIMP_EXTENSION
|
|
<pre>
|
|
---
|
|
> STANDALONE, GIMP_EXTENSION_FIX_COLLISION
|
|
304c304
|
|
< scan_win.mode = GIMP_EXTENSION;
|
|
<pre>
|
|
---
|
|
> scan_win.mode = GIMP_EXTENSION_FIX_COLLISION;
|
|
459c459
|
|
< if (scan_win.mode == GIMP_EXTENSION)
|
|
<pre>
|
|
---
|
|
> if (scan_win.mode == GIMP_EXTENSION_FIX_COLLISION)
|
|
806c806
|
|
< if (scan_win.mode == GIMP_EXTENSION && scan_win.tile)
|
|
<pre>
|
|
---
|
|
> if (scan_win.mode == GIMP_EXTENSION_FIX_COLLISION && scan_win.tile)
|
|
diff -r sane-devel-19991212/include/sane/config.h.in sane-devel-19991212+DC25/include/sane/config.h.in
|
|
325a326,328
|
|
> /* Define if you have cfmakeraw() */
|
|
> #undef HAVE_CFMAKERAW
|
|
>
|
|
<p>
|
|
--dDRMvlgZJXvWKvBx--
|
|
<p>
|
|
--pZZmKD1tXo--
|
|
<p>
|
|
<pre>
|
|
--
|
|
Source code, list archive, and docs: <a href="http://www.mostang.com/sane/">http://www.mostang.com/sane/</a>
|
|
To unsubscribe: echo unsubscribe sane-devel | mail <a href="mailto:majordomo@mostang.com">majordomo@mostang.com</a>
|
|
</pre>
|
|
<!-- body="end" -->
|
|
<p>
|
|
<ul>
|
|
<!-- next="start" -->
|
|
<li> <b>Next message:</b> <a href="0121.html">David Mosberger-Tang: "forwarded message from Stanislav Brabec"</a>
|
|
<li> <b>Previous message:</b> <a href="0119.html">Fred Willingham: "Re: Mustek 12000SP / V1.00"</a>
|
|
<!-- nextthread="start" -->
|
|
<!-- reply="end" -->
|
|
</ul>
|