From 97044ee3e3ab452caa47f9b3572ce289afbcf796 Mon Sep 17 00:00:00 2001
From: Oliver Schwartz <oliverschwartz@users.sf.net>
Date: Thu, 26 Sep 2002 20:09:24 +0000
Subject: [PATCH] SnapScan backend 1.4.16 (support for Acer/Benq 5000)

---
 backend/snapscan-scsi.c        |  8 ++++++--
 backend/snapscan.c             | 16 +++++++++++-----
 backend/snapscan.conf          |  3 +++
 backend/snapscan.h             | 12 +++++++++---
 doc/descriptions/snapscan.desc |  4 ++++
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/backend/snapscan-scsi.c b/backend/snapscan-scsi.c
index 2ec267f02..acf74b8c5 100644
--- a/backend/snapscan-scsi.c
+++ b/backend/snapscan-scsi.c
@@ -1139,6 +1139,7 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
             case PRISA640:
             case PRISA4300:
             case PRISA4300_2:
+            case PRISA5000:
             case PRISA5300:
                 /* ACER firmware files do not contain an info block */
                 fseek(fd, 0, SEEK_END);
@@ -1185,8 +1186,11 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
 
 /*
  * $Log$
- * Revision 1.18  2002/07/12 23:29:06  oliverschwartz
- * SnapScan backend 1.4.15
+ * Revision 1.19  2002/09/26 20:09:18  oliverschwartz
+ * SnapScan backend 1.4.16 (support for Acer/Benq 5000)
+ *
+ * Revision 1.33  2002/09/24 16:07:48  oliverschwartz
+ * Added support for Benq 5000
  *
  * Revision 1.32  2002/06/06 20:40:01  oliverschwartz
  * Changed default scan area for transparancy unit of SnapScan e50
diff --git a/backend/snapscan.c b/backend/snapscan.c
index a75e724c4..68e68c541 100644
--- a/backend/snapscan.c
+++ b/backend/snapscan.c
@@ -78,7 +78,7 @@
 
 #define EXPECTED_MAJOR       1
 #define MINOR_VERSION        4
-#define BUILD               15
+#define BUILD               16
 
 #include "snapscan.h"
 
@@ -449,7 +449,7 @@ static SANE_Status snapscani_check_device(
              "Guillemot MaxiScan A4 Deluxe");
         status = SANE_STATUS_INVAL;
     } else {
-        DBG(DL_VERBOSE, "%s: Autodected driver: %s\n", me, get_driver_name(*model_num));
+        DBG(DL_VERBOSE, "%s: Autodetected driver: %s\n", me, get_driver_name(*model_num));
     }
     return status;
 }
@@ -534,7 +534,7 @@ static SANE_Status add_scsi_device (SANE_String_Const full_name)
     char model[17];
     SANE_Char *name = NULL;
 
-    DBG (DL_CALL_TRACE, "%s(%s)\n", me, name);
+    DBG (DL_CALL_TRACE, "%s(%s)\n", me, full_name);
 
     sanei_config_get_string(full_name, &name);
     /* Avoid adding the same device more then once */
@@ -1753,8 +1753,14 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
 
 /*
  * $Log$
- * Revision 1.24  2002/07/12 23:29:07  oliverschwartz
- * SnapScan backend 1.4.15
+ * Revision 1.25  2002/09/26 20:09:19  oliverschwartz
+ * SnapScan backend 1.4.16 (support for Acer/Benq 5000)
+ *
+ * Revision 1.51  2002/09/26 19:27:44  oliverschwartz
+ * Version 1.4.16
+ *
+ * Revision 1.50  2002/09/24 16:07:44  oliverschwartz
+ * Added support for Benq 5000
  *
  * Revision 1.49  2002/07/12 22:53:54  oliverschwartz
  * Version 1.4.15
diff --git a/backend/snapscan.conf b/backend/snapscan.conf
index e917c6e7d..e8d76ea62 100644
--- a/backend/snapscan.conf
+++ b/backend/snapscan.conf
@@ -49,6 +49,9 @@ usb 0x04a5 0x20b0
 # Benq/Acer/Vuego 4300
 usb 0x04a5 0x20de
 
+# Benq/Acer/Vuego 5000
+usb 0x04a5 0x20fc
+
 # Benq/Acer/Vuego 5300
 usb 0x04a5 0x20fe
 
diff --git a/backend/snapscan.h b/backend/snapscan.h
index c6e58d2f8..ae6711c9e 100644
--- a/backend/snapscan.h
+++ b/backend/snapscan.h
@@ -91,9 +91,10 @@ typedef enum
     VUEGO610S,          /* Vuego 610S and 610plus SJU changed */
     PRISA620S,          /* Acer ScanPrisa 620 - 600 DPI */
     PRISA640,           /* Acer ScanPrisa 640 - 600 DPI */
+    PRISA1240,          /* Acer ScanPrisa 1240 - 1200 DPI */
     PRISA4300,          /* Acer ScanPrisa 3300/4300 - 600 DPI */
     PRISA4300_2,        /* Acer ScanPrisa 3300/4300 - 600 DPI, 42 bit*/
-    PRISA1240,          /* Acer ScanPrisa 1240 - 1200 DPI */
+    PRISA5000,          /* Acer ScanPrisa 5000 - 1200 DPI */
     PRISA5300           /* Acer ScanPrisa 5300 - 1200 DPI */
 } SnapScan_Model;
 
@@ -122,6 +123,7 @@ static struct SnapScan_Driver_desc drivers[] =
     {PRISA4300,      "Acer4300"},
     {PRISA4300_2,    "Acer4300 (42 bit)"},
     {PRISA1240,      "Acer1240"},
+    {PRISA5000,      "Acer5000"},
     {PRISA5300,      "Acer5300"}
 };
 
@@ -150,6 +152,7 @@ static struct SnapScan_Model_desc scanners[] =
     {"FlatbedScanner22",    PRISA4300_2},
     {"FlatbedScanner23",    PRISA4300_2},
     {"FlatbedScanner24",    PRISA5300},
+    {"FlatbedScanner25",    PRISA5000},
     {"SNAPSCAN 1212U",      SNAPSCAN1212U},
     {"SNAPSCAN 1212U_2",    SNAPSCAN1212U},
     {"SNAPSCAN e20",        SNAPSCANE20},
@@ -362,8 +365,11 @@ struct snapscan_scanner
 
 /*
  * $Log$
- * Revision 1.16  2002/07/12 23:29:08  oliverschwartz
- * SnapScan backend 1.4.15
+ * Revision 1.17  2002/09/26 20:09:20  oliverschwartz
+ * SnapScan backend 1.4.16 (support for Acer/Benq 5000)
+ *
+ * Revision 1.33  2002/09/24 16:07:47  oliverschwartz
+ * Added support for Benq 5000
  *
  * Revision 1.32  2002/07/12 22:22:47  oliverschwartz
  * Correct driver description for 4300_2
diff --git a/doc/descriptions/snapscan.desc b/doc/descriptions/snapscan.desc
index 2f2da0336..9673cfb4f 100644
--- a/doc/descriptions/snapscan.desc
+++ b/doc/descriptions/snapscan.desc
@@ -143,6 +143,10 @@
 :interface "USB"
 :status :stable
 
+:model "5000"
+:interface "USB"
+:status :alpha
+
 :model "5300"
 :interface "USB"
 :status :alpha