Updated microtek2 backend to build

20011023 (from karsten.festag@t-online.de (Karsten Festag)).
Bugfix for scsi_read_image_status - supports now the old and the
new method. Improved backend-calibration supports brightness and
contrast settings and color balancing. Enable 12 bit per color
scanning with Scanmaker 9600XL (and other types that use the segreg
pixel transfer format and support 12 bit, untested). 10 bit does not
work yet. Make C6 USB work.
Henning Meier-Geinitz <henning@meier-geinitz.de>

backend/microtek2.desc

@@ -10,10 +10,10 @@
 ;
 
 :backend "microtek2"              ; name of backend
-:url "http://home.t-online.de/home/karsten.festag"
 :version "0.9"                    ; version of backend
 :status :alpha                    ; :alpha, :beta, :stable, :new
 :manpage "sane-microtek2"         ; name of manpage (if it exists)
+:url "http://home.t-online.de/home/karsten.festag/"
 
 :devicetype :scanner              ; start of a list of devices....
 
@@ -68,3 +68,4 @@
 :comment "only E3plus based models"
 
 
+

backend/microtek2.h

@@ -90,7 +90,7 @@
 
 #define MICROTEK2_MAJOR         0
 #define MICROTEK2_MINOR	        9
-#define MICROTEK2_BUILD         "20010828"
+#define MICROTEK2_BUILD         "20011023"
 #define MICROTEK2_CONFIG_FILE   "microtek2.conf"
 
 
@@ -1224,7 +1224,7 @@ get_lut_size(Microtek2_Info *, int *, int *);
 static SANE_Status
 gray_copy_pixels(Microtek2_Scanner *ms, u_int8_t *, int, int);
 
-static SANE_Status                
+static SANE_Status
 gray_proc_data(Microtek2_Scanner *);
 
 #if 0
@@ -1313,13 +1313,11 @@ static SANE_Status
 scsi_read_attributes(Microtek2_Info *, char *, u_int8_t);
 
 static SANE_Status
-scsi_read_control_bits(Microtek2_Scanner *, int);
+scsi_read_control_bits(Microtek2_Scanner *);
 
 /* currently not used */
-#if 0
-static SANE_Status
-scsi_read_gamma(Microtek2_Scanner *, int);
-#endif
+/* static SANE_Status
+scsi_read_gamma(Microtek2_Scanner *); */
 
 static SANE_Status
 scsi_read_image(Microtek2_Scanner *, u_int8_t *);

doc/sane-microtek2.man

@@ -1,7 +1,7 @@
 . .IX sane-microtek2
 ." Process this file with
 ." man -l sane-microtek2.man
-.TH sane-microtek2 5 "14 Aug 2001"
+.TH sane-microtek2 5 "23 Oct 2001"
 .SH NAME
 sane-microtek2 - SANE backend for Microtek scanners with SCSI-2 command set
 .SH DESCRIPTION
@@ -10,14 +10,16 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to some Microtek scanners with a SCSI-2 command set.
 This backend can be considered alpha. Some scanner models are reported to work
-well, others not.
+well, others not. New development versions of this backend can be obtained from
+.B http://home.t-online.de/home/karsten.festag
 .PP
 There exists a different backend for Microtek scanners with SCSI-1 command
 set.
 Refer to sane-microtek(5) for details.
 .PP
 And there is work in progress for the ScanMaker 3600.
-See http://sourceforge.net/projects/sm3600
+See
+.B http://sourceforge.net/projects/sm3600
 .PP
 At present, the following scanners are known positively to work with this
 backend:
@@ -52,30 +54,37 @@ Microtek   Phantom 330CX      Parport
 .br
 Microtek   SlimScan C3        Parport
 .br
+Microtek   SlimScan C6        USB
+.br
 Microtek   Phantom 636        SCSI
 .br
 Microtek   Phantom 636CX      Parport
 .br
 Microtek   V6USL              SCSI (and USB ???)
 .br
+Microtek   V6UPL              USB; not stable
+.br
 Vobis      HighScan           SCSI (E3+ based models)
 .br
-Scanport?  SQ300              Parport?
+Scanport   SQ300              Parport?
+.br
+Scanport   SQ4836             SCSI
 .br
 Scanpaq    SQ2030             Parport
 .PP
 Additional information can be found at
-.B www.mostang.com/sane/
-.
-If you own a Microtek scanner with SCSI-2 interface other than the ones
-listed
-above, it may or may not work with SANE! Because equal scanners are sold under
+.B http://www.mostang.com/sane/ .
+.PP
+If you own a Microtek scanner other than the ones listed above,
+it may or may not work with SANE! Because equal scanners are sold under
 different names in different countries your model may be equivalent to one of
 the above.
 .PP
-The parport scanners work with the ppscsi + onscsi kernel modules.
+The parport scanners work with the ppscsi + onscsi kernel modules. See
+.B http://www.torque.net/parport/ppscsi.html
 .PP
-The USB scanners work with the microtek kernel module.
+The USB scanners work with the microtek kernel module. You may have to add the
+vendor and model codes to microtek.c if they aren't yet listed there.
 .PP
 Both parport and USB scanners need the generic SCSI support, so check if you
 have loaded the scsi_mod and sg modules!