Initial support for Epson 1670, minor bugfix

ChangeLog

@@ -1,3 +1,8 @@
+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
+	  (#300247)
+
 2003-10-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* acinclude.m4 aclocal.m4 configure configure

backend/snapscan-options.c

@@ -142,6 +142,8 @@ static void init_options (SnapScan_Scanner * ps)
         {8, 50, 75, 100, 150, 200, 300, 450, 600};
     static SANE_Word resolutions_1200[] =
         {10, 50, 75, 100, 150, 200, 300, 450, 600, 900, 1200};
+    static SANE_Word resolutions_1600[] =
+        {10, 50, 75, 100, 150, 200, 300, 450, 600, 900, 1200, 1600};
     static SANE_String_Const names_all[] =
         {md_colour, md_bilevelcolour, md_greyscale, md_lineart, NULL};
     static SANE_String_Const names_basic[] =
@@ -215,6 +217,9 @@ static void init_options (SnapScan_Scanner * ps)
     case ARCUS1200:
         po[OPT_SCANRES].constraint.word_list = resolutions_1200;
         break;
+    case PERFECTION1670:
+        po[OPT_SCANRES].constraint.word_list = resolutions_1600;
+        break;
     default:
         po[OPT_SCANRES].constraint.word_list = resolutions_600;
         break;
@@ -1388,6 +1393,9 @@ SANE_Status sane_control_option (SANE_Handle h,
 
 /*
  * $Log$
+ * Revision 1.9  2003/10/07 18:29:20  oliver-guest
+ * Initial support for Epson 1670, minor bugfix
+ *
  * Revision 1.8  2003/08/19 21:05:08  oliverschwartz
  * Scanner ID cleanup
  *

backend/snapscan.c

@@ -78,7 +78,7 @@
 
 #define EXPECTED_MAJOR       1
 #define MINOR_VERSION        4
-#define BUILD               27
+#define BUILD               28
 
 #define BACKEND_NAME snapscan
 
@@ -165,7 +165,7 @@ static char src_tpo[] = SANE_I18N("Transparency Adapter");
 static char src_adf[] = SANE_I18N("Document Feeder");
 
 /* predefined scan window setting names */
-static char pdw_none[] = SANE_I18N("none");
+static char pdw_none[] = SANE_I18N("None");
 static char pdw_6X4[] = SANE_I18N("6x4 (inch)");
 static char pdw_8X10[] = SANE_I18N("8x10 (inch)");
 static char pdw_85X11[] = SANE_I18N("8.5x11 (inch)");
@@ -1770,6 +1770,9 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
 
 /*
  * $Log$
+ * Revision 1.33  2003/10/07 18:29:20  oliver-guest
+ * Initial support for Epson 1670, minor bugfix
+ *
  * Revision 1.32  2003/09/24 18:05:39  oliver-guest
  * Bug #300198: Check second argument of sanei_config_get_string
  *

backend/snapscan.h

@@ -52,6 +52,8 @@
 #ifndef snapscan_h
 #define snapscan_h
 
+#include "../include/sane/sane.h"
+
 #define UNREFERENCED_PARAMETER(x)           ((void) x)
 
 /* snapscan device field values */
@@ -98,6 +100,7 @@ typedef enum
     PRISA5000,          /* Acer ScanPrisa 5000 - 1200 DPI */
     PRISA5300,          /* Acer ScanPrisa 5300 - 1200 DPI */
     PERFECTION660,      /* Epson Perfection 660 - 1200 DPI */
+    PERFECTION1670,     /* Epson Perfection 1670 - 1600 DPI */
     ARCUS1200		/* Agfa Arcus 1200 - 1200 DPI (rebadged Acer?) */
 } SnapScan_Model;
 
@@ -129,8 +132,9 @@ static struct SnapScan_Driver_desc drivers[] =
     {PRISA1240,      "Acer1240"},
     {PRISA5000,      "Acer5000"},
     {PRISA5300,      "Acer5300"},
+    {ARCUS1200,      "Arcus1200"},
     {PERFECTION660,  "Perfection 660"},
-    {ARCUS1200,      "Arcus1200"}
+    {PERFECTION1670, "Perfection 1670"}
 };
 
 #define known_drivers ((int) (sizeof(drivers)/sizeof(drivers[0])))
@@ -178,6 +182,7 @@ static struct SnapScan_Model_desc scanners[] =
     {"SnapScan",            SNAPSCAN},
     {"ACERSCAN_A4____1",    ACER300F},
     {"Perfection 660",      PERFECTION660},
+    {"EPSON Scanner",       PERFECTION1670},
     {"ARCUS 1200",          ARCUS1200}
 };
 #define known_scanners ((int) (sizeof(scanners)/sizeof(scanners[0])))
@@ -369,6 +374,9 @@ struct snapscan_scanner
 
 /*
  * $Log$
+ * Revision 1.24  2003/10/07 18:29:20  oliver-guest
+ * Initial support for Epson 1670, minor bugfix
+ *
  * Revision 1.23  2003/09/12 16:10:33  hmg-guest
  * Moved union Option_Value from backend header files to sanei_backend.h. No need
  * to copy it over and over again. Changed header inclusion order in backend