diff --git a/backend/fujitsu.c b/backend/fujitsu.c index 7f008d0ef..88c043010 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -571,6 +571,9 @@ - reorder scanner sections in init_model chronologically v125 2014-12-16, MAN - remove USB packet counting code from v123, fix sanei_usb instead + v126 2015-08-23, MAN + - initial support for iX100 + - add late_lut support for iX500/iX100 SANE FLOW DIAGRAM @@ -620,7 +623,7 @@ #include "fujitsu.h" #define DEBUG 1 -#define BUILD 125 +#define BUILD 126 /* values for SANE_DEBUG_FUJITSU env var: - errors 5 @@ -2265,12 +2268,14 @@ init_model (struct fujitsu *s) s->has_df_recovery=1; } - else if (strstr (s->model_name,"iX500")){ + else if (strstr (s->model_name,"iX500") + || strstr (s->model_name,"iX100")){ /* guessing this scanner too */ /* locks up scanner if we try to auto detect */ s->has_MS_lamp = 0; /* weirdness */ s->need_q_table = 1; + s->late_lut = 1; s->need_diag_preread = 1; s->ppl_mod_by_mode[MODE_COLOR] = 2; s->hopper_before_op = 1; @@ -6899,6 +6904,13 @@ sane_start (SANE_Handle handle) if (ret != SANE_STATUS_GOOD) DBG (5, "sane_start: WARNING: cannot send_endorser %d\n", ret); + /* send lut if scanner has no hardware brightness/contrast */ + if (!s->late_lut && (!s->brightness_steps || !s->contrast_steps)){ + ret = send_lut(s); + if (ret != SANE_STATUS_GOOD) + DBG (5, "sane_start: WARNING: cannot early send_lut %d\n", ret); + } + /* set window command */ ret = set_window(s); if (ret != SANE_STATUS_GOOD) { @@ -6907,10 +6919,10 @@ sane_start (SANE_Handle handle) } /* send lut if scanner has no hardware brightness/contrast */ - if (!s->brightness_steps || !s->contrast_steps){ + if (s->late_lut && (!s->brightness_steps || !s->contrast_steps)){ ret = send_lut(s); if (ret != SANE_STATUS_GOOD) - DBG (5, "sane_start: WARNING: cannot send_lut %d\n", ret); + DBG (5, "sane_start: WARNING: cannot late send_lut %d\n", ret); } /* some scanners need the q table sent, even when not scanning jpeg */ diff --git a/backend/fujitsu.conf.in b/backend/fujitsu.conf.in index dc7a13113..b3895eaad 100644 --- a/backend/fujitsu.conf.in +++ b/backend/fujitsu.conf.in @@ -139,6 +139,9 @@ usb 0x04c5 0x11fc #fi-5950 usb 0x04c5 0x1213 +#ScanSnap SV600 +usb 0x04c5 0x128e + #ScanSnap iX500 usb 0x04c5 0x132b @@ -153,3 +156,7 @@ usb 0x04c5 0x132e #fi-7260 usb 0x04c5 0x132f + +#ScanSnap iX100 +usb 0x04c5 0x13f4 + diff --git a/backend/fujitsu.h b/backend/fujitsu.h index e1f7d68b9..6ce1a56cd 100644 --- a/backend/fujitsu.h +++ b/backend/fujitsu.h @@ -332,6 +332,7 @@ struct fujitsu int broken_diag_serial; /* some scanners are just plain borked */ int need_q_table; /* some scanners wont work without these */ int need_diag_preread; + int late_lut; int hopper_before_op; /* some scanners dont like OP when hopper empty */ int no_wait_after_op; /* some scanners dont like TUR after OP */ diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc index e74a7f66b..5a91e864a 100644 --- a/doc/descriptions/fujitsu.desc +++ b/doc/descriptions/fujitsu.desc @@ -12,7 +12,7 @@ :backend "fujitsu" ; name of backend :url "http://www.thebility.com/fujitsu/" -:version "118" ; version of backend +:version "126" ; version of backend :manpage "sane-fujitsu" ; name of manpage (if it exists) :comment "Backend updated for SANE release 1.0.25, see sane-fujitsu manpage" :devicetype :scanner ; start of a list of devices.... @@ -167,9 +167,14 @@ :usbid "0x04c5" "0x11a2" :comment "small, discontinued, same as S1500" +:model "ScanSnap N1800" +:interface "Ethernet" +:status :untested +:comment "small, discontinued, integrated touchscreen and keyboard" + ;================================================== ; CURRENT MODELS, SMALL -:model "ScanSnap N1800" +:model "ScanSnap N7100" :interface "Ethernet" :status :untested :comment "small, current, integrated touchscreen and keyboard" @@ -203,6 +208,17 @@ :usbid "0x04c5" "0x132b" :comment "small, current, WiFi not supported. Hardware only scans in color. Backend generates binary and grayscale modes." +:model "ScanSnap iX100" +:interface "USB WiFi" +:status :untested +:usbid "0x04c5" "0x13f4" + +:model "ScanSnap SV600" +:interface "USB" +:status :untested +:usbid "0x04c5" "0x128e" +:comment "Also has a second USB VID 0x13ba." + ;================================================== ; DISCONTINUED OLDER MODELS, MEDIUM :model "M3093E" @@ -302,6 +318,18 @@ :usbid "0x04c5" "0x114e" :comment "medium, recent, discontinued" +:model "fi-6140Z" +:interface "SCSI USB" +:status :complete +:usbid "0x04c5" "0x11f1" +:comment "medium, recent, discontinued" + +:model "fi-6240Z" +:interface "SCSI USB" +:status :complete +:usbid "0x04c5" "0x11f2" +:comment "medium, recent, discontinued" + ;================================================== ; CURRENT MODELS, MEDIUM @@ -311,18 +339,6 @@ :usbid "0x04c5" "0x114a" :comment "medium, current" -:model "fi-6140Z" -:interface "SCSI USB" -:status :complete -:usbid "0x04c5" "0x11f1" -:comment "medium, current" - -:model "fi-6240Z" -:interface "SCSI USB" -:status :complete -:usbid "0x04c5" "0x11f2" -:comment "medium, current" - :model "fi-7180" :interface "USB" :status :complete @@ -466,3 +482,8 @@ :status :untested :usbid "0x04c5" "0x119e" :comment "big, current. VRS CGA board unsupported, Independent ultrasonic control and multistream unsupported" + +:model "fi-6400" +:interface "SCSI USB" +:status :untested +;:usbid "0x04c5" "0x"