Povilas Kanapickas
4870a9f975
genesys: Properly set conseq_pixel_dist_bytes on gl124
2019-09-12 22:21:57 +03:00
Povilas Kanapickas
95eb6a72dd
genesys: Use single code path to compute session output_line_bytes_raw
2019-09-12 22:21:56 +03:00
Povilas Kanapickas
1f4a5311d7
genesys: Rename DesegmentationState::raw_{channel => line}_bytes
2019-09-12 22:21:55 +03:00
Povilas Kanapickas
61d4779402
genesys: Remove erroneously named raw_line_bytes
...
The raw_channel_bytes is what we store the line information to. Turns
out raw_line_bytes is unnecessary and only ever used by error.
2019-09-12 22:21:54 +03:00
Povilas Kanapickas
4df8872ab3
genesys: Simplify raw_channel_bytes computation more
...
On the chipsets in question, session.hwdpi_divisor == sensor.optical_res
/ sensor.get_register_hwdpi(...), so the divisor cancels out with the
rest of the expression.
2019-09-12 22:21:53 +03:00
Povilas Kanapickas
95a3836f1a
genesys: Simplify raw_channel_bytes calculation
2019-09-12 22:21:52 +03:00
Povilas Kanapickas
98320f5b81
genesys: Don't overflow in multiply_by_depth_ceil
2019-09-12 22:21:51 +03:00
Povilas Kanapickas
eb0882ecc4
genesys: Use common code path to compute session optical_pixels_raw
2019-09-12 22:11:20 +03:00
Povilas Kanapickas
3a323a751a
genesys: Use common code path to compute session conseq_pixel_dist_bytes
2019-09-12 22:11:19 +03:00
Povilas Kanapickas
52baae02dc
genesys: Use common code path to compute session hwdpi_divisor
2019-09-12 21:55:30 +03:00
Povilas Kanapickas
f480521a23
genesys: Pass sensor profile directly to *_setup_sensor() where possible
2019-09-12 21:55:29 +03:00
Povilas Kanapickas
676831dc7b
genesys: Move Genesys_Device::curr to DesegmentationState
2019-09-12 21:26:58 +03:00
Povilas Kanapickas
f92253adc8
genesys: Move Genesys_Device::segnb to DesegmentationState
2019-09-12 21:26:57 +03:00
Povilas Kanapickas
15996983ba
genesys: Rename SensorProfile::segment_{count => size}
2019-09-12 21:26:56 +03:00
Povilas Kanapickas
31820384de
genesys: Move Genesys_Device::skip to DesegmentationState
2019-09-12 21:26:55 +03:00
Povilas Kanapickas
9bd14f5350
genesys: Move Genesys_Device::len to DesegmentationState
2019-09-12 21:26:54 +03:00
Povilas Kanapickas
07d8db5423
genesys: Move Genesys_Device::dist to DesegmentationState
2019-09-12 21:26:53 +03:00
Povilas Kanapickas
dd70296827
genesys: Move desegmentation line width data to a separate struct
2019-09-12 21:26:52 +03:00
Povilas Kanapickas
827c3a049d
genesys: Rename ScanSession::output_{line_channel => channel}_bytes
2019-09-12 21:26:51 +03:00
Povilas Kanapickas
b856c2cb6f
genesys: Remove used_pixels to simplify segment setup
2019-09-12 21:24:32 +03:00
Povilas Kanapickas
0a10bcef59
genesys: Refactor the segment setup code to expose chip similarities
2019-09-12 21:24:31 +03:00
Povilas Kanapickas
41b5e5f5ff
genesys: Use common code path to compute session segment_count
2019-09-12 21:24:30 +03:00
Povilas Kanapickas
ae784d9927
genesys: Simplify segment count calculation
2019-09-12 21:24:29 +03:00
Povilas Kanapickas
cbb7e95350
genesys: Use common code path to compute session buffer sizes
2019-09-12 20:28:46 +03:00
Povilas Kanapickas
a0cead1cd5
genesys: Pass asic type to sanei_genesys_get_bulk_max_size()
2019-09-12 20:28:45 +03:00
Povilas Kanapickas
88d6cdcc32
genesys: Rename read_bytes_left -> read_bytes_left_after_deseg
2019-09-12 20:06:38 +03:00
Povilas Kanapickas
96a893bb0d
genesys: Simplify words_per_line calculations
2019-09-12 20:06:37 +03:00
Povilas Kanapickas
463f5f4364
genesys: Don't duplicate data passed to *_init_optical_regs_scan()
2019-09-12 20:06:36 +03:00
Povilas Kanapickas
ed4419e73d
genesys: Use common code path to calculate session line sizes
2019-09-12 19:49:51 +03:00
Povilas Kanapickas
9915608309
genesys: Extract multiplication by depth to a separate function
2019-09-12 19:49:50 +03:00
Povilas Kanapickas
991eec63d5
genesys: Use common code path to compute session output_line_count
2019-09-12 19:34:43 +03:00
Povilas Kanapickas
605fcf9762
genesys: Assume correct resolution is passed from high-level
2019-09-12 19:11:07 +03:00
Povilas Kanapickas
73951b4bf8
genesys: Simplify motor code on gl646 by retining real motor dpi prop
2019-09-12 19:11:06 +03:00
Povilas Kanapickas
ce144ed46f
genesys: Use common code path to compute session max_color_shift_lines
2019-09-12 18:27:45 +03:00
Povilas Kanapickas
0961c5d32f
genesys: Use common code path to compute session output_pixels
2019-09-12 18:23:32 +03:00
Povilas Kanapickas
77e0acde22
genesys: Fix computation of total_bytes_to_read
2019-09-12 18:22:57 +03:00
Povilas Kanapickas
50e5c80434
genesys: Remove low-level handling of xdpi < ydpi case
...
The high-level code ensures that the xdpi is always natively supported
by the scanner.
2019-09-12 18:21:18 +03:00
Povilas Kanapickas
548eff4a32
genesys: Fix support for scans when xdpi<ydpi on gl646
2019-09-12 18:21:17 +03:00
Povilas Kanapickas
21254ad929
genesys: Use Sensor::optical_res directly where possible
2019-09-12 18:21:16 +03:00
Povilas Kanapickas
453a6b75be
genesys: Use common code path to compute session num_staggered_lines
2019-09-12 17:59:47 +03:00
Povilas Kanapickas
7e3a68c9e7
Merge branch 'sanei-usb-fix-build-without-usb' into 'master'
...
sanei_usb: Fix build when USB support is disabled
Closes #123
See merge request sane-project/backends!150
2019-09-09 21:54:13 +00:00
Povilas Kanapickas
f2ce27f441
sanei_usb: Fix build when USB support is disabled
2019-09-10 00:39:08 +03:00
Stanislav Yuzvinsky
489a80088a
Merge branch 'ricoh2' into 'master'
...
ricoh2: Add support for Aficio SG3110SFNw
See merge request sane-project/backends!149
2019-09-07 18:20:19 +00:00
Vladislav Bogdanov
8f1615f333
ricoh2: Add support for Aficio SG3110SFNw
2019-09-04 13:13:36 +03:00
Povilas Kanapickas
6b7052c4cf
Merge branch 'genesys-misc-cleanup' into 'master'
...
genesys: Miscellaneous cleanup
See merge request sane-project/backends!148
2019-08-31 18:19:57 +00:00
Povilas Kanapickas
fc85e7d15d
Merge branch 'genesys-session-optical-pixels' into 'master'
...
genesys: Use common code path to compute session optical_pixels
See merge request sane-project/backends!147
2019-08-31 18:02:54 +00:00
Povilas Kanapickas
3db2278bea
Merge branch 'genesys-misc-simplify' into 'master'
...
genesys: Miscellaneous simplifications
See merge request sane-project/backends!146
2019-08-31 17:44:21 +00:00
Povilas Kanapickas
66c804a7ea
Merge branch 'genesys-ensure-correct-resolution-high-level' into 'master'
...
genesys: Ensure that correct resolution is passed from high level
See merge request sane-project/backends!145
2019-08-31 17:18:37 +00:00
Povilas Kanapickas
6fcfab3fda
Merge branch 'genesys-session-optical-resolution' into 'master'
...
genesys: Use common code path to compute session optical_resolution
See merge request sane-project/backends!144
2019-08-31 17:02:03 +00:00
Povilas Kanapickas
dc7c1f81f3
Merge branch 'genesys-session-ccd-size-divisor' into 'master'
...
genesys: Use ScanSession to compute ccd_size_divisor on all chips
See merge request sane-project/backends!143
2019-08-31 16:45:04 +00:00