Stanislav Yuzvinsky
2a11622967
Merge branch 'teardown' into 'master'
...
ricoh2: Rearrange init/deinit code of ricoh2 to correctly support "code flow"
See merge request sane-project/backends!65
2019-05-19 18:18:57 +00:00
Olaf Meeuwissen
7585538595
epson2: Add XP-255 as supported. Fixes #81
2019-05-19 21:41:16 +09:00
Povilas Kanapickas
71bf2daec6
Merge branch 'genesys-remove-static' into 'master'
...
genesys: Remove uses of GENESYS_STATIC
See merge request sane-project/backends!68
2019-05-19 12:02:50 +00:00
Povilas Kanapickas
8cdd5ae22e
Merge branch 'genesys-debug-cleanup' into 'master'
...
genesys: Use the same debug identifier for the whole backend
See merge request sane-project/backends!67
2019-05-19 11:56:38 +00:00
Povilas Kanapickas
a4ab69376c
genesys: Remove uses of GENESYS_STATIC
2019-05-19 14:49:44 +03:00
Povilas Kanapickas
4c2c4eb639
genesys: Remove duplicate definition of DBGSTART and DBGCOMPLETED
2019-05-19 14:46:46 +03:00
Povilas Kanapickas
6f617e9889
genesys: Don't define different backend names in source files
2019-05-19 14:46:45 +03:00
Povilas Kanapickas
873e82c0a0
genesys: Remove logging of the build number
...
A git commit would be much more useful in log messages
2019-05-19 14:46:44 +03:00
Stanislav Yuzvinsky
7a8ae92862
ricoh2: Rearrange init/deinit code of ricoh2 to correctly support "code flow"
...
The backend worked incorrectly when scanning process was interrupted before the
current page was scanned completely. For example, scanimage tool could not scan
the next page if the previous one was interrupted. Now this issue is fixed.
See also "4.4. Code Flow" in SANE API specification v.1.06.
Also debug levels was changed to have better control over what should be
logged.
2019-05-13 23:44:07 +03:00
Olaf Meeuwissen
e13b80fa6f
Merge branch 'add_sg3100' into 'master'
...
Add support for Aficio SG3100SNw
See merge request sane-project/backends!57
2019-05-12 03:11:00 +00:00
Olaf Meeuwissen
ae871333ef
Merge branch 'scanimage-output-path' into 'master'
...
scanimage: Allow specification of the output path via option
See merge request sane-project/backends!46
2019-05-12 02:36:36 +00:00
Stanislav Yuzvinsky
0273c05c95
Fix review comments; add the backend to dll.conf
2019-05-11 16:17:40 +03:00
Povilas Kanapickas
4df63ef548
Merge branch 'genesys-debug-improvements' into 'master'
...
genesys: Miscellaneous debug improvements
See merge request sane-project/backends!64
2019-05-11 09:20:45 +00:00
Povilas Kanapickas
3c8b9b9167
Merge branch 'genesys-reduce-duplication' into 'master'
...
genesys: Reduce duplication in low level functions
See merge request sane-project/backends!63
2019-05-11 09:14:06 +00:00
Povilas Kanapickas
988a91aec4
genesys: Write all offset calibration debug to a single file on gl843
2019-05-11 12:12:29 +03:00
Povilas Kanapickas
36bc194405
genesys: Add a small C array implementation
2019-05-11 12:12:28 +03:00
Povilas Kanapickas
5321427e55
genesys: Don't write identical debug pnm files
2019-05-11 12:12:27 +03:00
Povilas Kanapickas
882741d78a
genesys: Prepend file identifier to debug image filenames
2019-05-11 12:12:26 +03:00
Povilas Kanapickas
d3b25a5966
genesys: Don't write identical debug pnm files
2019-05-11 12:12:25 +03:00
Povilas Kanapickas
74fffa6479
Merge branch 'genesys-force-calibration' into 'master'
...
genesys: Add option to force calibration ignoring caches
See merge request sane-project/backends!62
2019-05-11 09:08:11 +00:00
Povilas Kanapickas
8de5a1fdb1
genesys: Remove unused code
2019-05-11 12:05:26 +03:00
Povilas Kanapickas
da81a523fa
genesys: Reuse sanei_genesys_bulk_write_register() on GL841
2019-05-11 12:05:25 +03:00
Povilas Kanapickas
2b1f13fddb
genesys: Reuse sanei_genesys_bulk_write_register() on GL646
2019-05-11 12:05:24 +03:00
Povilas Kanapickas
b683a40fdd
genesys: Reuse common genesys register functions on GL646
2019-05-11 12:05:23 +03:00
Povilas Kanapickas
58e1eb8ac4
genesys: Reuse sanei_genesys_bulk_write_data() on GL646
2019-05-11 12:05:22 +03:00
Povilas Kanapickas
80efacab10
genesys: Reuse sanei_genesys_bulk_write_data() on GL841
2019-05-11 12:05:21 +03:00
Povilas Kanapickas
d62d4f0d16
genesys: Use sanei_genesys_get_bulk_max_size() for max bulk out size
2019-05-11 12:05:20 +03:00
Povilas Kanapickas
7ee139bd4b
genesys: Pass device to sanei_genesys_write_ahb() as ptr not number
2019-05-11 12:05:19 +03:00
Povilas Kanapickas
d7bff42cba
genesys: Add generic sanei_genesys_bulk_write_data() out of GL843 impl
2019-05-11 12:05:18 +03:00
Povilas Kanapickas
98258549cb
genesys: Extract sanei_genesys_get_bulk_max_size()
2019-05-11 12:05:17 +03:00
Povilas Kanapickas
5b9d014592
genesys: Remove commented out code for buffer size alignment
2019-05-11 12:05:16 +03:00
Povilas Kanapickas
9dc8bbfac9
genesys: Reuse sanei_genesys_bulk_read_data() on GL847
2019-05-11 12:05:15 +03:00
Povilas Kanapickas
4af3557bbf
genesys: Reuse sanei_genesys_bulk_read_data() on GL846
2019-05-11 12:05:14 +03:00
Povilas Kanapickas
216c18f9ff
genesys: Reuse sanei_genesys_bulk_read_data() on GL843
2019-05-11 12:05:13 +03:00
Povilas Kanapickas
55e5c7b7ac
genesys: Reuse sanei_genesys_bulk_read_data() on GL841
2019-05-11 12:05:12 +03:00
Povilas Kanapickas
8e8511a49e
genesys: Reuse sanei_genesys_bulk_read_data() on GL646
2019-05-11 12:05:11 +03:00
Povilas Kanapickas
69435b3bb2
genesys: Revert 512-byte bulk transfer alignment workaround
...
It should be handled by libusb.
2019-05-11 12:05:10 +03:00
Povilas Kanapickas
4a899d26f3
genesys: Create generic sanei_genesys_bulk_read_data out of gl124 impl
2019-05-11 12:05:09 +03:00
Povilas Kanapickas
887759192b
genesys: Add option to force calibration ignoring caches
2019-05-11 12:00:25 +03:00
Povilas Kanapickas
ee6d6da339
scanimage: Update manual page
2019-05-11 11:45:27 +03:00
Povilas Kanapickas
728de89d71
scanimage: Guess --format from --output-file if possible
2019-05-11 11:45:27 +03:00
Povilas Kanapickas
86e917b04b
scanimage: Prevent --output-file and --batch to be used together
2019-05-11 11:45:27 +03:00
Povilas Kanapickas
7f4944f0a7
scanimage: Warn when output format is not set
2019-05-11 11:45:27 +03:00
Povilas Kanapickas
877cc29d88
scanimage: Raise an error if --format option is an unknown format
2019-05-11 11:45:27 +03:00
Olaf Meeuwissen
15fd9bc9ce
Merge branch 'log-messages-no-git-conflict-markers' into 'master'
...
Don't use strings that are similar to conflict markers in debug msgs
See merge request sane-project/backends!60
2019-05-11 08:13:18 +00:00
Povilas Kanapickas
856391100f
Merge branch 'genesys-explicit-casts' into 'master'
...
genesys: Perform type casts explicitly
See merge request sane-project/backends!59
2019-05-10 18:23:32 +00:00
Povilas Kanapickas
47e7f087c6
genesys: Perform type casts explicitly
2019-05-10 21:11:01 +03:00
Povilas Kanapickas
16a8d55480
Don't use strings that are similar to conflict markers in debug msgs
2019-05-10 21:05:51 +03:00
Olaf Meeuwissen
56c01c005a
Merge branch '24-hp-scanjet-8250-duplex-broken-avision-backend' into 'master'
...
avision: Fix threaded ADF flipping duplex handling
Closes #24
See merge request sane-project/backends!58
2019-05-05 09:27:29 +00:00
Olaf Meeuwissen
296542905e
avision: Fix threaded ADF flipping duplex handling. Re #24
2019-05-04 23:39:33 +09:00