2001-04-07 Henning Meier-Geinitz <hmg@gmx.de>

* backend/sc240.c backend/dc240.h backend/dc240.conf
	  backend/dc240.desc backend/dll.conf doc/sane-dc240.man:
	  Added dc240 backend for the Kodak DC240 Digital camera (from
	  Peter Fales <peter@fales.com>).
	* doc/Makefile.in: Added sane-dc240 in section 5.
	* backend/Makefile.in: Added dc240.
	* configure configure.in: If the jpeg libs are not available,
	  dc240 is also disabled.
	* AUTHORS: Added entry for dc240 and updated email address of
	  Peter Fales.
	* NEWS: First version of the news entry for 1.0.5.
	* PROJECTS: Removed dc240. Added Microrec ScanMaker 3600.
	* README: Added dc240.
	* TODO: Removed dc240. Added entry about keep-alive mechanism in saned.
	* sane-backends.lsm: Added dc240.
	* testsuite/.cvsignore: New file. Added entry for Makefile.

AUTHORS

@@ -19,6 +19,7 @@ Backends:
  coolscan:      Didier Carlier, Andreas Rick (*)
  dc25:          Peter Fales (*)
  dc210:         Brian J. Murrell
+ dc240:         Peter Fales (*)
  dll:           David Mosberger
  dmc:           David F. Skoll
  epson:         Karl Heinz Kremer(*)
@@ -109,7 +110,7 @@ Michel Roelofs <michelr@stack.nl>
 Milon Firikis <milonf@ariadne-t.gr>
 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
 Patrick Reynolds <patrickr@virginia.edu>
-Peter Fales <psfales@earthling.net>
+Peter Fales <peter@fales.com>
 Peter Kirchgessner <peter@kirchgessner.net>
 Petter Reinholdtsen <pere@td.org.uit.no>
 Randolph Bentson <bentson@grieg.holmsjoen.com>

PROJECTS

@@ -1,4 +1,4 @@
-PROJECTS (2001-03-31)
+PROJECTS (2001-04-07)
 
 Here is a list of projects that various people have expressed interest
 in.  Before starting working on one of these projects, it may be a
@@ -34,8 +34,8 @@ ftp://www.cs.ubishops.ca/pub/lhii/
 HP USB backend for HP 4200 (wip)
 http://hp4200-backend.sourceforge.net/
 
-Kodak DC-240 backend (wip)
+Microtek ScanMaker 3600 USB scanner (wip)
-Peter Fales <psfales@lucent.com>
+http://sm3600.sourceforge.net
 
 Mustek BearPaw USB scanner (wip)
 Henning Meier-Geinitz <hmg@gmx.de>

README

@@ -146,6 +146,7 @@ below:
     Connectix QuickCam     sane-qcam(5)
     Kodak DC20/DC25        sane-dc25(5)
     Kodak dc210            sane-dc210(5)
+    Kodak dc240            sane-dc240(5)
     Polaroid               sane-dmc(5)
   
   Miscellaneous backends:

backend/Makefile.in

@@ -53,9 +53,9 @@ COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) $(CPPFLAGS)
 @SET_MAKE@
 
 PRELOADABLE_BACKENDS = abaton agfafocus apple artec as6e avision bh canon \
-        coolscan dc25 @DC210@ dmc epson hp m3096g microtek microtek2 mustek \
+        coolscan dc25 @DC210@ @DC240@ dmc epson hp m3096g microtek microtek2 \
-        mustek_pp nec @NET@ pie @PINT@ plustek pnm @QCAM@ ricoh s9036 sharp \
+	mustek mustek_pp nec @NET@ pie @PINT@ plustek pnm @QCAM@ ricoh s9036 \
-        snapscan sp15c st400 tamarack umax @V4L@
+	sharp snapscan sp15c st400 tamarack umax @V4L@
 ALL_BACKENDS = $(PRELOADABLE_BACKENDS) dll
 
 LIBS = $(addprefix libsane-,$(addsuffix .la,$(ALL_BACKENDS)))
