diff --git a/ChangeLog b/ChangeLog index 385840041..d0a35ffa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-01-31 m. allan noah + * backend/epjitsu.c, doc/descriptions/epjitsu.desc: + - comment changes + - added new models + * backend/fujitsu.c, doc/descriptions/fujitsu.desc, + doc/sane-fujitsu.man: fujitsu backend v106, + - added new models + - dont call mode_select with a page code the scanner does not support + 2011-01-28 Mike Kelly * backends/avision.[ch]: - Bumped build number to 294. diff --git a/backend/fujitsu.c b/backend/fujitsu.c index 90c79708f..9d3fcfbbd 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -481,6 +481,8 @@ - backup and restore image params around image processing code - cache software crop/deskew parameters for use on backside of duplex - fi-6110 does not support bgcolor or prepick + v106 2011-01-30, MAN (SANE 1.0.22) + - dont call mode_select with a page code the scanner does not support SANE FLOW DIAGRAM @@ -530,7 +532,7 @@ #include "fujitsu.h" #define DEBUG 1 -#define BUILD 105 +#define BUILD 106 /* values for SANE_DEBUG_FUJITSU env var: - errors 5 @@ -5567,6 +5569,11 @@ mode_select_df (struct fujitsu *s) DBG (10, "mode_select_df: start\n"); + if(!s->has_MS_df){ + DBG (10, "mode_select_df: unsupported\n"); + return SANE_STATUS_GOOD; + } + memset(cmd,0,cmdLen); set_SCSI_opcode(cmd, MODE_SELECT_code); set_MSEL_pf(cmd, 1); @@ -5628,6 +5635,11 @@ mode_select_bg (struct fujitsu *s) DBG (10, "mode_select_bg: start\n"); + if(!s->has_MS_bg){ + DBG (10, "mode_select_bg: unsupported\n"); + return SANE_STATUS_GOOD; + } + memset(cmd,0,cmdLen); set_SCSI_opcode(cmd, MODE_SELECT_code); set_MSEL_pf(cmd, 1); @@ -5673,6 +5685,11 @@ mode_select_dropout (struct fujitsu *s) DBG (10, "mode_select_dropout: start\n"); + if(!s->has_MS_dropout){ + DBG (10, "mode_select_dropout: unsupported\n"); + return SANE_STATUS_GOOD; + } + memset(cmd,0,cmdLen); set_SCSI_opcode(cmd, MODE_SELECT_code); set_MSEL_pf(cmd, 1); @@ -5754,6 +5771,11 @@ mode_select_prepick (struct fujitsu *s) DBG (10, "mode_select_prepick: start\n"); + if (!s->has_MS_prepick){ + DBG (10, "mode_select_prepick: unsupported\n"); + return SANE_STATUS_GOOD; + } + memset(cmd,0,cmdLen); set_SCSI_opcode(cmd, MODE_SELECT_code); set_MSEL_pf(cmd, 1); @@ -5791,6 +5813,11 @@ mode_select_auto (struct fujitsu *s) DBG (10, "mode_select_auto: start\n"); + if(!s->has_MS_auto){ + DBG (10, "mode_select_auto: unsupported\n"); + return SANE_STATUS_GOOD; + } + memset(cmd,0,cmdLen); set_SCSI_opcode(cmd, MODE_SELECT_code); set_MSEL_pf(cmd, 1); diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc index b11e0fabb..cc9d03169 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 "103" ; version of backend +:version "106" ; version of backend :manpage "sane-fujitsu" ; name of manpage (if it exists) :comment "Backend updated for SANE release 1.0.22, see sane-fujitsu manpage" :devicetype :scanner ; start of a list of devices.... @@ -79,18 +79,6 @@ :status :complete :comment "small, recent, discontinued" -:model "ScanSnap S500" -:interface "USB" -:status :complete -:usbid "0x04c5" "0x10fe" -:comment "small, recent, discontinued" - -:model "ScanSnap S500M" -:interface "USB" -:status :complete -:usbid "0x04c5" "0x1135" -:comment "small, recent, discontinued" - :model "fi-5120C" :interface "SCSI USB" :status :complete @@ -103,6 +91,28 @@ :usbid "0x04c5" "0x10e1" :comment "small, recent, discontinued" +:model "fi-5000N" +:interface "Ethernet" +:status :untested +:comment "Not a scanner, rather a scanner to ethernet interface" + +:model "fi-6000NS" +:interface "Ethernet" +:status :untested +:comment "small, recent, discontinued, integrated touchscreen and keyboard" + +:model "ScanSnap S500" +:interface "USB" +:status :complete +:usbid "0x04c5" "0x10fe" +:comment "small, recent, discontinued" + +:model "ScanSnap S500M" +:interface "USB" +:status :complete +:usbid "0x04c5" "0x1135" +:comment "small, recent, discontinued" + :model "ScanSnap S510" :interface "USB" :status :complete @@ -115,16 +125,6 @@ :usbid "0x04c5" "0x116f" :comment "small, recent, discontinued" -:model "fi-6000NS" -:interface "Ethernet" -:status :untested -:comment "small, recent, discontinued, integrated touchscreen and keyboard" - -:model "fi-5000N" -:interface "Ethernet" -:status :untested -:comment "Not a scanner, rather a scanner to ethernet interface" - ;================================================== ; CURRENT MODELS, SMALL :model "fi-5110C" @@ -138,6 +138,12 @@ :status :untested :comment "small, current, integrated touchscreen and keyboard" +:model "fi-6110" +:interface "USB" +:status :complete +:usbid "0x04c5" "0x11fc" +:comment "small, current" + :model "fi-6130" :interface "USB" :status :complete @@ -150,18 +156,6 @@ :usbid "0x04c5" "0x1150" :comment "small, current" -:model "ScanSnap S1500" -:interface "USB" -:status :complete -:usbid "0x04c5" "0x11a2" -:comment "small, current" - -:model "ScanSnap S1500M" -:interface "USB" -:status :complete -:usbid "0x04c5" "0x11a2" -:comment "small, current, same as S1500" - :model "fi-6125" :interface "USB" :status :untested @@ -198,11 +192,17 @@ :usbid "0x04c5" "0x11f4" :comment "small, unreleased" -:model "fi-6110" +:model "ScanSnap S1500" :interface "USB" -:status :good -:usbid "0x04c5" "0x11fc" -:comment "small, unreleased" +:status :complete +:usbid "0x04c5" "0x11a2" +:comment "small, current" + +:model "ScanSnap S1500M" +:interface "USB" +:status :complete +:usbid "0x04c5" "0x11a2" +:comment "small, current, same as S1500" ;================================================== ; DISCONTINUED OLDER MODELS, MEDIUM @@ -360,12 +360,17 @@ :status :complete :comment "big, recent, discontinued" -:model "fi-4990C" +:model "fi-4860C" :interface "SCSI" :status :complete :comment "big, recent, discontinued" -:model "fi-4860C" +:model "fi-4860C2" +:interface "SCSI" +:status :complete +:comment "big, recent, discontinued" + +:model "fi-4990C" :interface "SCSI" :status :complete :comment "big, recent, discontinued" @@ -382,11 +387,6 @@ :status :complete :comment "big, recent, discontinued" -:model "fi-4860C2" -:interface "SCSI" -:status :complete -:comment "big, recent, discontinued" - :model "fi-6750S" :interface "USB" :status :untested @@ -401,6 +401,12 @@ :status :good :comment "big, current, independent ultrasonic control and multistream unsupported" +:model "fi-5950C" +:interface "SCSI USB" +;:usbid "0x04c5" "0x10e7" +:status :untested +:comment "Faster version of fi-5900?" + :model "fi-6670" :interface "SCSI USB" :status :good diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man index bbff8248f..6c59584c1 100644 --- a/doc/sane-fujitsu.man +++ b/doc/sane-fujitsu.man @@ -1,4 +1,4 @@ -.TH sane\-fujitsu 5 "23 Nov 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane\-fujitsu 5 "30 Jan 2011" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-fujitsu .SH NAME @@ -10,7 +10,7 @@ The library implements a SANE (Scanner Access Now Easy) backend which provides access to most Fujitsu flatbed and ADF scanners. -This document describes backend version 103, which shipped with SANE 1.0.22. +This document describes backend version 106, which shipped with SANE 1.0.22. .SH SUPPORTED HARDWARE This version supports every known model which speaks the Fujitsu SCSI and @@ -39,9 +39,9 @@ SCSI: SERIAL: USB: ScanStation M3093E/DE/EX fi\-4110EOX/2 ScanPartner M3096EX fi\-4010CU SP\-Jr M3097E+/DE S300/S300M -SP\-10/10C M3099A/EH/EX fi\-60F -SP\-15C/300C fi\-5015C -SP\-600C/620C +SP\-10/10C M3099A/EH/EX S1300 +SP\-15C/300C fi\-60F +SP\-600C/620C fi\-5015C .fi .ft R .RE