diff --git a/backend/leo.c b/backend/leo.c index bd1a82e86..936bff81e 100644 --- a/backend/leo.c +++ b/backend/leo.c @@ -48,7 +48,7 @@ /*--------------------------------------------------------------------------*/ -#define BUILD 8 /* 2002/05/29 */ +#define BUILD 9 /* 2002/09/19 */ #define BACKEND_NAME leo #define LEO_CONFIG_FILE "leo.conf" @@ -129,7 +129,9 @@ static const halftone_pattern_t *const halftone_pattern_val[] = { /* Define the supported scanners and their characteristics. */ static const struct scanners_supported scanners[] = { {6, "ACROSS ", " ", - "Across", "FS-1130"} + "Across", "FS-1130"}, + {6, "LEO ", "LEOScan-S3 ", + "Leo", "S3"} }; /*--------------------------------------------------------------------------*/ @@ -571,7 +573,7 @@ leo_get_scan_size (Leo_Scanner * dev) { DBG (DBG_error, "leo_get_scan_size: GET DATA BUFFER STATUS returned an invalid size (%ld)\n", - (long)size); + (long) size); return SANE_STATUS_IO_ERROR; } @@ -629,7 +631,7 @@ get_filled_data_length (Leo_Scanner * dev, size_t * to_read) { DBG (DBG_error, "get_filled_data_length: GET DATA BUFFER STATUS returned an invalid size (%ld)\n", - (long)size); + (long) size); return SANE_STATUS_IO_ERROR; } @@ -1083,7 +1085,7 @@ leo_fill_image (Leo_Scanner * dev) dev->real_bytes_left -= size; DBG (DBG_info, "leo_fill_image: real bytes left = %ld\n", - (long)dev->real_bytes_left); + (long) dev->real_bytes_left); } return (SANE_STATUS_GOOD); /* unreachable */ @@ -1904,7 +1906,8 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len, } while ((buf_offset != max_len) && dev->bytes_left); - DBG (DBG_info, "sane_read: leave, bytes_left=%ld\n", (long)dev->bytes_left); + DBG (DBG_info, "sane_read: leave, bytes_left=%ld\n", + (long) dev->bytes_left); return SANE_STATUS_GOOD; } diff --git a/backend/leo.conf b/backend/leo.conf index 4d31f5301..ecd918c5e 100644 --- a/backend/leo.conf +++ b/backend/leo.conf @@ -1,3 +1,8 @@ # The FS-1130 respond to all luns scsi ACROSS * Scanner * * * 0 + +# LEO S3 +scsi "LEO" "LEOScan-S3" + /dev/scanner + diff --git a/doc/descriptions/leo.desc b/doc/descriptions/leo.desc index 423745cda..69c7747fb 100644 --- a/doc/descriptions/leo.desc +++ b/doc/descriptions/leo.desc @@ -10,7 +10,7 @@ ; :backend "leo" ; name of backend -:version "1.0-3" ; version of backend +:version "1.0-9" ; version of backend :status :beta ; :alpha, :beta, :stable, :new :manpage "sane-leo" ; name of manpage (if it exists) :url "http://fz.eryx.net/sane/#leo" ; backend's web page @@ -18,9 +18,10 @@ :devicetype :scanner ; start of a list of devices.... :mfg "LEO" -:model "FS-1130" +:model "LEOScan S3" :interface "SCSI" -:status :untested +:comment "FCC ID LUZFS1130" +:status :beta :mfg "Across Technologies" :model "FS-1130" diff --git a/doc/sane-leo.man b/doc/sane-leo.man index a5a9c888c..2ebdc17a7 100644 --- a/doc/sane-leo.man +++ b/doc/sane-leo.man @@ -19,6 +19,7 @@ The scanners that should work with this backend are: ---------------------- ----------- .br Across FS-1130 tested + Leo S3 tested .RE