fujitsu backend v103

- remove compiled-in default config file
- initial support for new fi-6xxx machines
- mark S300M support as good
merge-requests/1/head
m. allan noah 2010-11-23 16:56:13 -05:00
rodzic da42dfa8eb
commit 9f15c2534d
5 zmienionych plików z 107 dodań i 107 usunięć

Wyświetl plik

@ -466,6 +466,9 @@
- fix compilation bug when jpeg is enabled
v102 2010-09-22, MAN
- fix infinite loop when scan is an odd number of lines
v103 2010-11-23, MAN
- remove compiled-in default config file
- initial support for new fi-6xxx machines
SANE FLOW DIAGRAM
@ -515,7 +518,7 @@
#include "fujitsu.h"
#define DEBUG 1
#define BUILD 101
#define BUILD 103
/* values for SANE_DEBUG_FUJITSU env var:
- errors 5
@ -740,103 +743,8 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
}
else {
DBG (5, "sane_get_devices: no config file '%s', using defaults\n", FUJITSU_CONFIG_FILE);
DBG (15, "sane_get_devices: looking for 'scsi FUJITSU'\n");
sanei_config_attach_matching_devices ("scsi FUJITSU", attach_one_scsi);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1041'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1041", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1042'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1042", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1078'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1078", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1095'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1095", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1096'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1096", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1097'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1097", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10ad'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10ad", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10ae'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10ae", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10af'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10af", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10cf'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10cf", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10e0'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10e0", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10e1'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10e1", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10e2'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10e2", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10e6'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10e6", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10e7'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10e7", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10f2'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10f2", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x10fe'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x10fe", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1135'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1135", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x114a'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x114a", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x114d'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x114d", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x114e'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x114e", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x114f'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x114f", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1150\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1150", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1155'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1155", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x116f'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x116f", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1174'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1174", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1175'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1175", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1176'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1176", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1177'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1177", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1178'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x1178", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x11a2'\n");
sanei_usb_attach_matching_devices("usb 0x04c5 0x11a2", attach_one_usb);
DBG (5, "sane_get_devices: missing required config file '%s'!\n",
FUJITSU_CONFIG_FILE);
}
/*delete missing scanners from list*/

Wyświetl plik

@ -107,5 +107,38 @@ usb 0x04c5 0x1177
#fi-6750S
usb 0x04c5 0x1178
#fi-6800
usb 0x04c5 0x119d
#fi-6800-CGA
usb 0x04c5 0x119e
#fi-6900
usb 0x04c5 0x119f
#fi-6900-CGA
usb 0x04c5 0x11a0
#S1500 & S1500M
usb 0x04c5 0x11a2
#fi-6125
usb 0x04c5 0x11ee
#fi-6225
usb 0x04c5 0x11ef
#fi-6145
usb 0x04c5 0x11f1
#fi-6245
usb 0x04c5 0x11f2
#fi-6135
usb 0x04c5 0x11f3
#fi-6235
usb 0x04c5 0x11f4
#fi-6110
usb 0x04c5 0x11fc

Wyświetl plik

@ -36,7 +36,7 @@
:model "ScanSnap S300M"
:interface "USB"
:status :untested
:status :good
:usbid "0x04c5" "0x117f"
:comment "Same as S300, with different usb id"

Wyświetl plik

@ -12,9 +12,9 @@
:backend "fujitsu" ; name of backend
:url "http://www.thebility.com/fujitsu/"
:version "98" ; version of backend
:version "103" ; version of backend
:manpage "sane-fujitsu" ; name of manpage (if it exists)
:comment "Backend updated for SANE release 1.0.21, see sane-fujitsu manpage"
:comment "Backend updated for SANE release 1.0.22, see sane-fujitsu manpage"
:devicetype :scanner ; start of a list of devices....
; other types: :stillcam, :vidcam,
; :meta, :api
@ -162,6 +162,48 @@
:usbid "0x04c5" "0x11a2"
:comment "small, current, same as S1500"
:model "fi-6125"
:interface "USB"
:status :untested
:usbid "0x04c5" "0x11ee"
:comment "small, unreleased"
:model "fi-6225"
:interface "USB"
:status :untested
:usbid "0x04c5" "0x11ef"
:comment "small, unreleased"
:model "fi-6145"
:interface "USB"
:status :untested
:usbid "0x04c5" "0x11f1"
:comment "small, unreleased"
:model "fi-6245"
:interface "USB"
:status :untested
:usbid "0x04c5" "0x11f2"
:comment "small, unreleased"
:model "fi-6135"
:interface "USB"
:status :untested
:usbid "0x04c5" "0x11f3"
:comment "small, unreleased"
:model "fi-6235"
:interface "USB"
:status :untested
:usbid "0x04c5" "0x11f4"
:comment "small, unreleased"
:model "fi-6110"
:interface "USB"
:status :good
:usbid "0x04c5" "0x11fc"
:comment "small, unreleased"
;==================================================
; DISCONTINUED OLDER MODELS, MEDIUM
:model "M3093E"
@ -385,6 +427,24 @@
:model "fi-6800"
:interface "SCSI USB"
;:usbid "0x04c5" "0x11xx"
:status :untested
:comment "big, current, similar to fi-5900?"
:usbid "0x04c5" "0x119d"
:comment "big, current"
:model "fi-6800-CGA"
:interface "SCSI USB"
:status :untested
:usbid "0x04c5" "0x119e"
:comment "big, current. VRS CGA board unsupported"
:model "fi-6900"
:interface "SCSI USB"
:status :untested
:usbid "0x04c5" "0x119f"
:comment "big, unreleased, similar to fi-5900?"
:model "fi-6900-CGA"
:interface "SCSI USB"
:status :untested
:usbid "0x04c5" "0x11a0"
:comment "big, unreleased, similar to fi-5900? VRS CGA board unsupported"

Wyświetl plik

@ -1,4 +1,4 @@
.TH sane\-fujitsu 5 "10 Feb 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH sane\-fujitsu 5 "23 Nov 2010" "@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 98, which shipped with SANE 1.0.21.
This document describes backend version 103, which shipped with SANE 1.0.22.
.SH SUPPORTED HARDWARE
This version supports every known model which speaks the Fujitsu SCSI and
@ -102,8 +102,7 @@ The configuration file "fujitsu.conf" is used to tell the backend how to look
for scanners, and provide options controlling the operation of the backend.
This file is read each time the frontend asks the backend for a list
of scanners, generally only when the frontend starts. If the configuration
file is missing, the backend will use a set of compiled defaults, which
are identical to the default configuration file shipped with SANE.
file is missing, the backend will be unable to locate any scanners.
.PP
Scanners can be specified in the configuration file in 4 ways:
.PP