Updates for Epson Perfection 1670

ChangeLog

@@ -1,3 +1,7 @@
+2003-10-07  Oliver Schwartz <Oliver.Schwartz@gmx.de>
+	* backend/snapscan.h backend/snapscan-scsi.c
+	  Updates for Epson Perfection 1670
+
 2003-10-07  Oliver Schwartz <Oliver.Schwartz@gmx.de>
 	* backend/snapscan.h backend/snapscan.c backend/snapscan-option.c
 	  Initial support for Epson Perfection 1670, minor bugfix

backend/snapscan-scsi.c

@@ -1171,6 +1171,20 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
                 bufLength = ftell(fd);
                 fseek(fd, 0, SEEK_SET);
                 break;
+            case PERFECTION1670:
+                /* AGFA firmware files contain an info block which
+                   specifies the length of the firmware data. The
+                   length information is stored at offset 0x64 from
+                   end of file */
+                {
+                    unsigned char size_l, size_h;
+                    fseek(fd, -0x64, SEEK_END);
+                    fread(&size_l, 1, 1, fd);
+                    fread(&size_h, 1, 1, fd);
+                    fseek(fd, 0, SEEK_SET);
+                    bufLength = (size_h << 8) + size_l;
+                }
+                break;
             default:
                 /* AGFA firmware files contain an info block which
                    specifies the length of the firmware data. The
@@ -1211,6 +1225,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
 
 /*
  * $Log$
+ * Revision 1.24  2003/10/07 19:41:34  oliver-guest
+ * Updates for Epson Perfection 1670
+ *
  * Revision 1.23  2003/08/19 21:05:08  oliverschwartz
  * Scanner ID cleanup
  *

backend/snapscan.h

@@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
- 
+
    Copyright (C) 1997, 1998, 1999, 2001  Franck Schnefra, Michel Roelofs,
    Emmanuel Blot, Mikko Tyolajarvi, David Mosberger-Tang, Wolfgang Goeller,
    Petter Reinholdtsen, Gary Plewa, Sebastien Sable, Mikael Magnusson,
@@ -182,7 +182,8 @@ static struct SnapScan_Model_desc scanners[] =
     {"SnapScan",            SNAPSCAN},
     {"ACERSCAN_A4____1",    ACER300F},
     {"Perfection 660",      PERFECTION660},
-    {"EPSON Scanner",       PERFECTION1670},
+    {"EPSON Scanner",       PERFECTION1670}, /* dummy entry to detect scanner */
+    {"GT-8400",             PERFECTION1670},
     {"ARCUS 1200",          ARCUS1200}
 };
 #define known_scanners ((int) (sizeof(scanners)/sizeof(scanners[0])))
@@ -374,6 +375,9 @@ struct snapscan_scanner
 
 /*
  * $Log$
+ * Revision 1.25  2003/10/07 19:41:34  oliver-guest
+ * Updates for Epson Perfection 1670
+ *
  * Revision 1.24  2003/10/07 18:29:20  oliver-guest
  * Initial support for Epson 1670, minor bugfix
  *