kopia lustrzana https://gitlab.com/sane-project/backends
cleaned #include lines and copyrights. added new models.
m. allan noah
rodzic
3ebe2b6cd0
commit
fcc43f328c
|
|
@ -1,3 +1,8 @@
|
|||
2010-02-09 m. allan noah <kitno455 at gmail dot com>
|
||||
* backend/fujitsu.c, doc/descriptions/fujitsu.desc,
|
||||
backend/epjitsu.c, doc/descriptions/epjitsu.desc:
|
||||
- cleanup #include lines, copyrights and current scanner list.
|
||||
|
||||
2010-02-08 Stéphane Voltz <stef.dev ar free.fr>
|
||||
* backend/genesys.c backend/genesys.h backend/genesys_conv.c
|
||||
backend/genesys_devices.c backend/genesys_gl646.c
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@
|
|||
--------------------------------------------------------------------------
|
||||
|
||||
This file implements a SANE backend for the Fujitsu fi-60F, the
|
||||
ScanSnap S300, and (hopefully) other Epson-based Fujitsu scanners.
|
||||
ScanSnap S300/S1300, and (hopefully) other Epson-based scanners.
|
||||
|
||||
Copyright 2007-2009 by m. allan noah <kitno455 at gmail dot com>
|
||||
Copyright 2007-2010 by m. allan noah <kitno455 at gmail dot com>
|
||||
Copyright 2009 by Richard Goedeken <richard at fascinationsoftware dot com>
|
||||
|
||||
Development funded by Microdea, Inc., TrueCheck, Inc. and Archivista, GmbH
|
||||
|
|
@ -123,6 +123,9 @@
|
|||
- dont export private symbols
|
||||
v19 2009-08-31, RG
|
||||
- rewritten calibration routines
|
||||
v20 2010-02-09, MAN
|
||||
- cleanup #include lines & copyright
|
||||
- add S1300
|
||||
|
||||
SANE FLOW DIAGRAM
|
||||
|
||||
|
|
@ -156,22 +159,11 @@
|
|||
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <limits.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <time.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#ifdef HAVE_LIBC_H
|
||||
# include <libc.h> /* NeXTStep/OpenStep */
|
||||
#endif
|
||||
#include <string.h> /*memcpy...*/
|
||||
#include <ctype.h> /*isspace*/
|
||||
#include <math.h> /*tan*/
|
||||
#include <unistd.h> /*usleep*/
|
||||
#include <time.h> /*time*/
|
||||
|
||||
#include "../include/sane/sanei_backend.h"
|
||||
#include "../include/sane/sanei_usb.h"
|
||||
|
|
@ -182,7 +174,7 @@
|
|||
#include "epjitsu-cmd.h"
|
||||
|
||||
#define DEBUG 1
|
||||
#define BUILD 19
|
||||
#define BUILD 20
|
||||
|
||||
#ifndef MAX3
|
||||
#define MAX3(a,b,c) ((a) > (b) ? ((a) > (c) ? a : c) : ((b) > (c) ? b : c))
|
||||
|
|
@ -466,10 +458,10 @@ attach_one (const char *name)
|
|||
DBG (15, "attach_one: Found %s scanner %s at %s\n",
|
||||
s->sane.vendor, s->sane.model, s->sane.name);
|
||||
|
||||
if (strstr (s->sane.model, "S300")){
|
||||
if (strstr (s->sane.model, "S300") || strstr (s->sane.model, "S1300")){
|
||||
unsigned char stat;
|
||||
|
||||
DBG (15, "attach_one: Found S300\n");
|
||||
DBG (15, "attach_one: Found S300/S1300\n");
|
||||
|
||||
stat = get_stat(s);
|
||||
if(stat & 0x01){
|
||||
|
|
@ -3813,7 +3805,7 @@ copy_block_to_page(struct scanner *s,int side)
|
|||
/* convert all of the pixels in this row */
|
||||
for (j = 0; j < width; j++)
|
||||
{
|
||||
unsigned char r, g, b, luma;
|
||||
unsigned char r, g, b;
|
||||
if (s->model == MODEL_S300)
|
||||
{ r = p_in[1]; g = p_in[2]; b = p_in[0]; }
|
||||
else /* (s->model == MODEL_FI60F) */
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
Copyright (C) 2000 Randolph Bentson
|
||||
Copyright (C) 2001 Frederik Ramm
|
||||
Copyright (C) 2001-2004 Oliver Schirrmeister
|
||||
Copyright (C) 2003-2009 m. allan noah
|
||||
Copyright (C) 2003-2010 m. allan noah
|
||||
|
||||
JPEG output support funded by Archivista GmbH, www.archivista.ch
|
||||
Endorser support funded by O A S Oilfield Accounting Service Ltd, www.oas.ca
|
||||
|
|
@ -446,6 +446,8 @@
|
|||
- support hardware based auto length detection
|
||||
v97 2009-09-14, MAN
|
||||
- use sanei_magic to provide software deskew, autocrop and despeckle
|
||||
v98 2010-02-08, MAN
|
||||
- clean up #include lines and copyright
|
||||
|
||||
SANE FLOW DIAGRAM
|
||||
|
||||
|
|
@ -495,7 +497,7 @@
|
|||
#include "fujitsu.h"
|
||||
|
||||
#define DEBUG 1
|
||||
#define BUILD 97
|
||||
#define BUILD 98
|
||||
|
||||
/* values for SANE_DEBUG_FUJITSU env var:
|
||||
- errors 5
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
:backend "epjitsu" ; name of backend
|
||||
:url "http://www.thebility.com/epjitsu/"
|
||||
:version "18" ; version of backend
|
||||
:version "20" ; version of backend
|
||||
:manpage "sane-epjitsu" ; name of manpage (if it exists)
|
||||
:comment "See sane-epjitsu manpage"
|
||||
:devicetype :scanner ; start of a list of devices....
|
||||
|
|
@ -26,16 +26,23 @@
|
|||
:interface "USB"
|
||||
:status :basic
|
||||
:usbid "0x04c5" "0x10c7"
|
||||
:comment "A6-size flatbed, 300/600 dpi, color/grayscale in hardware"
|
||||
:comment "A6-size flatbed, 300/600 dpi, color/gray/binary"
|
||||
|
||||
:model "ScanSnap S300"
|
||||
:interface "USB"
|
||||
:status :good
|
||||
:usbid "0x04c5" "0x1156"
|
||||
:comment "Duplex, 150/225/300/600 dpi, binary/gray/color, AC/USB power, buttons/sensors all supported. Scanner always scans in _triplex_ color, fast USB required. Calibration only fair at high resolution."
|
||||
:comment "Duplex, 150/225/300/600 dpi, color/gray/binary, AC/USB power, buttons/sensors all supported. Scanner always scans in _triplex_ color, fast USB required."
|
||||
|
||||
:model "ScanSnap S300M"
|
||||
:interface "USB"
|
||||
:status :untested
|
||||
:usbid "0x04c5" "0x117f"
|
||||
:comment "Same as S300, with different usb id?"
|
||||
:comment "Same as S300, with different usb id"
|
||||
|
||||
:model "ScanSnap S1300"
|
||||
:interface "USB"
|
||||
:status :good
|
||||
:usbid "0x04c5" "0x11ed"
|
||||
:comment "Same as S300, with different usb id"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
:backend "fujitsu" ; name of backend
|
||||
:url "http://www.thebility.com/fujitsu/"
|
||||
:version "96" ; version of backend
|
||||
:version "98" ; version of backend
|
||||
:manpage "sane-fujitsu" ; name of manpage (if it exists)
|
||||
:comment "Backend updated for SANE release 1.0.20, see sane-fujitsu manpage"
|
||||
:comment "Backend updated for SANE release 1.0.21, see sane-fujitsu manpage"
|
||||
:devicetype :scanner ; start of a list of devices....
|
||||
; other types: :stillcam, :vidcam,
|
||||
; :meta, :api
|
||||
|
|
@ -103,31 +103,36 @@
|
|||
:usbid "0x04c5" "0x10e1"
|
||||
:comment "small, recent, discontinued"
|
||||
|
||||
;==================================================
|
||||
; CURRENT MODELS, SMALL
|
||||
:model "ScanSnap S510"
|
||||
:interface "USB"
|
||||
:status :complete
|
||||
:usbid "0x04c5" "0x1155"
|
||||
:comment "small, current"
|
||||
:comment "small, recent, discontinued"
|
||||
|
||||
:model "ScanSnap S510M"
|
||||
:interface "USB"
|
||||
:status :complete
|
||||
:usbid "0x04c5" "0x116f"
|
||||
:comment "small, current"
|
||||
:comment "small, recent, discontinued"
|
||||
|
||||
:model "fi-6000NS"
|
||||
:interface "Ethernet"
|
||||
:status :untested
|
||||
:comment "small, recent, discontinued, integrated touchscreen and keyboard"
|
||||
|
||||
:model "fi-5000N"
|
||||
:interface "Ethernet"
|
||||
:status :untested
|
||||
:comment "Not a scanner, rather a scanner to ethernet interface"
|
||||
|
||||
;==================================================
|
||||
; CURRENT MODELS, SMALL
|
||||
:model "fi-5110C"
|
||||
:interface "USB"
|
||||
:status :complete
|
||||
:usbid "0x04c5" "0x1097"
|
||||
:comment "small, current"
|
||||
|
||||
:model "fi-6000NS"
|
||||
:interface "Ethernet"
|
||||
:status :untested
|
||||
:comment "small, current, integrated touchscreen and keyboard"
|
||||
|
||||
:model "fi-6010N"
|
||||
:interface "Ethernet"
|
||||
:status :untested
|
||||
|
|
@ -335,24 +340,24 @@
|
|||
:status :complete
|
||||
:comment "big, recent, discontinued"
|
||||
|
||||
;==================================================
|
||||
; CURRENT MODELS, BIG
|
||||
:model "fi-4860C2"
|
||||
:interface "SCSI"
|
||||
:status :complete
|
||||
:comment "big, current"
|
||||
|
||||
:model "fi-5900C"
|
||||
:interface "SCSI USB"
|
||||
:usbid "0x04c5" "0x10e7"
|
||||
:status :good
|
||||
:comment "big, current, independent ultrasonic control and multistream unsupported"
|
||||
:comment "big, recent, discontinued"
|
||||
|
||||
:model "fi-6750S"
|
||||
:interface "USB"
|
||||
:status :untested
|
||||
:usbid "0x04c5" "0x1178"
|
||||
:comment "Simplex, USB only version of fi-6770, won't wakeup via software?"
|
||||
:comment "Simplex, USB only version of fi-6770, won't wakeup via software, discontinued"
|
||||
|
||||
;==================================================
|
||||
; CURRENT MODELS, BIG
|
||||
:model "fi-5900C"
|
||||
:interface "SCSI USB"
|
||||
:usbid "0x04c5" "0x10e7"
|
||||
:status :good
|
||||
:comment "big, current, independent ultrasonic control and multistream unsupported"
|
||||
|
||||
:model "fi-6670"
|
||||
:interface "SCSI USB"
|
||||
|
|
@ -377,3 +382,9 @@
|
|||
:status :good
|
||||
:usbid "0x04c5" "0x1175"
|
||||
:comment "big, current, VRS CGA board unsupported, won't wakeup via software"
|
||||
|
||||
:model "fi-6800"
|
||||
:interface "SCSI USB"
|
||||
;:usbid "0x04c5" "0x11xx"
|
||||
:status :untested
|
||||
:comment "big, current, similar to fi-5900?"
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue