* backend/avision.c: backend v290, fix reader_pid and NVRAM option

issues, by Mattias Ellert.
* backend/fujitsu.c: backend v89, fi-4750 has no serial number support
* doc/descriptions/fujitsu.desc: backend v89, remove 'MAC/TWAIN' text
* doc/sane-fujitsu.man: backend v89
* backend/.cvsignore: ignore *.loT

ChangeLog

@@ -1,3 +1,11 @@
+2009-03-20  m. allan noah <kitno455 a t gmail d o t com>
+	* backend/avision.c: backend v290, fix reader_pid and NVRAM option
+	  issues, by Mattias Ellert.
+	* backend/fujitsu.c: backend v89, fi-4750 has no serial number support
+	* doc/descriptions/fujitsu.desc: backend v89, remove 'MAC/TWAIN' text
+	* doc/sane-fujitsu.man: backend v89
+	* backend/.cvsignore: ignore *.loT
+
 2009-02-01  Mattias Ellert <mattias.ellert@fysast.uu.se>
 	* tools/Makefile.am: Add missing liblib dependencies
 	* frontend/scanimage.c: Restore alloca include order

backend/avision.c

@@ -134,7 +134,7 @@
 #include <math.h>
 
 #define BACKEND_NAME avision
-#define BACKEND_BUILD 289 /* avision backend BUILD version */
+#define BACKEND_BUILD 290 /* avision backend BUILD version */
 
 #include <sane/sane.h>
 #include <sane/sanei.h>
@@ -6082,7 +6082,7 @@ do_cancel (Avision_Scanner* s)
   s->duplex_rear_valid = SANE_FALSE;
   s->page = 0;
   
-  if (s->reader_pid > 0) {
+  if (s->reader_pid != -1) {
     int exit_status;
     
     /* ensure child knows it's time to stop: */
@@ -6501,9 +6501,9 @@ init_options (Avision_Scanner* s)
   s->val[OPT_MESSAGE].s[0] = 0;
   
   /* NVRAM */
+  s->opt[OPT_NVRAM].cap = SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED;
   if (!dev->inquiry_nvram_read)
     s->opt[OPT_NVRAM].cap |= SANE_CAP_INACTIVE;
-  s->opt[OPT_NVRAM].cap |= SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED;
   s->opt[OPT_NVRAM].name = "nvram-values";
   s->opt[OPT_NVRAM].title = "Obtain NVRAM values";
   s->opt[OPT_NVRAM].desc = "Allows access obtaining the scanner's NVRAM values as pretty printed text.";
@@ -7607,7 +7607,9 @@ sane_open (SANE_String_Const devicename, SANE_Handle *handle)
   s->av_con.scsi_fd = -1;
   s->av_con.usb_dn = -1;
   
+  s->reader_pid = -1;
   s->read_fds = -1;
+
   s->hw = dev;
   
   /* We initilize the table to a gamma value of 2.22, since this is what
@@ -8283,8 +8285,6 @@ sane_start (SANE_Handle handle)
   s->read_fds = fds[0];
   s->write_fds = fds[1];
 
-  s->reader_pid = -1; /* the thread will be started upon the first read */
-
   /* create reader routine as new process or thread */
   DBG (3, "sane_start: starting thread\n");
   s->reader_pid = sanei_thread_begin (reader_process, (void *) s);

backend/fujitsu.c

@@ -417,6 +417,8 @@
          - deactivate double feed options if df-action == default
       v88 2009-01-21, MAN
          - dont export private symbols
+      v89 2009-03-20, MAN
+         - fi-4750 returns random garbage to serial number queries
 
    SANE FLOW DIAGRAM
 
@@ -477,7 +479,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 88
+#define BUILD 89
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -1972,6 +1974,11 @@ init_model (struct fujitsu *s)
     s->ppl_mod_by_mode[MODE_COLOR] = 4;
   }
 
+  else if (strstr (s->model_name, "fi-4750") ) {
+    /* weirdness */
+    s->broken_diag_serial = 1;
+  }
+
   /* some firmware versions use capital f? */
   else if (strstr (s->model_name, "Fi-4860")
    || strstr (s->model_name, "fi-4860") ) {

doc/descriptions/fujitsu.desc

@@ -11,7 +11,7 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/" 
-:version "87"                    ; version of backend
+:version "89"                    ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.1.0, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -64,31 +64,31 @@
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1096"
-:comment "small, recent, discontinued, no TWAIN driver"
+:comment "small, recent, discontinued"
 
 :model "fi-5110EOX3"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x10e6"
-:comment "small, recent, discontinued, no TWAIN driver"
+:comment "small, recent, discontinued"
 
 :model "fi-5110EOXM"
 :interface "USB"
 :usbid "0x04c5" "0x10f2"
 :status :complete
-:comment "small, recent, discontinued, Mac only"
+:comment "small, recent, discontinued"
 
 :model "ScanSnap S500"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x10fe"
-:comment "small, recent, discontinued, no TWAIN driver"
+:comment "small, recent, discontinued"
 
 :model "ScanSnap S500M"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1135"
-:comment "small, recent, discontinued, no TWAIN driver, Mac only"
+:comment "small, recent, discontinued"
 
 :model "fi-5120C"
 :interface "SCSI USB"
@@ -108,12 +108,12 @@
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1155"
-:comment "small, current, no TWAIN driver"
+:comment "small, current"
 
 :model "ScanSnap S510M"
 :interface "USB"
 :status :complete
-:comment "small, current, no TWAIN driver, Mac only"
+:comment "small, current"
 
 :model "fi-5110C"
 :interface "USB"

doc/sane-fujitsu.man

@@ -10,7 +10,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to most Fujitsu flatbed and ADF scanners.
 
-This document describes backend version 86, slated to ship with SANE 1.1.0.
+This document describes backend version 89, slated to ship with SANE 1.1.0.
 
 .SH SUPPORTED HARDWARE
 This version supports every known model which speaks the Fujitsu SCSI and