Wykres commitów

83 Commity (041ea5f53c3330b84a9462b42032783ed770b51d)

Autor SHA1 Wiadomość Data
m. allan noah f91492b7c1 reduce default buffer size to 2 megs 2009-06-29 21:56:09 -04:00
m. allan noah 852df2e844 add small sleep before clearing usb halt condition 2009-06-17 16:55:52 -04:00
m. allan noah caaa891c35 canon_dr v30: improved support for DR-2050/2080 and minor bug fixes
- add fine cal support for machines with internal buffer (2050/2080)
- support fixed-width machines that require even bytes per scanline
- pad end of scan with gray if scanner stops prematurely
- better handling of errors during calibration
- cleanup canceling debug messages
- remove old cancel() prototype
2009-06-17 15:45:48 -04:00
m. allan noah abe0dbacd6 canon_dr v29: improved calibration, cancelling and error handling
- split coarse and fine cal to run independently
- add side option
- reset scan params to user request if calibration fails
- better handling of sane_cancel
- better handling of errors during sane_start and sane_read
2009-06-08 23:06:00 -04:00
m. allan noah 9940f5c1f2 minor corrections
canon_dr: use correct title and description for resolution option
fujitsu: bump build number for previous commit
cardscan: correct usb pid
2009-05-25 22:37:15 -04:00
m. allan noah 327250b7dc canon_dr v28, improve DR-2xxx support by emulating missing hw features
- use average instead of min/max for fine offset and gain
- rewrite supported resolution list as x and y arrays
- merge x and y resolution options into single option
- move scan params into two new structs, s->u and s->s
- sane_get_parameters() just returns values from s->u
- dont call wait_scanner() in object_position()
- dont call ssm_*() from option handler
- refactor sane_start()
- read_from_buffer() can workaround missing res, modes and cropping
- set most DR-2xxx machines to use the read_from_buffer workarounds
- set default threshold to 90
- add option for button #3 of some machines
- don't eject paper during init
- add DR-2010 quirks
- switch counter to HARD_SELECT, not SOFT
2009-05-22 10:24:58 -04:00
chris@cnpbagwell.com 07c5723cab Merge branch 'master' of ssh://cbagwell-guest@git.debian.org/git/sane/sane-backends 2009-05-09 21:40:55 -05:00
m. allan noah 024cd35c9c canon_dr backend v27, bugfixes and new calibration code
- bug fix in read_panel()
- initialize vars in do_usb_cmd()
- set buffermode off by default
- clear page counter during init and sane_start()
- eject previous page during init and sane_start()
- improved SSM_BUFF macros
- moved set_window() to after ssm-*()
- add coarse calibration (AFE offset/gain & per-channel exposure)
- add fine calibration (per-cell offset/gain)
- free image and fine cal buffers in sane_close()
- compare page counter of small scanners only in non-buffered mode
- add back-side gray mirroring code for DR-2580C
2009-05-08 16:05:54 -04:00
chris@cnpbagwell.com 4d9e8138af standardize including local sane/ include files.
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).
2009-05-07 22:06:20 -05:00
m. allan noah aafe1ac093 * backend/fujitsu.c, backend/fujitsu.conf.in,
doc/descriptions/fujitsu.desc: add S1500 usb ids and status
* backend/canon_dr.c: update credits
* doc/sane-fujitsu.man doc/sane-canon_dr.man: update version numbers,
  dates, credits and known issues
* doc/saned.man: remove section about uncontrolled data port range
2009-04-21 01:18:04 +00:00
m. allan noah 3654ff9d43 * backend/fujitsu.c, doc/descriptions/fujitsu.desc: backend v93
- return cmd status for reads of sensor options
* backend/canon_dr.c, doc/descriptions/canon_dr.desc: backend v26
- return cmd status for reads of sensor options
- allow rs to adjust read length for all bad status responses
2009-04-15 13:13:35 +00:00
m. allan noah 0342a63033 Updates to prepare for 1.0.20 release:
* configure.in: change version to 1.0.20cvs
* configure: rebuild from configure.in
* include/sane/sane.h: hide API changes (minor, frame and status)
* backend/canon_dr.c, backend/fujitsu.c: SANE_FRAME_JPEG
* backend/coolscan3.c: SANE_FRAME_RGBI
* backend/genesys_gl646.c, backend/genesys_gl841.c: STATUS_HW_LOCKED
* backend/rts8891.c, frontend/scanimage.c: STATUS_WARMING_UP
* backend/pixma_io_sanei.c, backend/xerox_mfp.c,
  backend/sane_strstatus.c: STATUS_HW_LOCKED & STATUS_WARMING_UP
