Some fixes for Benq 5150

ChangeLog

@@ -1,3 +1,8 @@
+2005-12-04  Oliver Schwartz <Oliver.Schwartz@gmx.de>
+
+	* backend/snapscan.c backend/snapscan.c backend/snapscan-scsi.c
+	  backend/snapscan-options.c: Some fixes for Benq 5150
+
 2005-12-03  Peter Fales <peter@fales-lorenz.net>
 	* backend/gphoto2.c: Cosmetic changes to debug messages
 

backend/snapscan-options.c

@@ -342,6 +342,7 @@ static void init_options (SnapScan_Scanner * ps)
         break;
     case PRISA5000E:
     case PRISA5000:
+    case PRISA5150:
         po[OPT_SCANRES].constraint.word_list = resolutions_1200_5000e;
         break;
     case PERFECTION1670:
@@ -602,6 +603,7 @@ static void init_options (SnapScan_Scanner * ps)
     if ((!(ps->hconfig & HCFG_CAL_ALLOWED))
         || (ps->pdev->model == SNAPSCANE52)
         || (ps->pdev->model == PERFECTION1670)
+        || (ps->pdev->model == PRISA5150)
         || (ps->pdev->model == PRISA5300)) {
         po[OPT_QUALITY_CAL].cap |= SANE_CAP_INACTIVE;
         ps->val[OPT_QUALITY_CAL].b = SANE_FALSE;
@@ -1608,6 +1610,9 @@ SANE_Status sane_control_option (SANE_Handle h,
 
 /*
  * $Log$
+ * Revision 1.33  2005/12/04 15:03:00  oliver-guest
+ * Some fixes for Benq 5150
+ *
  * Revision 1.32  2005/11/23 20:57:01  oliver-guest
  * Disable bilevel colour / halftoning for Epson 3490
  *

backend/snapscan-scsi.c

@@ -549,6 +549,8 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
     case PERFECTION1670:
     case PERFECTION2480:
     case PERFECTION3490:
+    case PRISA5150:
+    case PRISA5000:
         pss->bpp = 14;
         break;
     default:
@@ -821,6 +823,7 @@ static SANE_Status set_window (SnapScan_Scanner *pss)
     {
         case PRISA5000:
         case PRISA5000E:
+        case PRISA5150:
             pos_factor = (pss->res > 600) ?  1200 : 600;
             break;
         case PERFECTION1270:
@@ -1418,6 +1421,7 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
             case PRISA4300_2:
             case PRISA5000:
             case PRISA5000E:
+            case PRISA5150:
             case PRISA5300:
                 /* ACER firmware files do not contain an info block */
                 fseek(fd, 0, SEEK_END);
@@ -1482,6 +1486,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
 
 /*
  * $Log$
+ * Revision 1.52  2005/12/04 15:03:00  oliver-guest
+ * Some fixes for Benq 5150
+ *
  * Revision 1.51  2005/11/26 18:53:03  oliver-guest
  * Fix inquiry bug for Benq 5000
  *

backend/snapscan.c

@@ -176,6 +176,7 @@ static inline int calibration_line_length(SnapScan_Scanner *pss)
     {
     case PRISA5000E:
     case PRISA5000:
+    case PRISA5150:
         pos_factor = 600;
         break;
     case PERFECTION1270:
@@ -1317,6 +1318,11 @@ static SANE_Status send_gamma_table (SnapScan_Scanner *pss, u_char dtc, u_char d
             status = send (pss, dtc, dtcq);
             CHECK_STATUS (status, me, "2nd send");
             break;
+        case PRISA5150:
+            /* 5150 needs the gamma table twice, with dtc = 0x04 for the second one */
+            status = send (pss, dtc+1, dtcq);
+            CHECK_STATUS (status, me, "2nd send");
+            break;
         default:
             break;
     }
@@ -1920,6 +1926,9 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
 
 /*
  * $Log$
+ * Revision 1.63  2005/12/04 15:03:00  oliver-guest
+ * Some fixes for Benq 5150
+ *
  * Revision 1.62  2005/12/02 19:15:42  oliver-guest
  * Change SnapScan version number to 1.4.50
  *

backend/snapscan.h

@@ -99,6 +99,7 @@ typedef enum
     PRISA4300_2,        /* Acer ScanPrisa 3300/4300 - 600 DPI, 42 bit*/
     PRISA5000,          /* Acer ScanPrisa 5000 - 1200 DPI */
     PRISA5000E,         /* Acer ScanPrisa 5000E/5000U - 1200 DPI */
+    PRISA5150,          /* Benq 5150 - 1200 DPI */
     PRISA5300,          /* Acer ScanPrisa 5300 - 1200 DPI */
     PERFECTION660,      /* Epson Perfection 660 - 1200 DPI */
     PERFECTION1270,     /* Epson Perfection 1270 - 1600 DPI */
@@ -136,6 +137,7 @@ static struct SnapScan_Driver_desc drivers[] =
     {PRISA1240,      "Acer1240"},
     {PRISA5000E,     "Benq 5000E/5000U"},
     {PRISA5000,      "Benq 5000"},
+    {PRISA5150,      "Benq 5150 / 5250"},
     {PRISA5300,      "Benq 5300"},
     {ARCUS1200,      "Arcus1200"},
     {PERFECTION660,  "Perfection 660"},
@@ -172,7 +174,7 @@ static struct SnapScan_Model_desc scanners[] =
     {"FlatbedScanner23",    PRISA4300_2},
     {"FlatbedScanner24",    PRISA5300},
     {"FlatbedScanner25",    PRISA5000E},/* 5000E/5000U */
-    {"FlatbedScanner40",    PRISA5000}, /* 5250C */
+    {"FlatbedScanner40",    PRISA5150}, /* 5150 / 5250  */
     {"FlatbedScanner42",    PRISA5000}, /* 5000 */
     {"SNAPSCAN 1212U",      SNAPSCAN1212U},
     {"SNAPSCAN 1212U_2",    SNAPSCAN1212U},
@@ -417,6 +419,9 @@ struct snapscan_scanner
 
 /*
  * $Log$
+ * Revision 1.39  2005/12/04 15:03:00  oliver-guest
+ * Some fixes for Benq 5150
+ *
  * Revision 1.38  2005/10/31 21:08:47  oliver-guest
  * Distinguish between Benq 5000/5000E/5000U
  *