update to v1.0.41

ChangeLog

@@ -1,3 +1,11 @@
+2006-08-28  m. allan noah <anoah AT pfeiffer DOT edu>
+
+	* backend/fujitsu.c backend/fujitsu-scsi.h: update to v1.0.41,
+	  do_usb_cmd() returns io error on cmd/out/status/rs EOF,
+	  fix bug in MS buffer/prepick scsi data block
+	* doc/descriptions/fujitsu.desc:
+	  version number update
+
 2006-08-28  Stephane Voltz <stefdev@modulonet.fr>
 
 	* backend/genesys_gl646.c: changes in gl646_init_regs_for_warmup

backend/fujitsu-scsi.h

@@ -489,9 +489,9 @@ static scsiblk mode_select_10byteB = {
 #define MSEL_dropout_BLUE    11
 #define MSEL_dropout_CUSTOM  12
 
-#define set_MSEL_buff_mode(sb, val) setbitfield(sb + 0x02, 0x03, 6, val)
+#define set_MSEL_buff_mode(sb, val) setbitfield(sb + 0x06, 0x03, 6, val)
 
-#define set_MSEL_prepick(sb, val) setbitfield(sb + 0x02, 0x03, 6, val)
+#define set_MSEL_prepick(sb, val) setbitfield(sb + 0x06, 0x03, 6, val)
 
 /*buffer and prepick use these*/
 #define MSEL_DEFAULT 0

backend/fujitsu.c

@@ -230,6 +230,9 @@
          - support MS buffer (s.scipioni AT harvardgroup DOT it)
          - support MS prepick
          - read only 1 byte of mode sense output
+      V 1.0.41 2006-08-28, MAN
+         - do_usb_cmd() returns io error on cmd/out/status/rs EOF
+         - fix bug in MS buffer/prepick scsi data block
 
    SANE FLOW DIAGRAM
 
@@ -290,7 +293,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 40 
+#define BUILD 41 
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -5173,6 +5176,10 @@ do_usb_cmd(struct fujitsu *s, int runRS, int shortTime,
     ret = sanei_usb_write_bulk(s->fd, usb_cmdBuff, &usb_cmdLen);
     DBG(25, "cmd: wrote %d bytes, retVal %d\n", (int)usb_cmdLen, ret);
 
+    if(ret == SANE_STATUS_EOF){
+        DBG(5,"cmd: got EOF, returning IO_ERROR\n");
+        return SANE_STATUS_IO_ERROR;
+    }
     if(ret != SANE_STATUS_GOOD){
         DBG(5,"cmd: return error '%s'\n",sane_strstatus(ret));
         return ret;
@@ -5193,6 +5200,10 @@ do_usb_cmd(struct fujitsu *s, int runRS, int shortTime,
         ret = sanei_usb_write_bulk(s->fd, outBuff, &usb_outLen);
         DBG(25, "out: wrote %d bytes, retVal %d\n", (int)usb_outLen, ret);
 
+        if(ret == SANE_STATUS_EOF){
+            DBG(5,"out: got EOF, returning IO_ERROR\n");
+            return SANE_STATUS_IO_ERROR;
+        }
         if(ret != SANE_STATUS_GOOD){
             DBG(5,"out: return error '%s'\n",sane_strstatus(ret));
             return ret;
@@ -5216,8 +5227,10 @@ do_usb_cmd(struct fujitsu *s, int runRS, int shortTime,
         ret = sanei_usb_read_bulk(s->fd, inBuff, inLen);
         DBG(25, "in: retVal %d\n", ret);
 
-        /* sanei returns EOF on 0 len reads */
-        if(ret != SANE_STATUS_GOOD && ret != SANE_STATUS_EOF){
+        if(ret == SANE_STATUS_EOF){
+            DBG(5,"in: got EOF, continuing\n");
+        }
+        else if(ret != SANE_STATUS_GOOD){
             DBG(5,"in: return error '%s'\n",sane_strstatus(ret));
             return ret;
         }
@@ -5245,6 +5258,10 @@ do_usb_cmd(struct fujitsu *s, int runRS, int shortTime,
     hexdump(30, "stat: <<", usb_statBuff, usb_statLen);
     DBG(25, "stat: read %d bytes, retVal %d\n", (int)usb_statLen, ret2);
 
+    if(ret2 == SANE_STATUS_EOF){
+        DBG(5,"stat: got EOF, returning IO_ERROR\n");
+        return SANE_STATUS_IO_ERROR;
+    }
     if(ret2 != SANE_STATUS_GOOD){
         DBG(5,"stat: return error '%s'\n",sane_strstatus(ret2));
         return ret2;
@@ -5278,6 +5295,10 @@ do_usb_cmd(struct fujitsu *s, int runRS, int shortTime,
         );
         DBG(25,"rs sub call <<\n");
   
+        if(ret2 == SANE_STATUS_EOF){
+          DBG(5,"rs: got EOF, returning IO_ERROR\n");
+          return SANE_STATUS_IO_ERROR;
+        }
         if(ret2 != SANE_STATUS_GOOD){
           DBG(5,"rs: return error '%s'\n",sane_strstatus(ret2));
           return ret2;

doc/descriptions/fujitsu.desc

@@ -11,7 +11,7 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www2.pfeiffer.edu/~anoah/fujitsu/" 
-:version "1.0.40"                ; version of backend
+:version "1.0.41"                ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
 :comment "Backend re-written for SANE release 1.0.18, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....