* doc/releases.txt: minor updates for new build system
2009-04-12 19:40:31 +00:00
m. allan noah d1f48b2ce4 * backend/canon_dr.[ch], backend/canon_dr.conf.in: backend v24
- fix DR-2510C duplex deinterlacing code
- rewrite sane_read helpers to read until EOF
- update sane_start for scanners that dont use object_position
- dont call sanei_usb_clear_halt() if device is not open
- increase default buffer size to 4 megs
- set buffermode on by default
- hide modes and resolutions that DR-2510C lies about
- read_panel() logs front-end access to sensors instead of timing
- rewrite do_usb_cmd() to use remainder from RS info
* doc/desciptions/canon_dr.desc: backend v24, update DR-2510C comment
2009-04-05 04:46:38 +00:00
m. allan noah a4561362b0 * backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v23
- rewrite all image data processing code
- handle more image interlacing formats
- re-enable binary mode on some scanners
- limit some machines to full-width scanning
* doc/desciptions/canon_dr.desc: v23, improved comments
2009-03-28 01:04:02 +00:00
m. allan noah 009c5cd33d * backend/canon_dr.[ch]: backend v22
- add deinterlacing code for DR-2510C in duplex and color
2009-03-26 03:05:18 +00:00
m. allan noah 93b880cbd1 * backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v21
- correct rgb padding macro
- skip send_panel and ssm_df commands for DR-20xx scanners
* doc/desciptions/microtek2.desc: add ScanMaker 6400XL
2009-03-24 13:38:32 +00:00
m. allan noah a50ac53580 * backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v20
- improved macros for inquiry and set window
- shorten inquiry vpd length to match windows driver
- remove status-length config option
- add padded-read config option
- rewrite do_usb_cmd to pad reads and calloc/copy buffers
* backend/canon_dr.conf.in: s/status-length/padded-read/g
2009-03-23 16:49:19 +00:00
m. allan noah dc278c2e9f * backend/canon_dr.[ch]: backend v19
- pad gray deinterlacing area for DR-2510C
- override tl_x and br_x for fixed width scanners
* doc/descriptions/canon_dr.desc: backend v19, update comments
2009-03-23 01:04:31 +00:00
m. allan noah cd0b09ddf4 * backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v15 thru v18
- add byte-oriented duplex interlace code
- add RRGGBB color interlace code
- add basic support for DR-2580C, DR-2050C, DR-2080C, DR-2510C
- add more unknown setwindow bits
- add support for 16 byte status packets
- clean do_usb_cmd error handling (call reset more often)
- set status packet size from config file
- rewrite config file parsing to reset options after each scanner
- add config options for vendor, model, version
- dont call inquiry if those 3 options are set
- remove default config file from code
- add initial gray deinterlacing code for DR-2510C
- rename do_usb_reset to do_usb_clear
* doc/descriptions/canon_dr.desc: backend v18, update model status
* backend/canon_dr.conf.in: added better comments and new options
2009-03-22 02:56:45 +00:00
m. allan noah eee0012786 * backend/canon_dr.c, backend/canon_dr.conf.in: backend version 14
- remove HARD_SELECT from counter (Legitimate, but API violation)
- attach to CR-series scanners as well
2009-03-08 01:07:41 +00:00
m. allan noah 7d65c00a95 * backend/canon_dr.c, backend/canon_dr.conf.in,
doc/descriptions/canon_dr.desc: backend version 13
- new vendor ID for recent machines
- add usb ids for several new machines
- DR-4010C reported good
2009-03-06 21:32:02 +00:00
Mattias Ellert 7e6153827f format fixes. 2009-02-01 21:58:04 +00:00
m. allan noah 690f1670c3 dont export private symbols 2009-01-21 15:12:08 +00:00
m. allan noah b900ffd2a3 * backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v11
- send_panel() can disable too
- add cancel() to send d8 command
- call cancel() only after final read from scanner
- stop button reqests cancel
2009-01-10 23:39:54 +00:00
m. allan noah 41e9763143 * backend/canon_dr.c: backend v10
- add all documented request sense codes to sense_handler()
 - fix color jpeg (remove unneeded BGR to RGB swapping code)
 - add macros for LUT data
