From 6a453bd191c5df22a79a00c75e60fc55763818a0 Mon Sep 17 00:00:00 2001 From: "m. allan noah" Date: Sat, 15 Jul 2006 15:15:52 +0000 Subject: [PATCH] update to backend v1.0.38 --- ChangeLog | 7 +++++++ backend/fujitsu.c | 34 +++++++++++++++++++++++----------- doc/descriptions/fujitsu.desc | 2 +- doc/sane-fujitsu.man | 19 +++++++++++-------- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 966082333..c4fa621db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-15 m. allan noah + + * backend/fujitsu.c: backend v1.0.38, add 'useless noise' + debug level (35), for mode sense errors + * doc/sane-fujitsu.man: minor text changes, add new debug level + * doc/descriptions/fujitsu.desc: version number update + 2006-07-14 m. allan noah * backend/fujitsu.[ch] backend/fujitsu-scsi.h: backend v1.0.37, diff --git a/backend/fujitsu.c b/backend/fujitsu.c index 9031bd769..5d7e5406e 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -214,6 +214,9 @@ - send command support - brightness/contrast support via LUT - merge global mode page buffers + V 1.0.38 2006-07-15, MAN + - add 'useless noise' debug level (35) + - move mode sense probe errors to DBG 35 SANE FLOW DIAGRAM @@ -274,7 +277,7 @@ #include "fujitsu.h" #define DEBUG 1 -#define BUILD 37 +#define BUILD 38 /* values for SANE_DEBUG_FUJITSU env var: - errors 5 @@ -283,6 +286,7 @@ - get/setopt cmds 20 - scsi/usb trace 25 - scsi/usb detail 30 + - useless noise 35 */ /* ------------------------------------------------------------------------- */ @@ -1103,6 +1107,7 @@ init_ms(struct fujitsu *s) { int ret; unsigned char buff[64]; + int oldDbg=DBG_LEVEL; DBG (10, "init_ms: start\n"); @@ -1111,6 +1116,10 @@ init_ms(struct fujitsu *s) return SANE_STATUS_GOOD; } + if(DBG_LEVEL < 35){ + DBG_LEVEL = 0; + } + set_MSEN_xfer_length (mode_senseB.cmd, 64); /* prepick */ @@ -1125,7 +1134,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_prepick=1; } - DBG (15, " prepick: %d\n", s->has_MS_prepick); /* sleep */ set_MSEN_pc(mode_senseB.cmd, MS_pc_sleep); @@ -1139,7 +1147,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_sleep=1; } - DBG (15, " sleep: %d\n", s->has_MS_sleep); /* duplex */ set_MSEN_pc(mode_senseB.cmd, MS_pc_duplex); @@ -1153,7 +1160,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_duplex=1; } - DBG (15, " duplex: %d\n", s->has_MS_duplex); /* rand */ set_MSEN_pc(mode_senseB.cmd, MS_pc_rand); @@ -1167,7 +1173,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_rand=1; } - DBG (15, " rand: %d\n", s->has_MS_rand); /* bg */ set_MSEN_pc(mode_senseB.cmd, MS_pc_bg); @@ -1181,7 +1186,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_bg=1; } - DBG (15, " bg: %d\n", s->has_MS_bg); /* df */ set_MSEN_pc(mode_senseB.cmd, MS_pc_df); @@ -1195,7 +1199,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_df=1; } - DBG (15, " df: %d\n", s->has_MS_df); /* dropout */ set_MSEN_pc(mode_senseB.cmd, MS_pc_dropout); @@ -1209,7 +1212,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_dropout=1; } - DBG (15, " dropout: %d\n", s->has_MS_dropout); /* buff */ set_MSEN_pc(mode_senseB.cmd, MS_pc_buff); @@ -1223,7 +1225,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_buff=1; } - DBG (15, " buff: %d\n", s->has_MS_buff); /* auto */ set_MSEN_pc(mode_senseB.cmd, MS_pc_auto); @@ -1237,7 +1238,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_auto=1; } - DBG (15, " auto: %d\n", s->has_MS_auto); /* lamp */ set_MSEN_pc(mode_senseB.cmd, MS_pc_lamp); @@ -1251,7 +1251,6 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_lamp=1; } - DBG (15, " lamp: %d\n", s->has_MS_lamp); /* jobsep */ set_MSEN_pc(mode_senseB.cmd, MS_pc_jobsep); @@ -1265,6 +1264,19 @@ init_ms(struct fujitsu *s) if(ret == SANE_STATUS_GOOD){ s->has_MS_jobsep=1; } + + DBG_LEVEL = oldDbg; + + DBG (15, " prepick: %d\n", s->has_MS_prepick); + DBG (15, " sleep: %d\n", s->has_MS_sleep); + DBG (15, " duplex: %d\n", s->has_MS_duplex); + DBG (15, " rand: %d\n", s->has_MS_rand); + DBG (15, " bg: %d\n", s->has_MS_bg); + DBG (15, " df: %d\n", s->has_MS_df); + DBG (15, " dropout: %d\n", s->has_MS_dropout); + DBG (15, " buff: %d\n", s->has_MS_buff); + DBG (15, " auto: %d\n", s->has_MS_auto); + DBG (15, " lamp: %d\n", s->has_MS_lamp); DBG (15, " jobsep: %d\n", s->has_MS_jobsep); DBG (10, "init_ms: finish\n"); diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc index 2d466da74..6bd98456e 100644 --- a/doc/descriptions/fujitsu.desc +++ b/doc/descriptions/fujitsu.desc @@ -11,7 +11,7 @@ :backend "fujitsu" ; name of backend :url "http://www2.pfeiffer.edu/~anoah/fujitsu/" -:version "1.0.37" ; version of backend +:version "1.0.38" ; version of backend :manpage "sane-fujitsu" ; name of manpage (if it exists) :comment "Backend re-written for SANE release 1.0.18, see sane-fujitsu manpage" :devicetype :scanner ; start of a list of devices.... diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man index 43bc1d1af..0b0964424 100644 --- a/doc/sane-fujitsu.man +++ b/doc/sane-fujitsu.man @@ -123,29 +123,30 @@ may include "Lineart", "Halftone", "Gray", and "Color". .PP resolution, y-resolution .RS -Controls scan resolution. Setting --resolution also sets --y-resolution -but not vice versa. This behavior is overridden by some frontends. +Controls scan resolution. Setting --resolution also sets --y-resolution, +though this behavior is overridden by some frontends. .RE .PP tlx, tly, brx, bry .RS -Sets scan area upper left and lower right coordinates. Often converted -to t, l, x, y by frontend code. +Sets scan area upper left and lower right coordinates. These are renamed +t, l, x, y by some frontends. .RE .PP pagewidth, pageheight .RS Sets paper size. Used by scanner to determine centering of scan -coordinates when using ADF. +coordinates when using ADF and to detect double feed errors. .RE .PP Other options will be available based on the capabilities of the scanner. Use 'scanimage --help' to get a list. Be aware that some options may -appear only when another option has been set. +appear only when another option has been set, and that advanced options +may be hidden by the frontend. .PP .SH CONFIGURATION FILE -The configuration file "fujitsu.conf" is used to tell the backend how to look for -scanners, and provide options controlling the operation of the backend. +The configuration file "fujitsu.conf" is used to tell the backend how to look +for scanners, and provide options controlling the operation of the backend. This file is read each time the frontend asks the backend for a list of scanners, generally only when the frontend starts. If the configuration file is missing, the backend will use a set of compiled defaults, which @@ -209,6 +210,8 @@ enables debugging output to stderr. Valid values are: 25 SCSI/USB trace .br 30 SCSI/USB detail +.br +35 Useless noise .RE .SH OLDER VERSIONS