diff --git a/ChangeLog b/ChangeLog index a5a32e063..ace2b345e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-02-11 Frank Zago + * backend/matsushita.c backend/matsushita.conf + doc/sane-matsushita.man doc/descriptions/matsushita.desc: added + partial support for models KV-SS55EX, KV-S2025C, KV-S2045C and + KV-S2065L. + 2004-02-08 Karl Heinz Kremer * backend/epson*.[ch]: Reformat source code to get rid of different coding styles used over the years (and by different authors). diff --git a/backend/matsushita.c b/backend/matsushita.c index 192a60685..836fc453d 100644 --- a/backend/matsushita.c +++ b/backend/matsushita.c @@ -1,6 +1,6 @@ /* sane - Scanner Access Now Easy. - Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com) + Copyright (C) 2002, 2004 Frank Zago (fzago at austin dot rr dot com) Copyright (C) 2002 Other SANE contributors This file is part of the SANE package. @@ -45,14 +45,14 @@ /* $Id$ Matsushita/Panasonic KV-SS25, KV-SS50, KV-SS55, KV-SS50EX, - KV-SS55EX, KV-SS850, KV-SS855 SCSI scanner. + KV-SS55EX, KV-SS850, KV-SS855 SCSI scanners. This backend may support more Panasonic scanners. */ /*--------------------------------------------------------------------------*/ -#define BUILD 6 /* 2002-03-13 */ +#define BUILD 7 /* 2004-02-11 */ #define BACKEND_NAME matsushita #define MATSUSHITA_CONFIG_FILE "matsushita.conf" @@ -380,17 +380,17 @@ static const struct scanners_supported scanners[] = { /* Panasonic KV-SS55EX */ { - 0x06, "K.M.E. ", "KV-SS55EX ", /* TO FIX */ + 0x06, "K.M.E. ", "KV-SS55EX ", {SANE_FIX (0), SANE_FIX (8.5 * MM_PER_INCH), 0}, /* x range 0 to 215.9 mm */ - {SANE_FIX (0), SANE_FIX (17 * MM_PER_INCH), 0}, /* y range 0 to 355.6 mm */ + {SANE_FIX (0), SANE_FIX (17 * MM_PER_INCH), 0}, /* y range 0 to 431.8 mm */ {1, 255, 1}, /* brightness range */ - {1, 255, 1}, /* contrast range, TO FIX */ + {1, 255, 1}, /* contrast range */ scan_mode_list_3, - resolutions_list_300, resolutions_rounds_300, /* TO FIX */ + resolutions_list_300, resolutions_rounds_300, image_emphasis_list_5, image_emphasis_val_5, - MAT_CAP_DUPLEX | MAT_CAP_CONTRAST | MAT_CAP_AUTOMATIC_THRESHOLD | - MAT_CAP_WHITE_LEVEL | MAT_CAP_GAMMA | MAT_CAP_NOISE_REDUCTION | - MAT_CAP_PAPER_DETECT | MAT_CAP_MIRROR_IMAGE}, + MAT_CAP_DUPLEX | MAT_CAP_CONTRAST | + MAT_CAP_AUTOMATIC_THRESHOLD | MAT_CAP_WHITE_LEVEL | MAT_CAP_GAMMA | + MAT_CAP_NOISE_REDUCTION}, /* Panasonic KV-SS850 */ { @@ -418,7 +418,49 @@ static const struct scanners_supported scanners[] = { image_emphasis_list_5, image_emphasis_val_5, MAT_CAP_DUPLEX | MAT_CAP_CONTRAST | MAT_CAP_AUTOMATIC_THRESHOLD | MAT_CAP_WHITE_LEVEL | MAT_CAP_GAMMA | MAT_CAP_NOISE_REDUCTION | - MAT_CAP_PAPER_DETECT | MAT_CAP_DETECT_DOUBLE_FEED | MAT_CAP_MANUAL_FEED} + MAT_CAP_PAPER_DETECT | MAT_CAP_DETECT_DOUBLE_FEED | MAT_CAP_MANUAL_FEED}, + + /* Panasonic KV-S2065L */ + { + 0x06, "K.M.E. ", "KV-S2065L ", + {SANE_FIX (0), SANE_FIX (8.5 * MM_PER_INCH), 0}, /* x range 0 to 215.9 mm */ + {SANE_FIX (0), SANE_FIX (17 * MM_PER_INCH), 0}, /* y range 0 to 431.8 mm */ + {1, 255, 1}, /* brightness range */ + {1, 255, 1}, /* contrast range */ + scan_mode_list_3, + resolutions_list_300, resolutions_rounds_300, + image_emphasis_list_5, image_emphasis_val_5, + MAT_CAP_DUPLEX | MAT_CAP_CONTRAST | + MAT_CAP_AUTOMATIC_THRESHOLD | MAT_CAP_WHITE_LEVEL | MAT_CAP_GAMMA | + MAT_CAP_NOISE_REDUCTION}, + + /* Panasonic KV-S2025C */ + { + 0x06, "K.M.E. ", "KV-S2025C ", + {SANE_FIX (0), SANE_FIX (8.5 * MM_PER_INCH), 0}, /* x range 0 to 215.9 mm */ + {SANE_FIX (0), SANE_FIX (17 * MM_PER_INCH), 0}, /* y range 0 to 431.8 mm */ + {1, 255, 1}, /* brightness range */ + {1, 255, 1}, /* contrast range */ + scan_mode_list_3, + resolutions_list_300, resolutions_rounds_300, + image_emphasis_list_5, image_emphasis_val_5, + MAT_CAP_DUPLEX | MAT_CAP_CONTRAST | + MAT_CAP_AUTOMATIC_THRESHOLD | MAT_CAP_WHITE_LEVEL | MAT_CAP_GAMMA | + MAT_CAP_NOISE_REDUCTION}, + + /* Panasonic KV-S2045C */ + { + 0x06, "K.M.E. ", "KV-S2045C ", + {SANE_FIX (0), SANE_FIX (8.5 * MM_PER_INCH), 0}, /* x range 0 to 215.9 mm */ + {SANE_FIX (0), SANE_FIX (17 * MM_PER_INCH), 0}, /* y range 0 to 431.8 mm */ + {1, 255, 1}, /* brightness range */ + {1, 255, 1}, /* contrast range */ + scan_mode_list_3, + resolutions_list_300, resolutions_rounds_300, + image_emphasis_list_5, image_emphasis_val_5, + MAT_CAP_DUPLEX | MAT_CAP_CONTRAST | + MAT_CAP_AUTOMATIC_THRESHOLD | MAT_CAP_WHITE_LEVEL | MAT_CAP_GAMMA | + MAT_CAP_NOISE_REDUCTION} }; diff --git a/backend/matsushita.conf b/backend/matsushita.conf index b334d46a0..4d3cf244f 100644 --- a/backend/matsushita.conf +++ b/backend/matsushita.conf @@ -2,6 +2,10 @@ # Panasonic / Matsushita scanners scsi "K.M.E. " "KV-SS25A " +scsi "K.M.E. " "KV-SS55EX " +scsi "K.M.E. " "KV-S2025C " +scsi "K.M.E. " "KV-S2045C " +scsi "K.M.E. " "KV-S2065L " # These scanners are untested. # If you have one: @@ -13,7 +17,6 @@ scsi "K.M.E. " "KV-SS25A " #scsi "K.M.E. " "KV-SS50 " #scsi "K.M.E. " "KV-SS55 " #scsi "K.M.E. " "KV-SS50EX " -#scsi "K.M.E. " "KV-SS55EX " #scsi "K.M.E. " "KV-SS850 " #scsi "K.M.E. " "KV-SS855 " diff --git a/doc/descriptions/matsushita.desc b/doc/descriptions/matsushita.desc index cf70d3619..dcb2aa233 100644 --- a/doc/descriptions/matsushita.desc +++ b/doc/descriptions/matsushita.desc @@ -10,7 +10,7 @@ ; :backend "matsushita" ; name of backend -:version "1.0-6" ; version of backend +:version "1.0-7" ; version of backend :manpage "sane-matsushita" ; name of manpage :url "http://www.zago.net/sane" ; backend's web page @@ -41,7 +41,7 @@ :model "KV-SS55EX" :interface "SCSI" -:status :untested +:status :good :model "KV-SS850" :interface "SCSI" @@ -51,6 +51,18 @@ :interface "SCSI" :status :untested +:model "KV-S2025C" +:interface "SCSI" +:status :minimal + +:model "KV-S2045C" +:interface "SCSI" +:status :minimal + +:model "KV-S2065L" +:interface "SCSI" +:status :good + ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. diff --git a/doc/sane-matsushita.man b/doc/sane-matsushita.man index 02a035ca5..481cdbb11 100644 --- a/doc/sane-matsushita.man +++ b/doc/sane-matsushita.man @@ -1,4 +1,4 @@ -.TH sane-matsushita 5 "April 21s, 2002" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane-matsushita 5 "February 11th, 2004" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane-matsushita .SH NAME sane-matsushita \- SANE backend for Panasonic KV-SS high speed scanners @@ -17,10 +17,16 @@ backend: .br -------------- .br - KV-SS 25 - KV-SS 25D + KV-SS25 + KV-SS25D + KV-SS55EX (*) + KV-S2025C (*) + KV-S2045C (*) + KV-S2065L (*) .RE .PP +(*) WARNING: None of the advanced options of these scanners are available (ie no color, no high resolution, no automatic cropping). Basically, the driver does no more than what it does for the KV-SS25. I don't have access to such scanners, and thus cannot add these options. + Other Panasonic high speed scanners may or may not work with that backend. Valid command line options and their syntax can be listed by using @@ -57,7 +63,7 @@ options accordingly. It does not need to be the real size of the paper. .B -l -t -x -y control the scan area: -l sets the top left x coordinate, -t the top left y coordinate, -x selects the width and -y the height of the scan -aea. All parameters are specified in milimeters. It is possible to use +area. All parameters are specified in millimeters. It is possible to use the option .I --paper-size instead. @@ -95,7 +101,7 @@ options set the gamma curve. It is only valid for Gray modes, and is not availab .SH CONFIGURATION FILE -The configuration file @CONFIGDIR@/matsushita.conf supports the device name to use (eg /dev/scanner) and the scsi option to autodetect the scanners supported. +The configuration file @CONFIGDIR@/matsushita.conf supports the device name to use (eg /dev/scanner) and the SCSI option to auto-detect the scanners supported. .SH FILES @@ -120,7 +126,7 @@ levels reduce verbosity. .SH LIMITATIONS .TP .B Memory in the KV-SS 25 -The KV-SS 25 has not enough internal memory to scan a whole A4 page in duplex mode at high densities. The frontend will return a memory error in that case. Apparently, the KV-SS 25D has not that problem. +The KV-SS 25 has not enough internal memory to scan a whole A4 page in duplex mode at high resolution. The frontend will return a memory error in that case. Apparently, the KV-SS 25D has not that problem. .TP .B Pattern and gamma downloading The scanner, with the proper firmware, can download a halftone pattern @@ -128,7 +134,7 @@ and a gamma table. This is not implemented. .TP .B Sub-areas The scanner can support up to 3 sub-areas on each side to define some -more precise enhancment options. This is not implemented. +more precise enhancement options. This is not implemented. .TP .B Duplex mode The backend does not support the setting of different options for each side. The scan will occur with the same options (halftone pattern, brightness, image emphasis) for both sides.