* backend/canon_dr.conf.in: add DR-2080C usb ID
* doc/descriptions/canon_dr.desc: backend v10, add DR 3020
2008-12-10 18:47:57 +00:00
m. allan noah 56ed54d96e * backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v9
- add rollerdeskew and stapledetect options
- add rollerdeskew and stapledetect bits to ssm_df()
* doc/descriptions/canon_dr.desc: backend v9
2008-12-09 03:21:47 +00:00
m. allan noah 8e38974a3e * backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v8
- rename read/send_counter to read/send_panel
 - enable control panel during init
 - add options for all buttons
 - call TUR twice in wait_scanner(), even if first succeeds
 - disable rif
 - enable brightness/contrast/threshold options
* doc/descriptions/canon_dr.desc, doc/sane-canon_dr.man: backend v8
2008-12-08 03:47:35 +00:00
m. allan noah 3d197a1a64 * backend/canon_dr.[ch]: backend v7
- jpeg support (size rounding and header overwrite)
- call object_position(load) between pages even if buffering is on
- use request sense info bytes on short scsi reads
- byte swap color BGR to RGB
- round image width down, not up
- round image height down to even # of lines
- always transfer even # of lines per block
- scsi and jpeg don't require reading extra lines to reach EOF
- rename buffer option to buffermode to avoid conflict with scanimage
- send ssm_do and ssm_df during sane_start
- improve sense_handler output
* doc/descriptions/canon_dr.desc: backend v7
2008-11-30 03:40:51 +00:00
m. allan noah 5ee6f8de28 * backend/canon_dr.[ch], backend/canon_dr-cmd.c: backend v6
- fix adf simplex
- rename ssm_duplex to ssm_buffer
- add --buffer option
- reduce inter-page commands when buffering is enabled
- improve sense_handler output
- enable counter option
- drop unused code
* doc/descriptions/canon_dr.desc: backend v6
2008-11-29 05:22:37 +00:00
m. allan noah 91598aa800 * backend/*.[ch]: nearly every backend used V_MAJOR
instead of SANE_CURRENT_MAJOR in sane_init()
* backend/snapscan.c: remove EXPECTED_VERSION check
since new SANE standard is forward compatible
2008-11-26 21:21:31 +00:00
m. allan noah 9e0e272a9b backend/canon_dr.[ch], backend/canon_dr-cmd.c,
doc/descriptions/canon_dr.desc: backend v5
- remove EOF ejection code
- add SSM and GSM commands
- add dropout, doublefeed, and jpeg compression options
- disable adf backside
- fix adf duplex
- read two extra lines (ignore errors) at end of image
- only send scan command at beginning of batch
- fix bug in hexdump with 0 length string
- DR-7580 support
2008-11-26 04:37:40 +00:00
m. allan noah 4c0b0a599f backend version 4, eject paper in last sane_read() 2008-11-11 16:58:00 +00:00
m. allan noah 03c5a9ee44 * backend/canon_dr.[ch], backend/canon_dr-cmd.h, doc/sane-canon_dr.man,
backend/canon_dr.conf.in, doc/descriptions/canon_dr.desc:
- New Canon DR-series backend v3
- support all modes and resolutions of DR-9080C
- advanced options (MF detection, compression) not yet supported
- other larger models believed similar, smaller ones unknown
* doc/descriptions/unsupported.desc: remove Canon DR-series machines
2008-11-10 03:36:11 +00:00