2001-10-13 Oliver Rauch <Oliver.Rauch@rauch-domain.de>

* backend/umax.c, bachend/umax-scanner.c, backend/umax.desc,
          doc/umax/sane-umax-config-doc.html, doc/umax/umax.CHANGES,
          doc/sane-umax.man:
          update to sane-umax-1.0 build 30:
          - added EDGE KTX-9600US as supported scanner
          - Changing scansource does not change lower left selection
            edge if not necessary

backend/umax-scanner.c

@@ -112,6 +112,7 @@ static char *scanner_str[] =
   "LinoHell",	"Office ",
   "LinoHell",	"Office2 ",
   "LinoHell",	"SAPHIR2 ",
+/*  "LinoHell",	"SAPHIR3 ", */
 /*  "LinoHell",	"SAPHIR4 ", */
   "Linotype",	"SAPHIR4 ",
 /*  "LinoHell",	"OPAL ", */
@@ -120,6 +121,7 @@ static char *scanner_str[] =
   "KYE ",	"ColorPage-HR5 ", 
   "EPSON ",	"Perfection600 ", 
   "ESCORT ",    "Galleria 600S ", /* is an Astra 600S */
+  "EDGE ",	"KTX-9600US ", /* may be an Astra 1220S */
   "END_OF_LIST"
 };
 

backend/umax.c

@@ -49,7 +49,7 @@
 
 /* --------------------------------------------------------------------------------------------------------- */
 
-#define BUILD 29
+#define BUILD 30
 
 /* --------------------------------------------------------------------------------------------------------- */
 
@@ -6208,16 +6208,13 @@ SANE_Status sane_control_option(SANE_Handle handle, SANE_Int option, SANE_Action
       {
         if (scanner->val[option].s)
         {
-          free (scanner->val[option].s);
+          free(scanner->val[option].s);
         }
-        scanner->val[option].s = (SANE_Char*)strdup(val); /* update string for umax_set_max_geometry */
+        scanner->val[option].s = (SANE_Char *) strdup(val); /* update string for umax_set_max_geometry */
 
         DBG(DBG_info,"sane_control_option: set SOURCE = %s\n", val);
         umax_set_max_geometry(scanner);
 
-        scanner->val[OPT_BR_X].w = scanner->device->x_range.max;       
-        scanner->val[OPT_BR_Y].w = scanner->device->y_range.max;           
-
         if (info)
         {
           *info |= SANE_INFO_RELOAD_PARAMS;

doc/sane-umax.man

@@ -56,7 +56,16 @@ shown below:
    (but has been enabled until this version)
  
  - scsi-buffer-size-min, scsi-buffer-size-max:
-   values: 4096-1048576, default min=65536, max=131072
+   values: 4096-1048576, default min=32768, max=131072
+   Especially the minimum value is very important.
+   If this value is set too small the backend is not
+   able to send gamma tables to the scanner or to
+   do a correct color calibration. This may result in
+   strange color effects. If the minimum value is set
+   too large then the backend is not able to allocate
+   the requested scsi buffer size and aborts with
+   out of memory error. The default is 32KB, for
+   some scanners it should be increased to 64KB.
  
  - scan-lines, preview-lines:
    values: 1-65535,
@@ -99,6 +108,20 @@ shown below:
    values: 0=automatically set by driver - if known,
    1=available, default=0
 
+ - handle-bad-sense-error:
+   values: 0=handle as device busy, 1=handle as ok,
+   2=handle as i/o error, 3=ignore bad error code - continue sense handler,
+   default=0
+
+ - scsi-maxqueue:
+   values: 1..# (maximum defined at compile time).
+   default=2
+   most scsi drivers allow internal command queueing with a depth
+   of 2 commands. In most cases it does not mprove anything when you
+   increase this value. When your scsi driver does not support any
+   command queueing you can try to set this value to 1.
+   
+
 The special device name must be a generic SCSI device or a symlink to such a device.
 To find out to which device your scanner is assigned and how you have to set the
 permissions of that device, have a look at sane-scsi. 

doc/umax/sane-umax-config-doc.html

@@ -123,6 +123,14 @@ of scsi buffer sizes the umax backend calculates the scsi buffer
 sizes in dependance of the numbers of bytes per scanline.
 With <i>scsi-buffer-size-min</i> and <i>scsi-buffer-size-max</i>
 the scsi buffer size can be defined in a range between 4KB and 1MB.
+Especially the minimum value is very important. If this value is
+set too small the backend is not able to send gamma tables to the
+scanner or to do a correct color calibration. This may result in
+strange color effects. If the minimum value is set too large then
+the backend is not able to allocate the requested scsi buffer size
+and aborts with out of memory error. The default is 32KB, for
+some scanners it should be increased to 64KB.
+
 <p>
 The option <i>scan-lines</i> defines the the number of lines that
 shall be scanned with one scsi read command for a real scan.

doc/umax/umax.CHANGES

@@ -984,3 +984,12 @@ build-28 -> build-29
 
    * set minimum resolution to 5 (was 1 before what could make problems)
 
+
+build-29 -> build-30
+--------------------
+
+  * added EDGE KTX-9600US as supported scanner
+
+  * Changing scansource does not change lower left selection edge
+    if not necessary
+