summaryrefslogtreecommitdiff
path: root/backend/canon_dr.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-01 15:24:35 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-01 15:24:35 +0100
commit302276dc1b90cfc972fb726ca94a23b18f4b0088 (patch)
tree33d99da40fb5fa097fdab5584d7ed550d25a33bb /backend/canon_dr.h
parent351b7328520c16730ceb46e5acae16038c42185e (diff)
New upstream version 1.1.1upstream/1.1.1
Diffstat (limited to 'backend/canon_dr.h')
-rw-r--r--backend/canon_dr.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/backend/canon_dr.h b/backend/canon_dr.h
index a945d00..7afbb90 100644
--- a/backend/canon_dr.h
+++ b/backend/canon_dr.h
@@ -116,12 +116,18 @@ struct scanner
/* --------------------------------------------------------------------- */
/* immutable values which are set during reading of config file. */
+ int connection; /* hardware interface type */
int buffer_size;
- int connection; /* hardware interface type */
+ int duplex_offset; /* number of lines of padding added to front (1/1200)*/
+ int extra_status; /* some machines need extra status read after cmd */
+ int inquiry_length; /* some models are particular about inquiry size */
+ int padded_read; /* some machines need extra 12 bytes on reads */
+ int tur_timeout; /* some models are slow to wake up */
+ int vpd_length; /* some models are particular about vpd size */
/* --------------------------------------------------------------------- */
/* immutable values which are set during inquiry probing of the scanner. */
- /* members in order found in scsi data... */
+ /* members in order found in scsi data. These can also be in config file */
char vendor_name[9]; /* raw data as returned by SCSI inquiry. */
char model_name[17]; /* raw data as returned by SCSI inquiry. */
char version_name[5]; /* raw data as returned by SCSI inquiry. */
@@ -207,8 +213,6 @@ struct scanner
int always_op; /* send object pos between pages */
int invert_tly; /* weird bug in some smaller scanners */
int unknown_byte2; /* weird byte, required, meaning unknown */
- int padded_read; /* some machines need extra 12 bytes on reads */
- int extra_status; /* some machines need extra status read after cmd */
int fixed_width; /* some machines always scan full width */
int even_Bpl; /* some machines require even bytes per line */
@@ -217,7 +221,6 @@ struct scanner
int color_inter_by_res[16]; /* and some even change by resolution */
int duplex_interlace; /* different models interlace sides differently */
int jpeg_interlace; /* different models interlace jpeg sides differently */
- int duplex_offset; /* number of lines of padding added to front (1/1200)*/
int duplex_offset_side; /* padding added to front or back? */
int sw_lut; /* no hardware brightness/contrast support */