mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

adding trust office scan 19200

merge-requests/1/head
Ullrich Sigwanz 2006-02-04 10:28:51 +00:00
rodzic b1f38bc825
commit 28346f5111
6 zmienionych plików z 808 dodań i 777 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

522
ChangeLog
Wyświetl plik

@ -1,357 +1,363 @@
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> 2006-02-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.h: Corrected USB ID for Benq 310 * backend/snapscan.h: Corrected USB ID for Benq 310
2006-01-31 Gerhard Jaeger <gerhard@gjaeger.de> 2006-01-31 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update. * doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number. * backend/plustek.c: Bumped build number.
* backend/plustek-usbdevs.c: Fixed CanoScan N1220U settings. * backend/plustek-usbdevs.c: Fixed CanoScan N1220U settings.
2006-01-29 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/brother2.desc: Changed status of * doc/descriptions-external/brother2.desc: Changed status of
Brother MFC-410CN to "basic" (bug #302961). Brother MFC-410CN to "basic" (bug #302961).
* doc/descriptions/unsupported.desc: Added Benq 7400UT and Genius * doc/descriptions/unsupported.desc: Added Benq 7400UT and Genius
Colorpage CS. Colorpage CS.
2006-01-26 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-26 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/snapscan-usb.c: Added #defines for SHM_R/W for cygwin * backend/snapscan-usb.c: Added #defines for SHM_R/W for cygwin
(patch from Philip Aston <philipa@mail.com>). (patch from Philip Aston <philipa@mail.com>).
* AUTHORS: Troy Rollo is now active. * AUTHORS: Troy Rollo is now active.
2006-01-22 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/epkowa.desc: Updated to match * doc/descriptions-external/epkowa.desc: Updated to match
iscan-1.18.0. Added usb ids (patch from Olaf Meeuwissen iscan-1.18.0. Added usb ids (patch from Olaf Meeuwissen
<olaf@member.fsf.org>). <olaf@member.fsf.org>).
* doc/descriptions/unsupported.desc: Added Scanshell 800N and * doc/descriptions/unsupported.desc: Added Scanshell 800N and
Canon Smartbase MP360. Canon Smartbase MP360.
* sanei/sanei_usb.c tools/sane-find-scanner.c: Added checks for * sanei/sanei_usb.c tools/sane-find-scanner.c: Added checks for
altsetting =! 0. altsetting =! 0.
2006-01-22 Mattias Ellert <mattias.ellert@tsl.uu.se> 2006-01-22 Mattias Ellert <mattias.ellert@tsl.uu.se>
* backend/dll.c, backend/plustek-usbhw.c, backend/plustek-usbscan.c, * backend/dll.c, backend/plustek-usbhw.c, backend/plustek-usbscan.c,
sanei/sanei_pio.c: Fixed warnings about C++ style comments. sanei/sanei_pio.c: Fixed warnings about C++ style comments.
* backend/hp5400_xfer.h: Fixed compilation warnings. * backend/hp5400_xfer.h: Fixed compilation warnings.
2006-01-21 Mattias Ellert <mattias.ellert@tsl.uu.se> 2006-01-21 Mattias Ellert <mattias.ellert@tsl.uu.se>
* backend/canon-sane.c: Fixed variable redeclaration. * backend/canon-sane.c: Fixed variable redeclaration.
2006-01-05 St<53>hane Voltz <stefdev@modulonet.fr> 2006-01-05 St<53>hane Voltz <stefdev@modulonet.fr>
* tools/hotplug/libsane.usermap: Added Dell A920 (rebranded X1100) * tools/hotplug/libsane.usermap: Added Dell A920 (rebranded X1100)
2006-01-19 Gerhard Jaeger <gerhard@gjaeger.de> 2006-01-19 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update. * doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number. Fixed constraint_type for * backend/plustek.c: Bumped build number. Fixed constraint_type for
OPT_BUTTON. OPT_BUTTON.
* backend/plustek-usbdevs.c: Added high-speed setting for HP2200. * backend/plustek-usbdevs.c: Added high-speed setting for HP2200.
Cleanup. Cleanup.
2006-01-18 Gerhard Jaeger <gerhard@gjaeger.de> 2006-01-18 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update. * doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number. * backend/plustek.c: Bumped build number.
* backend/plustek-usbdevs.c: Fixed CanoScan N670U settings, * backend/plustek-usbdevs.c: Fixed CanoScan N670U settings,
see (bugreport #302738). see (bugreport #302738).
2006-01-15 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/canon630u.desc doc/descriptions/coolscan2.desc * doc/descriptions/canon630u.desc doc/descriptions/coolscan2.desc
doc/descriptions/hp5400.desc doc/descriptions/niash.desc doc/descriptions/hp5400.desc doc/descriptions/niash.desc
doc/descriptions/unsupported.desc: Added USB vendor and product doc/descriptions/unsupported.desc: Added USB vendor and product
ids. Minor cleanup. ids. Minor cleanup.
* backend/artec_eplus48u.conf.in doc/sane-artec_eplus48u.man * backend/artec_eplus48u.conf.in doc/sane-artec_eplus48u.man
doc/descriptions/artec_eplus48u.desc: Added Yakumo Scan50. Minor doc/descriptions/artec_eplus48u.desc: Added Yakumo Scan50. Minor
cleanup. cleanup.
* doc/descriptions/gt68xx.desc: Added Mustek BearPaw 1248 CU. * doc/descriptions/gt68xx.desc: Added Mustek BearPaw 1248 CU.
* doc/descriptions/lexmark.desc: Added USB vendor and product * doc/descriptions/lexmark.desc: Added USB vendor and product
ids. Changed status of X1150 and X1170 according to reports on ids. Changed status of X1150 and X1170 according to reports on
sane-devel. sane-devel.
2006-01-15 Ulrich Deiters <ulrich.deiters@uni-koeln.de> 2006-01-15 Ulrich Deiters <ulrich.deiters@uni-koeln.de>
* backend/canon-sane.c: fixed byte-swapping problem for little-endian * backend/canon-sane.c: fixed byte-swapping problem for little-endian
platforms (affects raw-mode scanning with FS2710 slide scanner) platforms (affects raw-mode scanning with FS2710 slide scanner)
2006-01-14 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/check-usb-chip.c: Improved rts8822l-01h chipset * tools/check-usb-chip.c: Improved rts8822l-01h chipset
detection by adding check for descriptor.bcdUSB == 0x110 reported detection by adding check for descriptor.bcdUSB == 0x110 reported
by some scanners and accepting any value diferent to 0, read by some scanners and accepting any value diferent to 0, read
from 0xfe11 register. Patch from Jonathan Bravo Lopez from 0xfe11 register. Patch from Jonathan Bravo Lopez
<JKD@JKDSoft.cjb.net>. <JKD@JKDSoft.cjb.net>.
* tools/sane-desc.c: Added "ignore" parameter to :usbid * tools/sane-desc.c: Added "ignore" parameter to :usbid
token. Print warning if a backend defines USB models without token. Print warning if a backend defines USB models without
defining usbid. Print warning if a model doesn't have an defining usbid. Print warning if a model doesn't have an
interface. interface.
* doc/descriptions.txt: Added "ignore" parameter to :usbid * doc/descriptions.txt: Added "ignore" parameter to :usbid
token. token.
* doc/descriptions-external/hpaio.desc doc/descriptions-external/hpoj.desc * doc/descriptions-external/hpaio.desc doc/descriptions-external/hpoj.desc
doc/descriptions-external/samsung.desc: Updated comments. Added doc/descriptions-external/samsung.desc: Updated comments. Added
usb ids or "ignore". usb ids or "ignore".
2006-01-10 Oliver Schwartz <Oliver.Schwartz@gmx.de> 2006-01-10 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* doc/descriptions/snapscan.desc: Changed entries for duplicate USB IDs, * doc/descriptions/snapscan.desc: Changed entries for duplicate USB IDs,
added Epson Stylus CX-1500 added Epson Stylus CX-1500
* backend/snapscan.c backend/snapscan-scsi.c: Added support for 12 bit * backend/snapscan.c backend/snapscan-scsi.c: Added support for 12 bit
gamma tables for Epson CX-1500 gamma tables for Epson CX-1500
* backend/snapscan.conf.in: Added Epson Stylus CX-1500 * backend/snapscan.conf.in: Added Epson Stylus CX-1500
2006-01-10 Gerard Klaver <gerard at gkall dot hobby dot nl> 2006-01-10 Gerard Klaver <gerard at gkall dot hobby dot nl>
* doc/descriptions-external/stv680.desc: Added USB id. * doc/descriptions-external/stv680.desc: Added USB id.
added Creative webcam to list added Creative webcam to list
2006-01-10 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/epkowa.desc: Film area guide mode of * doc/descriptions-external/epkowa.desc: Film area guide mode of
4990 not supported (bug #302728). 4990 not supported (bug #302728).
* doc/descriptions-external/brother-mfc4600.desc * doc/descriptions-external/brother-mfc4600.desc
doc/descriptions-external/brother.desc doc/descriptions-external/brother.desc
doc/descriptions-external/brother2.desc doc/descriptions-external/brother2.desc
doc/descriptions-external/hp3770.desc doc/descriptions-external/hp3770.desc
doc/descriptions-external/hp3900.desc doc/descriptions-external/hp3900.desc
doc/descriptions-external/hp8200.desc doc/descriptions-external/hp8200.desc
doc/descriptions-external/hp_rts88xx.desc doc/descriptions-external/hp_rts88xx.desc
doc/descriptions-external/mustek_a3p1.desc doc/descriptions-external/mustek_a3p1.desc
doc/descriptions-external/primascan.desc doc/descriptions-external/primascan.desc
doc/descriptions-external/template.desc. doc/descriptions-external/template.desc.
doc/descriptions-external/viceo.desc: doc/descriptions-external/viceo.desc:
Added several USB ids. Added some more scanners. General cleanup. Added several USB ids. Added some more scanners. General cleanup.
2006-01-09 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/gt68xx.desc: Added USB id. * doc/descriptions/gt68xx.desc: Added USB id.
* doc/descriptions/unsupported.desc: Added interfaces to Panasonic * doc/descriptions/unsupported.desc: Added interfaces to Panasonic
scanners. scanners.
2006-01-08 Oliver Schwartz <Oliver.Schwartz@gmx.de> 2006-01-08 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* doc/descriptions/snapscan.desc: Added USB IDs * doc/descriptions/snapscan.desc: Added USB IDs
2006-01-08 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-08 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Xerox 4800. * doc/descriptions/unsupported.desc: Added Xerox 4800.
* doc/descriptions.txt tools/sane-desc.c: Added support for * doc/descriptions.txt tools/sane-desc.c: Added support for
keyword :usbid. All output modes now print the usb vendor and keyword :usbid. All output modes now print the usb vendor and
product modes. Added usermap, db, and udev output modes for product modes. Added usermap, db, and udev output modes for
generating USB vendor/product lists for hotplug (ng) and Linux generating USB vendor/product lists for hotplug (ng) and Linux
udev. Added version information to html modes. udev. Added version information to html modes.
* doc/descriptions/gt68xx.desc: Added vendor and product ids for * doc/descriptions/gt68xx.desc: Added vendor and product ids for
all scanners. all scanners.
* doc/descriptions/artec_eplus48u.desc * doc/descriptions/artec_eplus48u.desc
doc/descriptions/genesys.desc doc/descriptions/hp3500.desc doc/descriptions/genesys.desc doc/descriptions/hp3500.desc
doc/descriptions/hp4200.desc doc/descriptions/ma1509.desc doc/descriptions/hp4200.desc doc/descriptions/ma1509.desc
doc/descriptions/microtek2.desc doc/descriptions/mustek_usb.desc doc/descriptions/microtek2.desc doc/descriptions/mustek_usb.desc
doc/descriptions/mustek_usb2.desc doc/descriptions/sm3600.desc doc/descriptions/mustek_usb2.desc doc/descriptions/sm3600.desc
doc/descriptions/sm3840.desc doc/descriptions/template.desc. doc/descriptions/sm3840.desc doc/descriptions/template.desc.
doc/descriptions/umax1220u.desc doc/descriptions/unsupported.desc doc/descriptions/umax1220u.desc doc/descriptions/unsupported.desc
doc/descriptions-external/template.desc.: doc/descriptions-external/template.desc.:
Added USB vendor and product ids. Minor cleanups. Added USB vendor and product ids. Minor cleanups.
2006-01-07 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Medion MD 85264 finger * doc/descriptions/unsupported.desc: Added Medion MD 85264 finger
print sensor and Trust Office Scan USB 19200. print sensor and Trust Office Scan USB 19200.
* doc/descriptions-external/brother2.desc * doc/descriptions-external/brother2.desc
tools/hotplug/libsane.usermap: Brother DCP-7010 is reported to tools/hotplug/libsane.usermap: Brother DCP-7010 is reported to
work (bug #302862). work (bug #302862).
* tools/check-usb-chip.c: Print version information when detecting * tools/check-usb-chip.c: Print version information when detecting
chip sets. chip sets.
* sanei/sanei_usb.c: Added warning if libusb support is not built * sanei/sanei_usb.c: Added warning if libusb support is not built
in and some more debug messages. in and some more debug messages.
* doc/descriptions-external/hp3900.desc: Status of HP ScanJet 4070 * doc/descriptions-external/hp3900.desc: Status of HP ScanJet 4070
Photosmart is now minimal. Photosmart is now minimal.
* tools/sane-desc.c: Added new output mode: statistics. This mode * tools/sane-desc.c: Added new output mode: statistics. This mode
prints overal statistics about known devices. Added support for prints overal statistics about known devices. Added support for
more than one search directory. Removed support for deprecated more than one search directory. Removed support for deprecated
backend status ("alpha", "beta" ...). Ran indent -gnu. HTML backend status ("alpha", "beta" ...). Ran indent -gnu. HTML
output (backends and mfgs) prints statitics now. Unify status output (backends and mfgs) prints statitics now. Unify status
and device type strings. Simplified status and device type and device type strings. Simplified status and device type
string printing. Removed any remaining links of backend status. string printing. Removed any remaining links of backend status.
2006-01-06 Oliver Schwartz <Oliver.Schwartz@gmx.de> 2006-01-06 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-scsi.c backend/snapscan-options.c backend/snapscan.c: * backend/snapscan-scsi.c backend/snapscan-options.c backend/snapscan.c:
Some fixes for the Epson Stylus CX1500 Some fixes for the Epson Stylus CX1500
2006-01-05 St<53>hane Voltz <stefdev@modulonet.fr> 2006-01-05 St<53>hane Voltz <stefdev@modulonet.fr>
* backend/umax_pp_low.c: removed unused local variable * backend/umax_pp_low.c: removed unused local variable
2006-01-05 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/Makefile.in backend/abaton.conf backend/abaton.conf.in * backend/Makefile.in backend/abaton.conf backend/abaton.conf.in
backend/agfafocus.conf backend/agfafocus.conf.in backend/agfafocus.conf backend/agfafocus.conf.in
backend/apple.conf backend/apple.conf.in backend/artec.conf backend/apple.conf backend/apple.conf.in backend/artec.conf
backend/artec.conf.in backend/artec_eplus48u.conf backend/artec.conf.in backend/artec_eplus48u.conf
backend/artec_eplus48u.conf.in backend/avision.conf backend/artec_eplus48u.conf.in backend/avision.conf
backend/avision.conf.in backend/bh.conf backend/bh.conf.in backend/avision.conf.in backend/bh.conf backend/bh.conf.in
backend/canon.conf backend/canon.conf.in backend/canon630u.conf backend/canon.conf backend/canon.conf.in backend/canon630u.conf
backend/canon630u.conf.in backend/canon_pp.conf backend/canon630u.conf.in backend/canon_pp.conf
backend/canon_pp.conf.in backend/coolscan.conf backend/canon_pp.conf.in backend/coolscan.conf
backend/coolscan.conf.in backend/coolscan2.conf backend/coolscan.conf.in backend/coolscan2.conf
backend/coolscan2.conf.in backend/dc210.conf backend/coolscan2.conf.in backend/dc210.conf
backend/dc210.conf.in backend/dc240.conf backend/dc240.conf.in backend/dc210.conf.in backend/dc240.conf backend/dc240.conf.in
backend/dc25.conf backend/dc25.conf.in backend/dll.conf backend/dc25.conf backend/dc25.conf.in backend/dll.conf
backend/dll.conf.in backend/dmc.conf backend/dmc.conf.in backend/dll.conf.in backend/dmc.conf backend/dmc.conf.in
backend/epson.conf backend/epson.conf.in backend/fujitsu.conf backend/epson.conf backend/epson.conf.in backend/fujitsu.conf
backend/fujitsu.conf.in backend/genesys.conf backend/fujitsu.conf.in backend/genesys.conf
backend/genesys.conf.in backend/gphoto2.conf backend/genesys.conf.in backend/gphoto2.conf
backend/gphoto2.conf.in backend/gt68xx.conf backend/gphoto2.conf.in backend/gt68xx.conf
backend/gt68xx.conf.in backend/hp.conf backend/hp.conf.in backend/gt68xx.conf.in backend/hp.conf backend/hp.conf.in
backend/hp4200.conf backend/hp4200.conf.in backend/hp5400.conf backend/hp4200.conf backend/hp4200.conf.in backend/hp5400.conf
backend/hp5400.conf.in backend/hpsj5s.conf backend/hp5400.conf.in backend/hpsj5s.conf
backend/hpsj5s.conf.in backend/ibm.conf backend/ibm.conf.in backend/hpsj5s.conf.in backend/ibm.conf backend/ibm.conf.in
backend/leo.conf backend/leo.conf.in backend/lexmark.conf backend/leo.conf backend/leo.conf.in backend/lexmark.conf
backend/lexmark.conf.in backend/ma1509.conf backend/lexmark.conf.in backend/ma1509.conf
backend/ma1509.conf.in backend/matsushita.conf backend/ma1509.conf.in backend/matsushita.conf
backend/matsushita.conf.in backend/microtek.conf backend/matsushita.conf.in backend/microtek.conf
backend/microtek.conf.in backend/microtek2.conf backend/microtek.conf.in backend/microtek2.conf
backend/microtek2.conf.in backend/mustek.conf backend/microtek2.conf.in backend/mustek.conf
backend/mustek.conf.in backend/mustek_pp.conf backend/mustek.conf.in backend/mustek_pp.conf
backend/mustek_pp.conf.in backend/mustek_usb.conf backend/mustek_pp.conf.in backend/mustek_usb.conf
backend/mustek_usb.conf.in backend/nec.conf backend/nec.conf.in backend/mustek_usb.conf.in backend/nec.conf backend/nec.conf.in
backend/net.conf backend/net.conf.in backend/pie.conf backend/net.conf backend/net.conf.in backend/pie.conf
backend/pie.conf.in backend/plustek.conf backend/plustek.conf.in backend/pie.conf.in backend/plustek.conf backend/plustek.conf.in
backend/plustek_pp.conf backend/plustek_pp.conf.in backend/plustek_pp.conf backend/plustek_pp.conf.in
backend/qcam.conf backend/qcam.conf.in backend/ricoh.conf backend/qcam.conf backend/qcam.conf.in backend/ricoh.conf
backend/ricoh.conf.in backend/s9036.conf backend/s9036.conf.in backend/ricoh.conf.in backend/s9036.conf backend/s9036.conf.in
backend/saned.conf backend/saned.conf.in backend/sceptre.conf backend/saned.conf backend/saned.conf.in backend/sceptre.conf
backend/sceptre.conf.in backend/sharp.conf backend/sharp.conf.in backend/sceptre.conf.in backend/sharp.conf backend/sharp.conf.in
backend/sm3840.conf backend/sm3840.conf.in backend/snapscan.conf backend/sm3840.conf backend/sm3840.conf.in backend/snapscan.conf
backend/snapscan.conf.in backend/sp15c.conf backend/snapscan.conf.in backend/sp15c.conf
backend/sp15c.conf.in backend/st400.conf backend/st400.conf.in backend/sp15c.conf.in backend/st400.conf backend/st400.conf.in
backend/tamarack.conf backend/tamarack.conf.in backend/tamarack.conf backend/tamarack.conf.in
backend/teco1.conf backend/teco1.conf.in backend/teco2.conf backend/teco1.conf backend/teco1.conf.in backend/teco2.conf
backend/teco2.conf.in backend/teco3.conf backend/teco3.conf.in backend/teco2.conf.in backend/teco3.conf backend/teco3.conf.in
backend/test.conf backend/test.conf.in backend/u12.conf backend/test.conf backend/test.conf.in backend/u12.conf
backend/u12.conf.in backend/umax.conf backend/umax.conf.in backend/u12.conf.in backend/umax.conf backend/umax.conf.in
backend/umax1220u.conf backend/umax1220u.conf.in backend/umax1220u.conf backend/umax1220u.conf.in
backend/umax_pp.conf backend/umax_pp.conf.in backend/v4l.conf backend/umax_pp.conf backend/umax_pp.conf.in backend/v4l.conf
backend/v4l.conf.in: backend/v4l.conf.in:
Renamed backend configuration files from *.conf to Renamed backend configuration files from *.conf to
*.conf.in. The configuration files are preprocessed by *.conf.in. The configuration files are preprocessed by
backend/Makefile now and variables like @DATADIR@ are substituted backend/Makefile now and variables like @DATADIR@ are substituted
by the appropriate directories. This is especially useful for by the appropriate directories. This is especially useful for
firmware locations. For the firmware paths for the artec_eplus48u, firmware locations. For the firmware paths for the artec_eplus48u,
gt68xx, and snapscan backends variables were used. Bug #302590. gt68xx, and snapscan backends variables were used. Bug #302590.
Regenerate .conf files only if .conf.in were changed. Regenerate .conf files only if .conf.in were changed.
* backend/.cvsignore: Added *.conf. * backend/.cvsignore: Added *.conf.
* README.linux: Mentioned udev. * README.linux: Mentioned udev.
* doc/backend-writing.txt: New chapters about the build system and * doc/backend-writing.txt: New chapters about the build system and
the files and directories of sane-backends. Fixed building the files and directories of sane-backends. Fixed building
instructions for tstbackend. Mentioned that sane_* symbols instructions for tstbackend. Mentioned that sane_* symbols
should be only used for API symbols. should be only used for API symbols.
* testsuite/Makefile.in testsuite/README testsuite/testfile.pnm: * testsuite/Makefile.in testsuite/README testsuite/testfile.pnm:
Changed testsuite to use the test backend instead of the pnm Changed testsuite to use the test backend instead of the pnm
backend. This actually works with current sane-backends. backend. This actually works with current sane-backends.
* PROBLEMS: Removed pnm problem description. It's not relevant for * PROBLEMS: Removed pnm problem description. It's not relevant for
normal users and explained in the sane-pnm man page anyway. normal users and explained in the sane-pnm man page anyway.
* backend/genesys.c: Fixed some compilation warnings. * backend/genesys.c: Fixed some compilation warnings.
* tools/hotplug/libsane.usermap: Added Hewlett-Packard PSC 1210. * tools/hotplug/libsane.usermap: Added Hewlett-Packard PSC 1210.
2006-01-03 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/sane.tex: Corrected formula for calculation of * doc/sane.tex: Corrected formula for calculation of
bytes_per_line in chapter 4.3.8 sane_get_parameters. bytes_per_line in chapter 4.3.8 sane_get_parameters.
New version: 1.04. New version: 1.04.
2006-01-02 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/microtek2.c backend/microtek2.h: Fixed problem with * backend/microtek2.c backend/microtek2.h: Fixed problem with
option "resolution" which esists twice at the same time. Bug option "resolution" which esists twice at the same time. Bug
#302466. #302466.
* tools/hotplug/libsane.usermap: Added Canon LiDE 60 (bug * tools/hotplug/libsane.usermap: Added Canon LiDE 60 (bug
#302830). #302830).
* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c * backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
backend/gt68xx_high.c doc/descriptions/gt68xx.desc backend/gt68xx_high.c doc/descriptions/gt68xx.desc
doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO: Added Plustek doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO: Added Plustek
OpticPro S(T)12 (product id 0x040b). Mostly untested. Print OpticPro S(T)12 (product id 0x040b). Mostly untested. Print
warmup message 5 seconds after starting the warm-up. warmup message 5 seconds after starting the warm-up.
* doc/descriptions/unsupported.desc: Added Visioneer 9450 * doc/descriptions/unsupported.desc: Added Visioneer 9450
USB. Updated comments for Plustek S(T)12. USB. Updated comments for Plustek S(T)12.
* backend/test.c backend/test.conf backend/test.h * backend/test.c backend/test.conf backend/test.h
doc/sane-test.man doc/descriptions/test.desc: doc/sane-test.man doc/descriptions/test.desc:
Added option "source" which can be used to simulate an Automatic Added option "source" which can be used to simulate an Automatic
Document Feeder (ADF). Added copyright header to test.h. Document Feeder (ADF). Added copyright header to test.h.
* frontend/scanimage.c: Don't create and delete a file in batch * frontend/scanimage.c: Don't create and delete a file in batch
mode if the document feeder is empty or if CTRL-D is pressed in mode if the document feeder is empty or if CTRL-D is pressed in
prompt mode. This change avoids deleting existing files. For an prompt mode. This change avoids deleting existing files. For an
explanation, see bug #302797. explanation, see bug #302797.
2006-01-01 Oliver Schwartz <Oliver.Schwartz@gmx.de> 2006-01-01 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-data.c backend/snapscan-options.c backend/snapscan.c * backend/snapscan-data.c backend/snapscan-options.c backend/snapscan.c
doc/descriptions/snascan.desc: doc/descriptions/snascan.desc:
Added (static) calibration data for Benq 5150 / 5250 Added (static) calibration data for Benq 5150 / 5250
* backend/snapscan.h backend/snapscan.conf: * backend/snapscan.h backend/snapscan.conf:
Added preliminary support for Epson Stylus CX 1500 Added preliminary support for Epson Stylus CX 1500
* backend/Makefile.in: Added snapscan-data.c * backend/Makefile.in: Added snapscan-data.c
2005-12-29 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/scanwit.desc: Added "(Acer)" to * doc/descriptions-external/scanwit.desc: Added "(Acer)" to
manufacturer name (bug #302801). manufacturer name (bug #302801).
* doc/descriptions/unsupported.desc: Added/updated several old * doc/descriptions/unsupported.desc: Added/updated several old
Acer (Benq) and Agfa parport scanners. Acer (Benq) and Agfa parport scanners.
2005-12-28 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/hotplug/libsane.usermap: Added Brother MFC 8440. * tools/hotplug/libsane.usermap: Added Brother MFC 8440.
* Makefile.in: make libcheck now also checks for non standard sane * Makefile.in: make libcheck now also checks for non standard sane
symbols (sane_*). symbols (sane_*).
* doc/descriptions/unsupported.desc: HP Scanjet 3690 uses GL646_HP * doc/descriptions/unsupported.desc: HP Scanjet 3690 uses GL646_HP
chipset. chipset.
2005-12-27 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
* README.linux: Mention ld.so.conf issue. * README.linux: Mention ld.so.conf issue.
* doc/descriptions/unsupported.desc * doc/descriptions/unsupported.desc
doc/descriptions-external/hp3900.desc: Added external hp3900 doc/descriptions-external/hp3900.desc: Added external hp3900
backend. Moved (possibly) supported scanners from backend. Moved (possibly) supported scanners from
unsupported.desc. unsupported.desc.
* doc/backend-writing.c: Added some hints about what to do to add * doc/backend-writing.c: Added some hints about what to do to add
a new backend to the existing sane-backends code. a new backend to the existing sane-backends code.
2005-12-24 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Lexmark X2330. * doc/descriptions/unsupported.desc: Added Lexmark X2330.
2005-12-23 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-23 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Canon Pixma MP500. * doc/descriptions/unsupported.desc: Added Canon Pixma MP500.
* README.openbsd: Added hint about CPPFLAGS. * README.openbsd: Added hint about CPPFLAGS.
* doc/descriptions/artec.desc: Changed status of Artec AT6 to * doc/descriptions/artec.desc: Changed status of Artec AT6 to
"good" as reported in bug #302749. "good" as reported in bug #302749.
* tools/hotplug/libsane.usermap: Added Brother MFC-7420. * tools/hotplug/libsane.usermap: Added Brother MFC-7420.
2005-12-20 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-20 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/dll.c doc/descriptions/dll.desc: Fixed dynamic loading * backend/dll.c doc/descriptions/dll.desc: Fixed dynamic loading
on current HP/UX systems (bug #302732). on current HP/UX systems (bug #302732).
* AUTHORS ChangeLog configure configure.in backend/Makefile.in * AUTHORS ChangeLog configure configure.in backend/Makefile.in
backend/dll.conf backend/hp3500.c doc/Makefile.in backend/dll.conf backend/hp3500.c doc/Makefile.in
doc/sane-hp3500.man doc/sane.man doc/descriptions/hp3500.desc: doc/sane-hp3500.man doc/sane.man doc/descriptions/hp3500.desc:
Added hp3500 backend which supports the HP ScanJet 3500 series, Added hp3500 backend which supports the HP ScanJet 3500 series,
including the 3500C, 3530C and 3570C (patch from Troy Rollo including the 3500C, 3530C and 3570C (patch from Troy Rollo
<sane@troy.rollo.name>) (bug #302687). <sane@troy.rollo.name>) (bug #302687).
* doc/descriptions-external/hp3500.desc: Deleted. * doc/descriptions-external/hp3500.desc: Deleted.
* doc/descriptions/hp4200.desc doc/descriptions/lexmark.desc * doc/descriptions/hp4200.desc doc/descriptions/lexmark.desc
doc/descriptions/mustek_usb2.desc: Removed "NEW!" markers. doc/descriptions/mustek_usb2.desc: Removed "NEW!" markers.
2005-12-18 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-18 Henning Meier-Geinitz <henning@meier-geinitz.de>
* Makefile.in: List ChangeLog-1.0.17 in DISTFILES. * Makefile.in: List ChangeLog-1.0.17 in DISTFILES.
* configure configure.in: Changed version to 1.0.17-cvs. Enabled * configure configure.in: Changed version to 1.0.17-cvs. Enabled
compilation warnings. compilation warnings.
* doc/descriptions-external/brother2.desc: Added Brother MFC-215C. * doc/descriptions-external/brother2.desc: Added Brother MFC-215C.
Older entries can be found in ChangeLog-1.0.17. Older entries can be found in ChangeLog-1.0.17.

956
backend/niash.c
Wyświetl plik

Plik diff jest za duży Load Diff

64
backend/niash_xfer.c
Wyświetl plik

@ -19,13 +19,13 @@
*/ */
/* /*
Provides a simple interface to read and write data from the scanner, Provides a simple interface to read and write data from the scanner,
without any knowledge whether it's a parallel or USB scanner without any knowledge whether it's a parallel or USB scanner
*/ */
#include <stdio.h> /* printf */ #include <stdio.h> /* printf */
#include <errno.h> /* better error reports */ #include <errno.h> /* better error reports */
#include <string.h> /* better error reports */ #include <string.h> /* better error reports */
#include "niash_xfer.h" #include "niash_xfer.h"
@ -43,6 +43,8 @@ STATIC TScannerModel ScannerModels[] = {
, ,
{"Agfa", "Snapscan Touch", 0x6BD, 0x100, eAgfaTouch} {"Agfa", "Snapscan Touch", 0x6BD, 0x100, eAgfaTouch}
, ,
{"Trust", "Office Scanner USB 19200", 0x47b, 0x1000, eAgfaTouch}
,
/* last entry all zeros */ /* last entry all zeros */
{0, 0, 0, 0, 0} {0, 0, 0, 0, 0}
}; };
@ -53,11 +55,11 @@ static TScannerModel *_pModel;
/* /*
MatchUsbDevice MatchUsbDevice
============== ==============
Matches a given USB vendor and product id against a list of Matches a given USB vendor and product id against a list of
supported scanners. supported scanners.
IN iVendor USB vendor ID IN iVendor USB vendor ID
iProduct USB product ID iProduct USB product ID
OUT *ppModel Pointer to TScannerModel structure OUT *ppModel Pointer to TScannerModel structure
Returns TRUE if a matching USB scanner was found Returns TRUE if a matching USB scanner was found
@ -71,12 +73,12 @@ MatchUsbDevice (int iVendor, int iProduct, TScannerModel ** ppModel)
while (pModels->pszName != NULL) while (pModels->pszName != NULL)
{ {
if ((pModels->iVendor == iVendor) && (pModels->iProduct == iProduct)) if ((pModels->iVendor == iVendor) && (pModels->iProduct == iProduct))
{ {
DBG (DBG_MSG, "found %s %s\n", pModels->pszVendor, DBG (DBG_MSG, "found %s %s\n", pModels->pszVendor,
pModels->pszName); pModels->pszName);
*ppModel = pModels; *ppModel = pModels;
return SANE_TRUE; return SANE_TRUE;
} }
/* next model to match */ /* next model to match */
pModels++; pModels++;
} }
@ -104,8 +106,8 @@ _AttachUsb (SANE_String_Const devname)
/* /*
NiashXferInit NiashXferInit
=============== ===============
Initialises all registered data transfer modules, which causes Initialises all registered data transfer modules, which causes
them to report any devices found through the pfnReport callback. them to report any devices found through the pfnReport callback.
IN pfnReport Function to call to report a transfer device IN pfnReport Function to call to report a transfer device
*/ */
@ -123,13 +125,13 @@ NiashXferInit (TFnReportDevice * pfnReport)
DBG (DBG_MSG, "Looking for %s...\n", pModels->pszName); DBG (DBG_MSG, "Looking for %s...\n", pModels->pszName);
_pModel = pModels; _pModel = pModels;
if (sanei_usb_find_devices ((SANE_Int) pModels->iVendor, if (sanei_usb_find_devices ((SANE_Int) pModels->iVendor,
(SANE_Int) pModels->iProduct, (SANE_Int) pModels->iProduct,
_AttachUsb) != SANE_STATUS_GOOD) _AttachUsb) != SANE_STATUS_GOOD)
{ {
DBG (DBG_ERR, "Error invoking sanei_usb_find_devices"); DBG (DBG_ERR, "Error invoking sanei_usb_find_devices");
break; break;
} }
pModels++; pModels++;
} }
} }
@ -141,7 +143,7 @@ NiashXferOpen (const char *pszName, EScannerModel * peModel)
SANE_Status status; SANE_Status status;
SANE_Word vendor, product; SANE_Word vendor, product;
int fd; int fd;
TScannerModel *pModel; TScannerModel *pModel = 0;
DBG (DBG_MSG, "Trying to open %s...\n", pszName); DBG (DBG_MSG, "Trying to open %s...\n", pszName);
@ -178,8 +180,8 @@ static void
parusb_write_reg (int fd, unsigned char bReg, unsigned char bValue) parusb_write_reg (int fd, unsigned char bReg, unsigned char bValue)
{ {
sanei_usb_control_msg (fd, sanei_usb_control_msg (fd,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
0x0C, bReg, 0, 1, &bValue); 0x0C, bReg, 0, 1, &bValue);
} }
@ -187,8 +189,8 @@ static void
parusb_read_reg (int fd, unsigned char bReg, unsigned char *pbValue) parusb_read_reg (int fd, unsigned char bReg, unsigned char *pbValue)
{ {
sanei_usb_control_msg (fd, sanei_usb_control_msg (fd,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
0x0C, bReg, 0, 1, pbValue); 0x0C, bReg, 0, 1, pbValue);
} }
@ -247,8 +249,8 @@ NiashWriteBulk (int iHandle, unsigned char *pabBuf, int iSize)
abSetup[4] = (iSize) & 0xFF; abSetup[4] = (iSize) & 0xFF;
abSetup[5] = (iSize >> 8) & 0xFF; abSetup[5] = (iSize >> 8) & 0xFF;
sanei_usb_control_msg (iHandle, sanei_usb_control_msg (iHandle,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
0x04, USB_SETUP, 0, 8, abSetup); 0x04, USB_SETUP, 0, 8, abSetup);
/* do the bulk write */ /* do the bulk write */
size = iSize; size = iSize;
@ -279,8 +281,8 @@ NiashReadBulk (int iHandle, unsigned char *pabBuf, int iSize)
abSetup[4] = (iSize) & 0xFF; abSetup[4] = (iSize) & 0xFF;
abSetup[5] = (iSize >> 8) & 0xFF; abSetup[5] = (iSize >> 8) & 0xFF;
sanei_usb_control_msg (iHandle, sanei_usb_control_msg (iHandle,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
0x04, USB_SETUP, 0, 8, abSetup); 0x04, USB_SETUP, 0, 8, abSetup);
/* do the bulk read */ /* do the bulk read */
size = iSize; size = iSize;

16
doc/descriptions/niash.desc
Wyświetl plik

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

22
doc/sane-niash.man
Wyświetl plik

@ -15,11 +15,13 @@ the following models:
.ft CR .ft CR
.nf .nf
MANUFACTURER: MODEL: USB ID: MANUFACTURER: MODEL: USB ID:
--------------- -------------- --------- --------------- ---------------- ---------
Agfa Snapscan Touch 06BD-0100 (1)(a) Agfa Snapscan Touch 047B-1000 (1)(a)
Hewlett-Packard Scanjet 3300c 03F0-0205 (1)(a)(b) Trust Office Scan 1900 06BD-0100 (1)(a)
Hewlett-Packard Scanjet 3400c 03F0-0405 (2)(b) Hewlett-Packard Scanjet 3300c 03F0-0205 (1)(a)(b)
Hewlett-Packard Scanjet 4300c 03F0-0305 (2)(a) Hewlett-Packard Scanjet 3400c 03F0-0405 (2)(b)
Hewlett-Packard Scanjet 4300c 03F0-0305 (2)(a)
Silitek ScanJet 4300c 047B-1002 (2)(b)
.fi .fi
.ft R .ft R
.PP .PP
@ -49,15 +51,15 @@ support dynamic loading).
.SH CAVEATS .SH CAVEATS
If you use a If you use a
.br .br
Hewlett-Packard Scanjet 3400c Hewlett-Packard Scanjet 3400c
or or
.br .br
Hewlett-Packard Scanjet 4300c Hewlett-Packard Scanjet 4300c
.br .br
together with Linux kernel together with Linux kernel
.BR 2.6 , .BR 2.6 ,
kernel version kernel version
.B 2.6.8 .B 2.6.8
or newer is necessary. or newer is necessary.
.SH ENVIRONMENT .SH ENVIRONMENT

5
tools/hotplug/libsane.usermap
Wyświetl plik

@ -313,7 +313,7 @@ libusbscanner 0x0003 0x04b8 0x080e 0x0000 0x0000
libusbscanner 0x0003 0x04b8 0x0810 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x04b8 0x0810 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Epson Corp.|Stylus RX620/RX630 (PM-A870) # Epson Corp.|Stylus RX620/RX630 (PM-A870)
libusbscanner 0x0003 0x04b8 0x0811 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x04b8 0x0811 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Epson Corp.|Stylus CX6600 # Epson Corp.|Stylus CX6600
libusbscanner 0x0003 0x04b8 0x0813 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x04b8 0x0813 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Epson Corp.|(PM-A700) # Epson Corp.|(PM-A700)
libusbscanner 0x0003 0x04b8 0x0814 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x04b8 0x0814 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
@ -529,5 +529,8 @@ libusbscanner 0x0003 0x1606 0x0230 0x0000 0x0000
libusbscanner 0x0003 0x0a82 0x4600 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x0a82 0x4600 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Silitek Corp.|HP ScanJet 4300c # Silitek Corp.|HP ScanJet 4300c
libusbscanner 0x0003 0x047b 0x1002 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 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 # Dell|A920
libusbscanner 0x0003 0x413c 0x5105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x413c 0x5105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000