Adding sane_reload_devices() to sane_init() required sane_init() to be moved
below the sane_reload_devices() declaration. This restores the original
functionality present before I split the sane_reload_devices() code out of
sane_init() so that it could be called from sane_get_devices().
In a previous patch, I attempted to avoid the possibility of a page remaining
partially inside the ADF unit of a flipping duplex scanner after a scan.
Unfortunately, I introduced a bug where the backside page was accidentally
returned to the client in addition to being cached. This was because I had
a misunderstanding of the post-processing code. This patch skips the post-
processing section altogether, avoiding any unnecessary post-processing and
subsequent unwanted output. The other alternative here was to try to monkey
with the buffers (as is done for LINE deinterlacing), but I felt this would
be harder to implement and even harder to debug in the future.
This fix correctly initializes the AV220-G by querying the firmware.
Added the correct option to support the interlaced duplex format used by
this unit.
Flipping duplex scanners must flip the page in order to scan the back side
of the page. With this option set (which is the default), the page is
flipped back to the original orientation. This is important if you have
a stack of papers. However, if you don't care if every page ends up
flipped compared to how it was loaded, turning this option off might save
some scanning time as the paper won't have to be pulled back through the
ADF mechanism a third time.
Although the flipping duplexer is working, there are some issues relating to
the mechanics of physically flipping paper. First among these is that the
back side of each page is physically scanned in reverse, resulting in an
upside down image. Secondly, the page is held partially in the ADF
mechanism while waiting for the frontend to make another scan request for
the back side image, thus resulting in a stuck page if the frontend fails to
follow through.
My solution to these problems is to treat page flipping as an extreme
extension of interlaced scanning; page level interlacing. This means making
another scan request on behalf of the frontend, and writing the resulting
image to a file as would have been done if the page were line interlaced.
We would have had to write this image to a file anyway to flip the image
right-side up, so we aren't doing any extra work, and technique allows us to
reuse existing code for most of the file handling. The reader_process()
function is called again (recursively) after scanning the front page. We
use the page length of the front side to determine the length of the back,
so that we can write the lines to the file starting at the end and working
towards the beginning (thus flipping the image).
A side effect of this solution was the discovery that the scanner must be
reminded that the paper needs to be re-flipped after each scan, so
set_window() must also be called in reader_process() before starting the
second scan.
Finally, with this change, a minor bug was exposed where frontends were
given the number of lines which would be scanned, which makes sense in
flatbed mode, but does not make sense for an ADF, where the page may be
smaller than the scan window. The code was changed to follow the
specifications, returning -1 in ADF mode (when the length cannot be
determined).
After fixing the duplexer initialization, it became clear that the code was
mirroring the back pages. Since the scanner already supports page
mirroring internally with an optional bit setting (which was already set)
it made the most sense to simplify the code base and remove the variable.
For scanners which potentially have flipping duplexers, only enable
duplexing if there is an ADF present. This leads to the next problem, that
the flipping duplexers (present only on the HP 8200 series AFAIK) don't
always seem to be properly configured when powered up. To solve this some
magical values are written to magical memory locations, and some more
magical status is read back, causing an apparent firmware reset which
blocks communication for a short period of time. See adf_reset() for
details.
Added the AV_ADF_FLIPPING_DUPLEX flag to activate the flipping duplex code
only for models known to have such duplexing ADFs. Prior to this a doubious
huristic was used to guess when the hardware had a flipping duplex unit.
The additional_probe variable protected add_source_mode() and
add_color_mode() from being entered upon subsequent calls. These functions
were patched to not insert duplicate records in this case, removing the
need for the gatekeeper variable.
Until now the code has been changing the frontend supplied pointer to point
to our internal data structure. There are two problems with this. It
orphans the data previously associated with that pointer, which causes a
memory leak. It also gives the frontend the ability to munge our internal
data structure.
The only downside to this change is the possibility that a frontend took the
spec too literally and merely supplies a pointer but does not allocate
storage space for the result. Technically, the spec is a bit vague on this
point, because it does not specifically state who should allocate the
structure, but I feel a reasonable programmer would guess that space
allocation is a frontend obligation.
There was an old TODO in the code which suggests creating an option for using
the paper_length field to detect double feeds in the ADF. I've added it as
an option, but set the default to not use it since it might cause older
scanners to get confused.
I felt that the ehancements group was doing double duity for image tuning and
other more hardware related options. This new group takes ownership of those.
I'm not happy with the name, but that can always be changed.
Added support for the Avision AV210D2+ scanner. This is the first scanner
to require the use of the gray filter bits, so code was added to enable them.
Regenerated description file to reflect this change.
Moved device init code from sane_init() to the newly created
sane_reload_devices() function, which is now called from sane_get_devices().
This means that device initialization now happens when sane_get_devices() is
called, not when sane_init() is called.
Replaced the clever, yet totally confusing, code using the "adf_mode"
variable. This variable was used with a complex interaction of bit shifts
and subtraction indirectly influnced by the value of s->source_mode. The
replacement code direct references s->source_mode instead, simplifying
things greatly. This change is functionally identical.
As a side note, the adf_mode code allowed "ADF Rear" scanners, in addition to
"ADF Duplex" scanners, to enter the section of code normally used for (HP)
duplex scanners. It's not clear if this was the intended effect, or if, as
the comments suggest, this was an unnoticed side effect caused by the
confusing code. The point is moot, however, because prior in the code, the
ADF Duplex flag is set anytime the ADF Rear flag is set. As long as all
ADF Rear scanners are duplex scanners this shouldn't be a problem.
Changed the AVISION_FILTER_* defines to their final values rather than
bit-shifting them prior to use. This make reading the code much easier
since no mental calculation is necessary to determine what the final
bit-pattern/value will be.
Wrap scanner entries with duplicate USB ids with ifdefs so they will not be
compiled. This shortens the search for new scanners because we don't try
the same USB id more than once.
the same and already work, but this change will reflect that fact on the
website.
- Generated a new version of doc/descriptions/avision.desc from avision.c.
the AV610, and added a comment for the @V5100 in avision.c.
- Generated a new version of doc/descriptions/avision.desc from avision.c.
This restores information lost with my last update. I've intentionally
seperated these changes so that they can be more easily understood.
Source code was inconsistent on how they were referencing
include files in include/sane. In certain cases, sane/sane.h
and sane/saneopts.h was really including external copies (with
some preprocessor implementations anyways).
Global replace of u_int??_t with C9x standard based uintxx_t
in order to remove some tricky and overlapping portability logic
from acinclude.m4 and leave it in only m4/stdint.m4.
issues, by Mattias Ellert.
* backend/fujitsu.c: backend v89, fi-4750 has no serial number support
* doc/descriptions/fujitsu.desc: backend v89, remove 'MAC/TWAIN' text
* doc/sane-fujitsu.man: backend v89
* backend/.cvsignore: ignore *.loT
with partial matches on USB ID, but vendor / product string
matches as mostly only the HP5300 vs. HP5370, fixed non-color
calibration for devices not filling all RGB fields of calibration
format information, do not send 3x3 color matrix to older devices
(ASIC versions) as some HP53xx does not correctly handle it,
improved calibration accuracy and fixed transparency adapter
detection to not use non-zero as present, but just 1 (some
devices now set 0xff as (-1) - not present ...
Implemented support for latest Avision ASICs and features,
including overscan, background raster, software scaling for
cheaper ASICs used in HP scanners. Changed types used to
more portable uint* ones, without underscore (_), removed
in-file ChangeLog history, as the files became big enough.
Implemented early calibration for easier handling of
Avision-based film scanners and implemented support for
2-pass duplex scanners.
options from the parser, example avision.conf and manual page.
Fixed 12 Bit gray and color modes to actually work as well as
software CCD line-difference correction. Minimal scan resolutions
have been slightly adapted for some ASICs.
from BUILD 167 to 179, including support for HP 5370, AV600U,
AV210C2, AV220C2, et. al. The USB i/o paths got hardened, and a
lot of fixes as well es enhancements and optimizations where added
and a lot of typos, mostly in debug output and comments, got fixed.
The "Line Art" mode was renamed to "Lineart" to match the other
backends.
fixed segmentation faults for some modes, many many new devices, two
different duplex modes are supported, vast speedup of multi page batch scans,
buttons as well a 7-segment LED readout and some quirks for old scanners not
filling all fields
wait_4_light bugfixes, fixed color packing, fixed 16bit modes
(especially for big-endian systems), avoid 16bit modes for default
modes, fixed gamma-table for some models as well as spelling on the
way
* backend/avision.c doc/descriptions/avision.desc doc/sane-avision.man: substituted my mail address and web-site to a new one - due to
leaving the rocklinux project
* backend/avision.h, backend/avision.c: the current development state,
including cleanups, code refactoring, dynamic color and scan source
list creation, implemented ADF mirroring needed for some ASICs ,
some scan window scaliing fixes for some ASICs, added 16bit gray
and color support, fixed a tiny big-endian issue, fixed command
error reporting for some ASICs, improved inquiry logging and some
tiny fixes for film-scanners.
Sorry for such a bit chunk so late in feature freeze (...). But tested on Ultra
SPARC, PowerPC and x86 Linux ... ;-)
endianess fixes, calibration code, ADF detection, correct lamp warmup,
gamma table for new ASICs, some workarounds for ASIC variations and the
convertion to use OPT_SOURCE instead of seperate OPT_ADF and OPT_TRANS.
Mike Kelly