adding trust office scan 19200

ChangeLog

@@ -1,3 +1,9 @@
+2006-02-04  Ullrich Sigwanz <usigwanz@freesurf.ch>
+
+        * backend/niash_xfer.c: Added Trust OfficeScan 19200
+        * doc/descriptions/niash.desc: Added Trust OfficeScan 19200
+        * backend/niash.c: Removed Reload on X,Y settings
+
 2006-02-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
 
         * backend/snapscan.h: Corrected USB ID for Benq 310

backend/niash.c

@@ -1063,13 +1063,17 @@ sane_control_option (SANE_Handle h, SANE_Int n, SANE_Action Action,
           return SANE_STATUS_INVAL;
 
         case optGamma:
+        case optThreshold:
         case optDPI:
+
+          info |= SANE_INFO_RELOAD_PARAMS;
+          /* fall through */
+
         case optTLX:
         case optTLY:
         case optBRX:
         case optBRY:
-	case optThreshold:
-	  info |= SANE_INFO_RELOAD_PARAMS;
+
           status = sanei_constrain_value (&s->aOptions[n], pVal, &info);
           if (status != SANE_STATUS_GOOD)
             {

backend/niash_xfer.c

@@ -43,6 +43,8 @@ STATIC TScannerModel ScannerModels[] = {
   ,
   {"Agfa", "Snapscan Touch", 0x6BD, 0x100, eAgfaTouch}
   ,
+  {"Trust", "Office Scanner USB 19200", 0x47b, 0x1000, eAgfaTouch}
+  ,
 /* last entry all zeros */
   {0, 0, 0, 0, 0}
 };
@@ -141,7 +143,7 @@ NiashXferOpen (const char *pszName, EScannerModel * peModel)
   SANE_Status status;
   SANE_Word vendor, product;
   int fd;
-  TScannerModel *pModel;
+  TScannerModel *pModel = 0;
 
   DBG (DBG_MSG, "Trying to open %s...\n", pszName);
 

doc/descriptions/niash.desc

@@ -10,7 +10,7 @@
 ;
 
 :backend "niash"
-:version "0.2"
+:version "0.3"
 :manpage "sane-niash"
 :url "http://sourceforge.net/projects/hp3300backend"
 
@@ -36,6 +36,12 @@
 :comment "If you use Linux 2.6, version 2.6.8 or newer is necessary."
 :status :complete
 
+:model "ScanJet 4300c/Silitek"
+:interface "USB"
+:usbid "0x047b" "0x1002"
+:comment "If you use Linux 2.6, version 2.6.8 or newer is necessary."
+:status :complete
+
 :mfg "Agfa"
 :url "http://www.agfa.com"
 
@@ -44,6 +50,14 @@
 :usbid "0x06bd" "0x0100"
 :status :complete
 
+:mfg "Trust"
+:url "http://www.trust.com"
+
+:model "Office Scan USB 19200"
+:interface "USB"
+:usbid "0x047b" "0x1000"
+:status :complete
+
 
 
 

doc/sane-niash.man

@@ -15,11 +15,13 @@ the following models:
 .ft CR
 .nf
 MANUFACTURER:    MODEL:          USB ID:
----------------  --------------  ---------
-Agfa             Snapscan Touch  06BD-0100 (1)(a)
+---------------  ----------------  ---------
+Agfa             Snapscan Touch    047B-1000 (1)(a)
+Trust            Office Scan 1900  06BD-0100 (1)(a)
 Hewlett-Packard  Scanjet 3300c     03F0-0205 (1)(a)(b)
 Hewlett-Packard  Scanjet 3400c     03F0-0405 (2)(b)
 Hewlett-Packard  Scanjet 4300c     03F0-0305 (2)(a)
+Silitek          ScanJet 4300c     047B-1002 (2)(b)
 .fi
 .ft R
 .PP

tools/hotplug/libsane.usermap

@@ -529,5 +529,8 @@ libusbscanner             0x0003      0x1606   0x0230    0x0000       0x0000
 libusbscanner             0x0003      0x0a82   0x4600    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Silitek Corp.|HP ScanJet 4300c
 libusbscanner             0x0003      0x047b   0x1002    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+# Trust|Office Scanner USB 19200
+libusbscanner             0x0003      0x047b   0x1000    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Dell|A920
 libusbscanner             0x0003      0x413c   0x5105    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+