@@ -156,6 +156,7 @@ libsane.la: dll.lo dll-s.lo $(EXTRA) $(addsuffix .lo,$(DLL_PRELOAD)) $(LIBOBJS)
 
 EXTRA_hp = hp-accessor hp-device hp-handle hp-hpmem hp-option hp-scl
 EXTRA_dc210 = djpeg
+EXTRA_dc240 = djpeg
 
 # When preloading dll, we need to add in all preloaded objects:
 libsane-dll.la: $(addsuffix .lo,$(DLL_PRELOAD))
@@ -193,6 +194,7 @@ libsane-coolscan.la: ../sanei/sanei_constrain_value.lo
 libsane-coolscan.la: ../sanei/sanei_scsi.lo
 libsane-dc25.la: ../sanei/sanei_constrain_value.lo
 libsane-dc210.la: ../sanei/sanei_constrain_value.lo djpeg.lo
+libsane-dc240.la: ../sanei/sanei_constrain_value.lo djpeg.lo
 libsane-dmc.la: ../sanei/sanei_config2.lo
 libsane-dmc.la: ../sanei/sanei_constrain_value.lo
 libsane-dmc.la: ../sanei/sanei_scsi.lo

backend/dc240.conf

@@ -0,0 +1,27 @@
+# Serial port where the camera is connected
+## Linux
+port=/dev/ttyS0
+## IRIX
+#port=/dev/ttyd1
+## Solaris
+#port=/dev/term/a
+## HP-UX
+#port=/dev/tty0p0
+## Digital UNIX
+#port=/dev/tty01
+# Max baud rate for download.  Camera always starts at 9600 baud, then
+# switches to the higher rate
+## This works for Linux and some versions of IRIX (6.3 or higher)
+baud=115200
+## This works for most UNIX's
+#baud=38400
+# Prints some extra information during the init phase.  This can be
+# handy, but note that printing anything to stderr breaks the saned 
+# network scanning.
+#dumpinquiry
+# How many usec (1,000,000ths of a) between writing the command and reading the
+# result. 125000 seems to be the lowest I could go reliably.
+cmdrespause=125000
+# How many usec (1,000,000ths of a) between sending the "back to default" break
+# sending commands.
+breakpause=1000000;

backend/dc240.desc

@@ -0,0 +1,14 @@
+;Kodak DC240 backend .desc file by Peter S. Fales
+
+:backend "dc240"		; name of backend
+:version "0.0"                  ; version of backend
+:status :alpha                  ; :alpha, :beta, :stable, :new
+:manpage "sane-dc240"		; name of manpage (if it exists)
+;:url none			; backend's web page
+
+:devicetype :stillcam           ; start of a list of devices....
+ 
+:mfg "Kodak"
+:url "http://www.kodak.com/US/en/digital/cameras/DCSGateway.shtml"
+:model "DC240"
+:interface "Serial port"

backend/dll.conf

@@ -11,6 +11,7 @@ canon
 coolscan
 #dc25
 #dc210
+#dc240
 dmc
 epson
 hp

doc/Makefile.in

@@ -38,7 +38,7 @@ SECT5	= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 sane-dll.5 \
           sane-artec.5 sane-fujitsu.5 sane-sharp.5 sane-s9036.5 \
           sane-tamarack.5 sane-ricoh.5 sane-avision.5 sane-plustek.5 \
           sane-st400.5 sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 \
-          sane-snapscan.5 sane-canon.5 sane-coolscan.5 sane-bh.5
+          sane-snapscan.5 sane-canon.5 sane-coolscan.5 sane-bh.5 sane-dc240.5
 MANPAGES = $(SECT1) $(SECT5)
 DOCS	= sane.ps sane.dvi
 LATEX	= TEXINPUTS=$(srcdir):$$TEXINPUTS latex

doc/sane-dc240.man

