kopia lustrzana https://gitlab.com/sane-project/backends
first gl843 steps
- clone gl847 - add KV-SS080 entry with provisional valuesmerge-requests/1/head
Stphane Voltz
rodzic
4ffdc5ee08
commit
5810169cde
|
|
@ -479,7 +479,7 @@ libsane_fujitsu_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
|||
libsane_fujitsu_la_LIBADD = $(COMMON_LIBS) libfujitsu.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
|
||||
EXTRA_DIST += fujitsu.conf.in
|
||||
|
||||
libgenesys_la_SOURCES = genesys.c genesys.h genesys_gl646.c genesys_gl646.h genesys_gl841.c genesys_gl847.c genesys_gl847.h genesys_low.h
|
||||
libgenesys_la_SOURCES = genesys.c genesys.h genesys_gl646.c genesys_gl646.h genesys_gl841.c genesys_gl843.c genesys_gl843.h genesys_gl847.c genesys_gl847.h genesys_low.h
|
||||
libgenesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
|
||||
|
||||
nodist_libsane_genesys_la_SOURCES = genesys-s.c
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ libfujitsu_la_OBJECTS = $(am_libfujitsu_la_OBJECTS)
|
|||
libgenesys_la_LIBADD =
|
||||
am_libgenesys_la_OBJECTS = libgenesys_la-genesys.lo \
|
||||
libgenesys_la-genesys_gl646.lo libgenesys_la-genesys_gl841.lo \
|
||||
libgenesys_la-genesys_gl847.lo
|
||||
libgenesys_la-genesys_gl843.lo libgenesys_la-genesys_gl847.lo
|
||||
libgenesys_la_OBJECTS = $(am_libgenesys_la_OBJECTS)
|
||||
libgphoto2_i_la_LIBADD =
|
||||
am_libgphoto2_i_la_OBJECTS = libgphoto2_i_la-gphoto2.lo
|
||||
|
|
@ -1993,7 +1993,7 @@ nodist_libsane_fujitsu_la_SOURCES = fujitsu-s.c
|
|||
libsane_fujitsu_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=fujitsu
|
||||
libsane_fujitsu_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_fujitsu_la_LIBADD = $(COMMON_LIBS) libfujitsu.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
|
||||
libgenesys_la_SOURCES = genesys.c genesys.h genesys_gl646.c genesys_gl646.h genesys_gl841.c genesys_gl847.c genesys_gl847.h genesys_low.h
|
||||
libgenesys_la_SOURCES = genesys.c genesys.h genesys_gl646.c genesys_gl646.h genesys_gl841.c genesys_gl843.c genesys_gl843.h genesys_gl847.c genesys_gl847.h genesys_low.h
|
||||
libgenesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
|
||||
nodist_libsane_genesys_la_SOURCES = genesys-s.c
|
||||
libsane_genesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
|
||||
|
|
@ -2871,6 +2871,7 @@ distclean-compile:
|
|||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgenesys_la-genesys.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgenesys_la-genesys_gl646.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgenesys_la-genesys_gl841.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgenesys_la-genesys_gl843.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgenesys_la-genesys_gl847.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgphoto2_i_la-gphoto2.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgt68xx_la-gt68xx.Plo@am__quote@
|
||||
|
|
@ -3340,6 +3341,13 @@ libgenesys_la-genesys_gl841.lo: genesys_gl841.c
|
|||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgenesys_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgenesys_la-genesys_gl841.lo `test -f 'genesys_gl841.c' || echo '$(srcdir)/'`genesys_gl841.c
|
||||
|
||||
libgenesys_la-genesys_gl843.lo: genesys_gl843.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgenesys_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgenesys_la-genesys_gl843.lo -MD -MP -MF $(DEPDIR)/libgenesys_la-genesys_gl843.Tpo -c -o libgenesys_la-genesys_gl843.lo `test -f 'genesys_gl843.c' || echo '$(srcdir)/'`genesys_gl843.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgenesys_la-genesys_gl843.Tpo $(DEPDIR)/libgenesys_la-genesys_gl843.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='genesys_gl843.c' object='libgenesys_la-genesys_gl843.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgenesys_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgenesys_la-genesys_gl843.lo `test -f 'genesys_gl843.c' || echo '$(srcdir)/'`genesys_gl843.c
|
||||
|
||||
libgenesys_la-genesys_gl847.lo: genesys_gl847.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgenesys_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgenesys_la-genesys_gl847.lo -MD -MP -MF $(DEPDIR)/libgenesys_la-genesys_gl847.Tpo -c -o libgenesys_la-genesys_gl847.lo `test -f 'genesys_gl847.c' || echo '$(srcdir)/'`genesys_gl847.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgenesys_la-genesys_gl847.Tpo $(DEPDIR)/libgenesys_la-genesys_gl847.Plo
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
#define BUILD 18
|
||||
#define BUILD 30
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
|
@ -175,6 +175,8 @@ genesys_init_cmd_set (Genesys_Device * dev)
|
|||
return sanei_gl646_init_cmd_set (dev);
|
||||
case GENESYS_GL841:
|
||||
return sanei_gl841_init_cmd_set (dev);
|
||||
case GENESYS_GL843:
|
||||
return sanei_gl843_init_cmd_set (dev);
|
||||
case GENESYS_GL847:
|
||||
return sanei_gl847_init_cmd_set (dev);
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -80,3 +80,6 @@ usb 0x04a7 0x0229
|
|||
|
||||
# Xerox Travel Scanner 100
|
||||
usb 0x04a7 0x04ac
|
||||
|
||||
# Panasonic KV-SS080
|
||||
usb 0x04da 0x100f
|
||||
|
|
|
|||
|
|
@ -145,7 +145,14 @@ static Genesys_Frontend Wolfson[] = {
|
|||
, {0x32, 0x04, 0x00}
|
||||
, {0x00, 0x00, 0x00}
|
||||
}
|
||||
,
|
||||
, /* KVSS080 */
|
||||
{DAC_KVSS080,{0x00, 0x03, 0x05, 0x12}
|
||||
, {0x00, 0x00, 0x00}
|
||||
, {0xb8, 0xb8, 0xb8}
|
||||
, {0x04, 0x04, 0x04}
|
||||
, {0x00, 0x00, 0x00}
|
||||
}
|
||||
,
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -452,6 +459,23 @@ static Genesys_Sensor Sensor[] = {
|
|||
1.0, 1.0, 1.0,
|
||||
NULL, NULL, NULL}
|
||||
,
|
||||
{CCD_KVSS080,
|
||||
600,
|
||||
48,
|
||||
85,
|
||||
152,
|
||||
5416,
|
||||
210,
|
||||
230,
|
||||
{0x02, 0x00, 0x06, 0x04} ,
|
||||
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2b, 0x08, 0x20, 0x2a, 0x00, 0x00,
|
||||
0x0c, 0x03}
|
||||
,
|
||||
{0x0f, 0x13, 0x17, 0x03, 0x07, 0x0b, 0x83, 0x00, 0xc1, 0x00, 0x00, 0x00,
|
||||
0x00} ,
|
||||
1.0, 1.0, 1.0,
|
||||
NULL, NULL, NULL}
|
||||
,
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -559,6 +583,11 @@ static Genesys_Gpo Gpo[] = {
|
|||
,
|
||||
}
|
||||
,
|
||||
{GPO_KVSS080,
|
||||
{0x11, 0x00} ,
|
||||
{0x51, 0x20} ,
|
||||
}
|
||||
,
|
||||
};
|
||||
|
||||
static Genesys_Motor Motor[] = {
|
||||
|
|
@ -805,6 +834,24 @@ static Genesys_Motor Motor[] = {
|
|||
},
|
||||
},
|
||||
},
|
||||
{MOTOR_KVSS080,
|
||||
1200,
|
||||
2400,
|
||||
1,
|
||||
1,
|
||||
{{{
|
||||
3500,
|
||||
1300,
|
||||
60,
|
||||
0.8,
|
||||
},
|
||||
{
|
||||
3500,
|
||||
1400,
|
||||
60,
|
||||
0.8,
|
||||
},},},
|
||||
},
|
||||
};
|
||||
|
||||
/* here we have the various device settings...
|
||||
|
|
@ -914,6 +961,59 @@ static Genesys_Model canon_lide_50_model = {
|
|||
400
|
||||
};
|
||||
|
||||
static Genesys_Model panasonic_kvss080_model = {
|
||||
"panasonic-kv-ss080", /* Name */
|
||||
"Panasonic", /* Device vendor string */
|
||||
"KS-SS080", /* Device model name */
|
||||
GENESYS_GL843,
|
||||
NULL,
|
||||
|
||||
{ 600, 300, 150, 75, 0}, /* possible x-resolutions */
|
||||
{ 1200, 600, 300, 150, 75, 0}, /* possible y-resolutions */
|
||||
{16, 8, 0}, /* possible depths in gray mode */
|
||||
{16, 8, 0}, /* possible depths in color mode */
|
||||
|
||||
SANE_FIX (0.42), /* Start of scan area in mm (x) */
|
||||
SANE_FIX (7.9), /* Start of scan area in mm (y) */
|
||||
SANE_FIX (218.0), /* Size of scan area in mm (x) */
|
||||
SANE_FIX (299.0), /* Size of scan area in mm (y) */
|
||||
|
||||
SANE_FIX (3.0), /* Start of white strip in mm (y) */
|
||||
SANE_FIX (0.0), /* Start of black mark in mm (x) */
|
||||
|
||||
SANE_FIX (0.0), /* Start of scan area in TA mode in mm (x) */
|
||||
SANE_FIX (0.0), /* Start of scan area in TA mode in mm (y) */
|
||||
SANE_FIX (100.0), /* Size of scan area in TA mode in mm (x) */
|
||||
SANE_FIX (100.0), /* Size of scan area in TA mode in mm (y) */
|
||||
|
||||
SANE_FIX (0.0), /* Start of white strip in TA mode in mm (y) */
|
||||
|
||||
SANE_FIX (0.0), /* Size of scan area after paper sensor stops
|
||||
sensing document in mm */
|
||||
SANE_FIX (0.0), /* Amount of feeding needed to eject document
|
||||
after finishing scanning in mm */
|
||||
|
||||
0, 0, 0, /* RGB CCD Line-distance correction in pixel */
|
||||
|
||||
COLOR_ORDER_RGB, /* Order of the CCD/CIS colors */
|
||||
|
||||
SANE_TRUE, /* Is this a CIS scanner? */
|
||||
SANE_FALSE, /* Is this a sheetfed scanner? */
|
||||
CCD_KVSS080,
|
||||
DAC_KVSS080,
|
||||
GPO_KVSS080,
|
||||
MOTOR_KVSS080,
|
||||
GENESYS_FLAG_LAZY_INIT | /* Which flags are needed for this scanner? */
|
||||
GENESYS_FLAG_SKIP_WARMUP |
|
||||
GENESYS_FLAG_OFFSET_CALIBRATION |
|
||||
GENESYS_FLAG_DARK_WHITE_CALIBRATION |
|
||||
GENESYS_FLAG_CUSTOM_GAMMA |
|
||||
GENESYS_FLAG_ODD_EVEN_CIS,
|
||||
GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_COPY_SW,
|
||||
280,
|
||||
400
|
||||
};
|
||||
|
||||
|
||||
static Genesys_Model canon_lide_100_model = {
|
||||
"canon-lide-100", /* Name */
|
||||
|
|
@ -2163,5 +2263,7 @@ static Genesys_USB_Device_Entry genesys_usb_device_list[] = {
|
|||
{0x04a9, 0x1904, &canon_lide_100_model},
|
||||
{0x04a9, 0x1905, &canon_lide_200_model},
|
||||
{0x04a9, 0x1906, &canon_5600f_model},
|
||||
/* GL843 devices */
|
||||
{0x04da, 0x100f, &panasonic_kvss080_model},
|
||||
{0, 0, NULL}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -243,6 +243,7 @@ Genesys_Color_Order;
|
|||
|
||||
#define GENESYS_GL646 646
|
||||
#define GENESYS_GL841 841
|
||||
#define GENESYS_GL843 843
|
||||
#define GENESYS_GL846 846
|
||||
#define GENESYS_GL847 847
|
||||
#define GENESYS_GL848 848
|
||||
|
|
@ -261,6 +262,7 @@ Genesys_Color_Order;
|
|||
#define DAC_WOLFSON_HP3670 9
|
||||
#define DAC_WOLFSON_DSM600 10
|
||||
#define DAC_CANONLIDE200 11
|
||||
#define DAC_KVSS080 12
|
||||
|
||||
#define CCD_UMAX 0
|
||||
#define CCD_ST12 1 /* SONY ILX548: 5340 Pixel ??? */
|
||||
|
|
@ -279,6 +281,7 @@ Genesys_Color_Order;
|
|||
#define CCD_DP685 14
|
||||
#define CIS_CANONLIDE200 15
|
||||
#define CIS_CANONLIDE100 16
|
||||
#define CCD_KVSS080 17
|
||||
|
||||
#define GPO_UMAX 0
|
||||
#define GPO_ST12 1
|
||||
|
|
@ -293,6 +296,7 @@ Genesys_Color_Order;
|
|||
#define GPO_DP665 10
|
||||
#define GPO_DP685 11
|
||||
#define GPO_CANONLIDE200 12
|
||||
#define GPO_KVSS080 13
|
||||
|
||||
#define MOTOR_UMAX 0
|
||||
#define MOTOR_5345 1
|
||||
|
|
@ -308,6 +312,7 @@ Genesys_Color_Order;
|
|||
#define MOTOR_DSMOBILE_600 12
|
||||
#define MOTOR_CANONLIDE200 13
|
||||
#define MOTOR_CANONLIDE100 14
|
||||
#define MOTOR_KVSS080 15
|
||||
|
||||
|
||||
/* Forward typedefs */
|
||||
|
|
@ -801,6 +806,7 @@ sanei_genesys_buffer_consume(Genesys_Buffer * buf, size_t size);
|
|||
/*---------------------------------------------------------------------------*/
|
||||
extern SANE_Status sanei_gl646_init_cmd_set (Genesys_Device * dev);
|
||||
extern SANE_Status sanei_gl841_init_cmd_set (Genesys_Device * dev);
|
||||
extern SANE_Status sanei_gl843_init_cmd_set (Genesys_Device * dev);
|
||||
extern SANE_Status sanei_gl847_init_cmd_set (Genesys_Device * dev);
|
||||
|
||||
#endif /* not GENESYS_LOW_H */
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue