From 3f857c4c8231ed309e187bec3eac34f1c765cf01 Mon Sep 17 00:00:00 2001
From: "m. allan noah" <kitno455@gmail.com>
Date: Sun, 30 Dec 2007 01:31:13 +0000
Subject: [PATCH] update backend as per m. ellert's FIRMWARE_DIRS/DATADIR
 suggestion

---
 ChangeLog               | 5 +++++
 backend/Makefile.in     | 2 +-
 backend/epjitsu.c       | 3 ---
 backend/epjitsu.conf.in | 5 ++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b936d16c9..fc33ce968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-29  m. allan noah <kitno455 a t gmail d o t com>
+	* backend/epjitsu.c: let io_error fall thru usb command function
+	* backend/epjitsu.conf.in: use @DATADIR@ for holding firmware
+	* backend/Makefile.in: add epjitsu to FIRMWARE_DIRS
+
 2007-12-29  m. allan noah <kitno455 a t gmail d o t com>
 	* include/sane/sane.h, frontend/scanimage.c, backend/fujitsu.[ch]:
 	  commented/removed/deactivated all new SANE_FRAME code
diff --git a/backend/Makefile.in b/backend/Makefile.in
index 652698714..593a2cd88 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -64,7 +64,7 @@ COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) $(CPPFLAGS)
 
 DISTCLEAN_FILES = @DISTCLEAN_FILES@
 
-FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan
+FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
 
 @SET_MAKE@
 
diff --git a/backend/epjitsu.c b/backend/epjitsu.c
index c0b125b37..3696ce8ee 100644
--- a/backend/epjitsu.c
+++ b/backend/epjitsu.c
@@ -3201,9 +3201,6 @@ do_cmd(struct scanner *s, int shortTime,
         if(ret == SANE_STATUS_EOF){
             DBG(5,"in: got EOF, continuing\n");
         }
-        else if(ret == SANE_STATUS_IO_ERROR){
-            DBG(5,"in: got IO_ERROR, continuing\n");
-        }
         else if(ret != SANE_STATUS_GOOD){
             DBG(5,"in: return error '%s'\n",sane_strstatus(ret));
             return ret;
diff --git a/backend/epjitsu.conf.in b/backend/epjitsu.conf.in
index 47d4521f0..ef9229798 100644
--- a/backend/epjitsu.conf.in
+++ b/backend/epjitsu.conf.in
@@ -16,10 +16,9 @@
 # NOTE: the firmware line must occur BEFORE the usb line for your scanner
 
 # Fujitsu fi-60F
-firmware /lib/firmware/60f_0A00.nal
-firmware /lib/firmware/60f_0000.nal
+firmware @DATADIR@/sane/epjitsu/60f_0A00.nal
 usb 0x04c5 0x10c7
 
 # Fujitsu S300
-firmware /lib/firmware/300_0A00.nal
+firmware @DATADIR@/sane/epjitsu/300_0A00.nal
 usb 0x04c5 0x1156