@@ -0,0 +1,111 @@
+.TH sane-dc240 5 "23 March 2001"
+.IX sane-dc240
+.SH NAME
+sane-dc240 \- SANE backend for Kodak DC240 Digital Camera
+.SH DESCRIPTION
+The
+.B sane-dc240
+library implements a SANE (Scanner Access Now Easy) backend that
+provides access to the Kodak DC240 camera. THIS IS EXTREMELY ALPHA
+CODE!  USE AT YOUR OWN RISK!!
+.SH "DEVICE NAMES"
+The current version of the backend only allows one camera to be
+connected.  The device name is always "0".
+.SH CONFIGURATION
+The contents of the
+.I dc240.conf
+specify the serial port and baud rate to use.  The baud rate 
+specifies the maximum rate to use while downloading pictures.  (The
+camera is always initialized using 9600 baud, then switches to the
+higher rate).  On a 450MHz Pentium, I usually have no problems downloading
+at 115200 baud, though the camera sometimes has to resend packets due
+to lost characters.  Results are better when 
+the "interrupt-unmask flag" is set in the IDE driver (hdparm -u1).
+Supported baud rates are: 9600, 19200, 38400, 57600, and 115200.
+.PP
+The dumpinquiry line causes some information about the camera to 
+be printed.
+.PP
+cmdrespause specifies how many usec (1,000,000ths of a) between
+writing the command and reading the result should be used. 125000
+seems to be the lowest I could go reliably.
+.PP
+breakpause is the time in 1,000,000ths of a usec between sending the
+"back to default" break sending commands.      
+.PP
+Empty lines and lines starting with a hash mark (#) are
+ignored.  A sample configuration file is shown below:
+.PP
+.RS
+port=/dev/ttyS0
+.br
+# this is a comment
+.br
+baud=115200
+.br
+dumpinquiry
+.br
+cmdrespause=125000
+.br
+breakpause=1000000
+.RE
+.PP
+.SH FILES
+.TP
+.I @CONFIGDIR@/dc240.conf
+The backend configuration file (see also description of
+.B SANE_CONFIG_DIR
+below).
+.TP
+.I @LIBDIR@/libsane-dc240.a
+The static library implementing this backend.
+.TP
+.I @LIBDIR@/libsane-dc240.so
+The shared library implementing this backend (present on systems that
+support dynamic loading).
+
+.SH ENVIRONMENT
+.TP
+.B SANE_CONFIG_DIR
+This environment variable specifies the list of directories that may
+contain the configuration file.  Under UNIX, the directories are
+separated by a colon (`:'), under OS/2, they are separated by a
+semi-colon (`;').  If this variable is not set, the configuration file
+is searched in two default directories: first, the current working
+directory (".") and then in /usr/local/etc/sane.d.  If the value of the
+environment variable ends with the directory separator character, then
+the default directories are searched after the explicitly specified
+directories.  For example, setting
+.B SANE_CONFIG_DIR
+to "/tmp/config:" would result in directories "tmp/config", ".", and
+"/usr/local/etc/sane.d" being searched (in this order).
+.TP
+.B SANE_DEBUG_DC240
+If the library was compiled with debugging support enabled, this
+environment variable controls the debug level for this backend. 
+A value of 128 requests maximally copious debug output; smaller
+levels reduce verbosity.
+
+.SH "SEE ALSO"
+
+.SH AUTHOR
+Peter S. Fales
+
+.PP
+This backend borrows heavily from the dc210 backend by Brian J. Murrell
+which is based somewhat on the dc25 backend by Peter Fales.
+.PP
+The manpage was largeley copied from the dc210 manpage.
+
+.SH BUGS
+The major limitation that I know of is that the backend assumes
+the directory in the camera is 100dc240.  Once the camera has
+taken more than 9999 pictures, the directory will increment to 101dc240. 
+Not only should we check for the additional directory, but pictures may
+actually be found in multiple directories.
+.PP
+More general comments, suggestions, and inquiries about frontends
+or SANE should go to 
+.BR sane\-devel@mostang.com ,
+the SANE Developers mailing list.
+