kopia lustrzana https://gitlab.com/sane-project/backends
updated to v 1.0.40
m. allan noah
rodzic
0da1bfb49a
commit
e47693e107
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2006-08-26 m. allan noah <anoah AT pfeiffer DOT edu>
|
||||
|
||||
* backend/fujitsu.[ch] backend/fujitsu-scsi.h: update to v1.0.40,
|
||||
add 5530C usb id, rewrite brightness/contrast/gamma functions,
|
||||
do_*_cmd functions handle short reads, updated init functions,
|
||||
add MS buffer and prepick support for newer scanners
|
||||
* doc/descriptions/fujitsu.desc backend/fujitsu.conf.in:
|
||||
add 5530C usb id, version number update
|
||||
* doc/descriptions/sane-fujitsu.man:
|
||||
note support for newer scanner models
|
||||
|
||||
2006-08-22 Karl Heinz Kremer <khk@khk.net>
|
||||
|
||||
* backend/epson_usb.c: Add product ID for CX3800/3810, V700/V750
|
||||
|
|
@ -5,7 +16,7 @@
|
|||
2006-06-11 Eddy De Greef <eddy_de_greef at scarlet dot be>
|
||||
|
||||
* doc/sane-mustek_pp.man: URL update.
|
||||
|
||||
|
||||
2006-08-21 Karl Heinz Kremer <khk@khk.net>
|
||||
|
||||
* backend/epson.c: Fix buffer overflow error (submitted by Johannes Meixner)
|
||||
|
|
|
|||
|
|
@ -489,6 +489,15 @@ static scsiblk mode_select_10byteB = {
|
|||
#define MSEL_dropout_BLUE 11
|
||||
#define MSEL_dropout_CUSTOM 12
|
||||
|
||||
#define set_MSEL_buff_mode(sb, val) setbitfield(sb + 0x02, 0x03, 6, val)
|
||||
|
||||
#define set_MSEL_prepick(sb, val) setbitfield(sb + 0x02, 0x03, 6, val)
|
||||
|
||||
/*buffer and prepick use these*/
|
||||
#define MSEL_DEFAULT 0
|
||||
#define MSEL_OFF 2
|
||||
#define MSEL_ON 3
|
||||
|
||||
/* ==================================================================== */
|
||||
|
||||
static unsigned char scanC[] = { SCAN, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -39,6 +39,9 @@ usb 0x04c5 0x10af
|
|||
usb 0x04c5 0x10e0
|
||||
usb 0x04c5 0x10e1
|
||||
|
||||
#fi-5530C
|
||||
usb 0x04c5 0x10e2
|
||||
|
||||
#fi-5900C
|
||||
usb 0x04c5 0x10e7
|
||||
|
||||
|
|
|
|||
|
|
@ -31,8 +31,9 @@ enum fujitsu_Option
|
|||
|
||||
OPT_ENHANCEMENT_GROUP,
|
||||
OPT_BRIGHTNESS,
|
||||
OPT_THRESHOLD,
|
||||
OPT_CONTRAST,
|
||||
OPT_GAMMA,
|
||||
OPT_THRESHOLD,
|
||||
OPT_RIF,
|
||||
|
||||
OPT_ADVANCED_GROUP,
|
||||
|
|
@ -40,6 +41,8 @@ enum fujitsu_Option
|
|||
OPT_DF_DIFF,
|
||||
OPT_BG_COLOR,
|
||||
OPT_DROPOUT_COLOR,
|
||||
OPT_BUFF_MODE,
|
||||
OPT_PREPICK,
|
||||
OPT_SLEEP_TIME,
|
||||
OPT_DUPLEX_OFFSET,
|
||||
OPT_GREEN_OFFSET,
|
||||
|
|
@ -231,7 +234,7 @@ struct fujitsu
|
|||
int even_scan_line; /* need even number of bytes in a scanline (fi-5900) */
|
||||
int window_vid; /* some models want different vendor ID in set window */
|
||||
int ghs_in_rs;
|
||||
int lut_bits;
|
||||
int window_gamma;
|
||||
|
||||
int has_SW_dropout; /* dropout color specified in set window data */
|
||||
|
||||
|
|
@ -264,8 +267,9 @@ struct fujitsu
|
|||
|
||||
/*enhancement group*/
|
||||
SANE_Range brightness_range;
|
||||
SANE_Range threshold_range;
|
||||
SANE_Range contrast_range;
|
||||
SANE_Range gamma_range;
|
||||
SANE_Range threshold_range;
|
||||
|
||||
/*ipc group*/
|
||||
|
||||
|
|
@ -275,6 +279,8 @@ struct fujitsu
|
|||
SANE_String_Const bg_color_list[4];
|
||||
SANE_String_Const do_color_list[5];
|
||||
SANE_String_Const lamp_color_list[5];
|
||||
SANE_String_Const buff_mode_list[4];
|
||||
SANE_String_Const prepick_list[4];
|
||||
SANE_Range sleep_time_range;
|
||||
SANE_Range duplex_offset_range;
|
||||
SANE_Range green_offset_range;
|
||||
|
|
@ -300,18 +306,18 @@ struct fujitsu
|
|||
|
||||
/*enhancement group*/
|
||||
int brightness;
|
||||
int threshold;
|
||||
int contrast;
|
||||
int gamma;
|
||||
int threshold;
|
||||
int rif;
|
||||
|
||||
/*ipc group*/
|
||||
int gamma; /* not currently user settable */
|
||||
|
||||
/*advanced group*/
|
||||
int df_detect;
|
||||
int df_diff;
|
||||
int bg_color;
|
||||
int dropout_color;
|
||||
int buff_mode;
|
||||
int prepick;
|
||||
int lamp_color;
|
||||
int sleep_time;
|
||||
int duplex_offset;
|
||||
|
|
@ -354,7 +360,8 @@ struct fujitsu
|
|||
/* --------------------------------------------------------------------- */
|
||||
/* values which used by the command and data sending functions (scsi/usb)*/
|
||||
int fd; /* The scanner device file descriptor. */
|
||||
unsigned char rs_buffer[RS_return_size];
|
||||
/*unsigned char rs_buffer[RS_return_size];*/
|
||||
size_t datLen;
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
/* values which are used by the get hardware status command */
|
||||
|
|
@ -424,17 +431,12 @@ struct fujitsu
|
|||
#define DUPLEX_INTERLACE_NONE 0
|
||||
#define DUPLEX_INTERLACE_3091 1
|
||||
|
||||
#define DF_DEFAULT 0
|
||||
#define DF_NONE 1
|
||||
#define DF_THICKNESS 2
|
||||
#define DF_LENGTH 3
|
||||
#define DF_BOTH 4
|
||||
|
||||
/* these are same as df scsi data to make code easier */
|
||||
#define DF_DEFAULT 0
|
||||
#define DF_10MM 1
|
||||
#define DF_15MM 2
|
||||
#define DF_20MM 3
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#define MM_PER_INCH 25.4
|
||||
|
|
@ -509,27 +511,28 @@ static SANE_Status init_inquire (struct fujitsu *s);
|
|||
static SANE_Status init_vpd (struct fujitsu *s);
|
||||
static SANE_Status init_ms (struct fujitsu *s);
|
||||
static SANE_Status init_model (struct fujitsu *s);
|
||||
static SANE_Status init_user (struct fujitsu *s);
|
||||
static SANE_Status init_options (struct fujitsu *scanner);
|
||||
|
||||
static SANE_Status
|
||||
do_cmd(struct fujitsu *s, int runRS, int shortTime,
|
||||
unsigned char * cmdBuff, size_t cmdLen,
|
||||
unsigned char * outBuff, size_t outLen,
|
||||
unsigned char * inBuff, size_t inLen
|
||||
unsigned char * inBuff, size_t * inLen
|
||||
);
|
||||
|
||||
static SANE_Status
|
||||
do_scsi_cmd(struct fujitsu *s, int runRS, int shortTime,
|
||||
unsigned char * cmdBuff, size_t cmdLen,
|
||||
unsigned char * outBuff, size_t outLen,
|
||||
unsigned char * inBuff, size_t inLen
|
||||
unsigned char * inBuff, size_t * inLen
|
||||
);
|
||||
|
||||
static SANE_Status
|
||||
do_usb_cmd(struct fujitsu *s, int runRS, int shortTime,
|
||||
unsigned char * cmdBuff, size_t cmdLen,
|
||||
unsigned char * outBuff, size_t outLen,
|
||||
unsigned char * inBuff, size_t inLen
|
||||
unsigned char * inBuff, size_t * inLen
|
||||
);
|
||||
|
||||
static int wait_scanner (struct fujitsu *s);
|
||||
|
|
@ -546,6 +549,10 @@ static SANE_Status mode_select_dropout(struct fujitsu *s);
|
|||
|
||||
static SANE_Status mode_select_bg(struct fujitsu *s);
|
||||
|
||||
static SANE_Status mode_select_buff (struct fujitsu *s);
|
||||
|
||||
static SANE_Status mode_select_prepick (struct fujitsu *s);
|
||||
|
||||
static SANE_Status set_sleep_mode(struct fujitsu *s);
|
||||
|
||||
int get_current_side (struct fujitsu *s);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
:backend "fujitsu" ; name of backend
|
||||
:url "http://www2.pfeiffer.edu/~anoah/fujitsu/"
|
||||
:version "1.0.39" ; version of backend
|
||||
:version "1.0.40" ; 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....
|
||||
|
|
@ -229,6 +229,7 @@
|
|||
:model "fi-5530C"
|
||||
:interface "SCSI USB"
|
||||
:status :basic
|
||||
:usbid "0x04c5" "0x10e2"
|
||||
:comment "departmental, current"
|
||||
|
||||
;==================================================
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ SCSI: SCSI/USB: USB:
|
|||
------------ ------------ ------------
|
||||
M3091DC fi-4120C fi-5110C
|
||||
M3092DC fi-4220C fi-5110EOX
|
||||
SP-93GX fi-4120C2
|
||||
fi-4220C2
|
||||
SP-93GX fi-4120C2 fi-5110EOX2
|
||||
fi-4220C2 S500
|
||||
fi-5120C
|
||||
fi-5220C
|
||||
.fi
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue