Adding new kodakaio backend

merge-requests/1/head
m. allan noah 2012-06-30 21:28:14 -04:00
rodzic df6a8ef89d
commit 206e6ed094
17 zmienionych plików z 3826 dodań i 77 usunięć

Wyświetl plik

@ -55,6 +55,7 @@ Backends:
hs2p: Jeremy Johnson
ibm: M.F., Henning Geinitz (*)
kodak: m. allan noah (*)
kodakaio: Paul Newall
kvs1025: Tao Zhang, m. allan noah (*)
kvs20xx: unknown, m. allan noah (*)
kvs40xx: unknown, m. allan noah (*)
@ -224,6 +225,7 @@ Oliver Schirrmeister <oschirr@abm.de>
Oliver Schwartz <oliverschwartz@users.sourceforge.net>
Patrick Lessard <palessar@cgocable.ca>
Patrick Reynolds <patrickr@virginia.edu>
Paul Newall <quandry@ntlworld.com>
Peter Fales <peter@fales-lorenz.net>
Peter Kirchgessner <peter@kirchgessner.net>
Petter Reinholdtsen <pere@hungry.com>

Wyświetl plik

@ -1,3 +1,10 @@
2012-06-28 Paul Newall <quandry@ntlworld.com>
* backend/kodakaio.c backend/kodakaio.conf.in backend/kodakaio.h
doc/sane-kodakaio.man doc/descriptions/kodakaio.desc
configure.in makefile.am dllconf.in doc/makefile.am: Added new backend kodakaio for
kodak ESP nnnn, Cnnn, hero AiOs, detection of cups added to configure
since cups is used for network auto detection.
2012-06-27 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.[ch], backend/pixma_sane_options.c,
doc/descriptions/pixma.desc:

14
aclocal.m4 vendored
Wyświetl plik

@ -658,7 +658,8 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@ -704,7 +705,8 @@ m4_define([_PKG_CONFIG],
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
@ -752,9 +754,9 @@ if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@ -767,7 +769,7 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT])
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@ -778,7 +780,7 @@ path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

Wyświetl plik

@ -85,7 +85,7 @@ BACKEND_CONFS= abaton.conf agfafocus.conf apple.conf artec.conf \
dell1600n_net.conf dmc.conf epjitsu.conf epson2.conf \
epson.conf fujitsu.conf genesys.conf gphoto2.conf \
gt68xx.conf hp3900.conf hp4200.conf hp5400.conf \
hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf \
hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf kodakaio.conf\
leo.conf lexmark.conf ma1509.conf magicolor.conf \
matsushita.conf microtek2.conf microtek.conf mustek.conf \
mustek_pp.conf mustek_usb.conf nec.conf net.conf \
@ -175,7 +175,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \
libgphoto2_i.la libgt68xx.la libhp.la \
libhp3500.la libhp3900.la libhp4200.la \
libhp5400.la libhp5590.la libhpljm1005.la \
libhpsj5s.la libhs2p.la libibm.la libkodak.la \
libhpsj5s.la libhs2p.la libibm.la libkodak.la libkodakaio.la\
libkvs1025.la libkvs20xx.la libkvs40xx.la \
libleo.la liblexmark.la libma1509.la libmagicolor.la \
libmatsushita.la libmicrotek.la libmicrotek2.la \
@ -208,7 +208,7 @@ be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \
libsane-gphoto2.la libsane-gt68xx.la libsane-hp.la \
libsane-hp3500.la libsane-hp3900.la libsane-hp4200.la \
libsane-hp5400.la libsane-hp5590.la libsane-hpljm1005.la \
libsane-hpsj5s.la libsane-hs2p.la libsane-ibm.la libsane-kodak.la \
libsane-hpsj5s.la libsane-hs2p.la libsane-ibm.la libsane-kodak.la libsane-kodakaio.la\
libsane-kvs1025.la libsane-kvs20xx.la libsane-kvs40xx.la \
libsane-leo.la \
libsane-lexmark.la libsane-ma1509.la libsane-magicolor.la \
@ -621,6 +621,15 @@ libsane_kodak_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_kodak_la_LIBADD = $(COMMON_LIBS) libkodak.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
EXTRA_DIST += kodak.conf.in
libkodakaio_la_SOURCES = kodakaio.c kodakaio.h
libkodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
nodist_libsane_kodakaio_la_SOURCES = kodakaio-s.c
libsane_kodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
libsane_kodakaio_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.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_tcp.lo ../sanei/sanei_udp.lo $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
EXTRA_DIST += kodakaio.conf.in
libkvs1025_la_SOURCES = kvs1025.c kvs1025_low.c kvs1025_opt.c kvs1025_usb.c \
kvs1025.h kvs1025_low.h kvs1025_usb.h kvs1025_cmds.h
libkvs1025_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs1025

Wyświetl plik

@ -204,6 +204,9 @@ libibm_la_OBJECTS = $(am_libibm_la_OBJECTS)
libkodak_la_LIBADD =
am_libkodak_la_OBJECTS = libkodak_la-kodak.lo
libkodak_la_OBJECTS = $(am_libkodak_la_OBJECTS)
libkodakaio_la_LIBADD =
am_libkodakaio_la_OBJECTS = libkodakaio_la-kodakaio.lo
libkodakaio_la_OBJECTS = $(am_libkodakaio_la_OBJECTS)
libkvs1025_la_LIBADD =
am_libkvs1025_la_OBJECTS = libkvs1025_la-kvs1025.lo \
libkvs1025_la-kvs1025_low.lo libkvs1025_la-kvs1025_opt.lo \
@ -727,6 +730,19 @@ libsane_kodak_la_OBJECTS = $(nodist_libsane_kodak_la_OBJECTS)
libsane_kodak_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libsane_kodak_la_LDFLAGS) $(LDFLAGS) -o $@
libsane_kodakaio_la_DEPENDENCIES = $(COMMON_LIBS) libkodakaio.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_tcp.lo ../sanei/sanei_udp.lo \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
nodist_libsane_kodakaio_la_OBJECTS = \
libsane_kodakaio_la-kodakaio-s.lo
libsane_kodakaio_la_OBJECTS = $(nodist_libsane_kodakaio_la_OBJECTS)
libsane_kodakaio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libsane_kodakaio_la_LDFLAGS) $(LDFLAGS) -o $@
libsane_kvs1025_la_DEPENDENCIES = $(COMMON_LIBS) libkvs1025.la \
../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
../sanei/sanei_config.lo sane_strstatus.lo \
@ -1332,16 +1348,17 @@ SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \
$(libhp5400_la_SOURCES) $(libhp5590_la_SOURCES) \
$(libhpljm1005_la_SOURCES) $(libhpsj5s_la_SOURCES) \
$(libhs2p_la_SOURCES) $(libibm_la_SOURCES) \
$(libkodak_la_SOURCES) $(libkvs1025_la_SOURCES) \
$(libkvs20xx_la_SOURCES) $(libkvs40xx_la_SOURCES) \
$(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \
$(libma1509_la_SOURCES) $(libmagicolor_la_SOURCES) \
$(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \
$(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \
$(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \
$(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \
$(libnet_la_SOURCES) $(libniash_la_SOURCES) \
$(libp5_la_SOURCES) $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
$(libkodak_la_SOURCES) $(libkodakaio_la_SOURCES) \
$(libkvs1025_la_SOURCES) $(libkvs20xx_la_SOURCES) \
$(libkvs40xx_la_SOURCES) $(libleo_la_SOURCES) \
$(liblexmark_la_SOURCES) $(libma1509_la_SOURCES) \
$(libmagicolor_la_SOURCES) $(libmatsushita_la_SOURCES) \
$(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \
$(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \
$(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \
$(libnec_la_SOURCES) $(libnet_la_SOURCES) \
$(libniash_la_SOURCES) $(libp5_la_SOURCES) \
$(libpie_la_SOURCES) $(libpint_la_SOURCES) \
$(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \
$(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \
$(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \
@ -1386,6 +1403,7 @@ SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \
$(nodist_libsane_hs2p_la_SOURCES) \
$(nodist_libsane_ibm_la_SOURCES) \
$(nodist_libsane_kodak_la_SOURCES) \
$(nodist_libsane_kodakaio_la_SOURCES) \
$(nodist_libsane_kvs1025_la_SOURCES) \
$(nodist_libsane_kvs20xx_la_SOURCES) \
$(nodist_libsane_kvs40xx_la_SOURCES) \
@ -1463,16 +1481,17 @@ DIST_SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \
$(libhp5400_la_SOURCES) $(libhp5590_la_SOURCES) \
$(libhpljm1005_la_SOURCES) $(libhpsj5s_la_SOURCES) \
$(libhs2p_la_SOURCES) $(libibm_la_SOURCES) \
$(libkodak_la_SOURCES) $(libkvs1025_la_SOURCES) \
$(libkvs20xx_la_SOURCES) $(libkvs40xx_la_SOURCES) \
$(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \
$(libma1509_la_SOURCES) $(libmagicolor_la_SOURCES) \
$(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \
$(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \
$(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \
$(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \
$(libnet_la_SOURCES) $(libniash_la_SOURCES) \
$(libp5_la_SOURCES) $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
$(libkodak_la_SOURCES) $(libkodakaio_la_SOURCES) \
$(libkvs1025_la_SOURCES) $(libkvs20xx_la_SOURCES) \
$(libkvs40xx_la_SOURCES) $(libleo_la_SOURCES) \
$(liblexmark_la_SOURCES) $(libma1509_la_SOURCES) \
$(libmagicolor_la_SOURCES) $(libmatsushita_la_SOURCES) \
$(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \
$(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \
$(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \
$(libnec_la_SOURCES) $(libnet_la_SOURCES) \
$(libniash_la_SOURCES) $(libp5_la_SOURCES) \
$(libpie_la_SOURCES) $(libpint_la_SOURCES) \
$(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \
$(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \
$(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \
@ -1723,17 +1742,17 @@ EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in abaton.conf.in \
hp5400_internal.h hp5400_sane.c hp5400_sanei.c hp5400_sanei.h \
hp5400_xfer.h hp5590_cmds.c hp5590_cmds.h hp5590_low.c \
hp5590_low.h hpsj5s.conf.in hs2p.conf.in hs2p-scsi.c \
hs2p-scsi.h ibm.conf.in ibm-scsi.c kodak.conf.in leo.conf.in \
lexmark.conf.in lexmark_models.c lexmark_sensors.c \
ma1509.conf.in magicolor.conf.in matsushita.conf.in \
microtek.conf.in microtek2.conf.in mustek.conf.in \
mustek_scsi_pp.c mustek_scsi_pp.h mustek_pp.conf.in \
mustek_pp_ccd300.c mustek_pp_ccd300.h mustek_pp_cis.c \
mustek_pp_cis.h mustek_pp_null.c mustek_usb.conf.in \
mustek_usb_high.c mustek_usb_high.h mustek_usb_low.c \
mustek_usb_low.h mustek_usb_mid.c mustek_usb_mid.h \
mustek_usb2_asic.c mustek_usb2_asic.h mustek_usb2_high.c \
mustek_usb2_high.h mustek_usb2_reflective.c \
hs2p-scsi.h ibm.conf.in ibm-scsi.c kodak.conf.in \
kodakaio.conf.in leo.conf.in lexmark.conf.in lexmark_models.c \
lexmark_sensors.c ma1509.conf.in magicolor.conf.in \
matsushita.conf.in microtek.conf.in microtek2.conf.in \
mustek.conf.in mustek_scsi_pp.c mustek_scsi_pp.h \
mustek_pp.conf.in mustek_pp_ccd300.c mustek_pp_ccd300.h \
mustek_pp_cis.c mustek_pp_cis.h mustek_pp_null.c \
mustek_usb.conf.in mustek_usb_high.c mustek_usb_high.h \
mustek_usb_low.c mustek_usb_low.h mustek_usb_mid.c \
mustek_usb_mid.h mustek_usb2_asic.c mustek_usb2_asic.h \
mustek_usb2_high.c mustek_usb2_high.h mustek_usb2_reflective.c \
mustek_usb2_transparent.c nec.conf.in net.conf.in niash_core.c \
niash_core.h niash_xfer.c niash_xfer.h pie.conf.in p5.conf.in \
p5_device.c pixma.conf.in pixma_sane_options.c \
@ -1779,7 +1798,7 @@ BACKEND_CONFS = abaton.conf agfafocus.conf apple.conf artec.conf \
dell1600n_net.conf dmc.conf epjitsu.conf epson2.conf \
epson.conf fujitsu.conf genesys.conf gphoto2.conf \
gt68xx.conf hp3900.conf hp4200.conf hp5400.conf \
hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf \
hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf kodakaio.conf\
leo.conf lexmark.conf ma1509.conf magicolor.conf \
matsushita.conf microtek2.conf microtek.conf mustek.conf \
mustek_pp.conf mustek_usb.conf nec.conf net.conf \
@ -1817,7 +1836,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \
libgphoto2_i.la libgt68xx.la libhp.la \
libhp3500.la libhp3900.la libhp4200.la \
libhp5400.la libhp5590.la libhpljm1005.la \
libhpsj5s.la libhs2p.la libibm.la libkodak.la \
libhpsj5s.la libhs2p.la libibm.la libkodak.la libkodakaio.la\
libkvs1025.la libkvs20xx.la libkvs40xx.la \
libleo.la liblexmark.la libma1509.la libmagicolor.la \
libmatsushita.la libmicrotek.la libmicrotek2.la \
@ -1851,7 +1870,7 @@ be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \
libsane-gphoto2.la libsane-gt68xx.la libsane-hp.la \
libsane-hp3500.la libsane-hp3900.la libsane-hp4200.la \
libsane-hp5400.la libsane-hp5590.la libsane-hpljm1005.la \
libsane-hpsj5s.la libsane-hs2p.la libsane-ibm.la libsane-kodak.la \
libsane-hpsj5s.la libsane-hs2p.la libsane-ibm.la libsane-kodak.la libsane-kodakaio.la\
libsane-kvs1025.la libsane-kvs20xx.la libsane-kvs40xx.la \
libsane-leo.la \
libsane-lexmark.la libsane-ma1509.la libsane-magicolor.la \
@ -2127,6 +2146,12 @@ nodist_libsane_kodak_la_SOURCES = kodak-s.c
libsane_kodak_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodak
libsane_kodak_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_kodak_la_LIBADD = $(COMMON_LIBS) libkodak.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
libkodakaio_la_SOURCES = kodakaio.c kodakaio.h
libkodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
nodist_libsane_kodakaio_la_SOURCES = kodakaio-s.c
libsane_kodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
libsane_kodakaio_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.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_tcp.lo ../sanei/sanei_udp.lo $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
libkvs1025_la_SOURCES = kvs1025.c kvs1025_low.c kvs1025_opt.c kvs1025_usb.c \
kvs1025.h kvs1025_low.h kvs1025_usb.h kvs1025_cmds.h
@ -2630,6 +2655,8 @@ libibm.la: $(libibm_la_OBJECTS) $(libibm_la_DEPENDENCIES)
$(LINK) $(libibm_la_OBJECTS) $(libibm_la_LIBADD) $(LIBS)
libkodak.la: $(libkodak_la_OBJECTS) $(libkodak_la_DEPENDENCIES)
$(LINK) $(libkodak_la_OBJECTS) $(libkodak_la_LIBADD) $(LIBS)
libkodakaio.la: $(libkodakaio_la_OBJECTS) $(libkodakaio_la_DEPENDENCIES)
$(LINK) $(libkodakaio_la_OBJECTS) $(libkodakaio_la_LIBADD) $(LIBS)
libkvs1025.la: $(libkvs1025_la_OBJECTS) $(libkvs1025_la_DEPENDENCIES)
$(LINK) $(libkvs1025_la_OBJECTS) $(libkvs1025_la_LIBADD) $(LIBS)
libkvs20xx.la: $(libkvs20xx_la_OBJECTS) $(libkvs20xx_la_DEPENDENCIES)
@ -2766,6 +2793,8 @@ libsane-ibm.la: $(libsane_ibm_la_OBJECTS) $(libsane_ibm_la_DEPENDENCIES)
$(libsane_ibm_la_LINK) $(libsane_ibm_la_OBJECTS) $(libsane_ibm_la_LIBADD) $(LIBS)
libsane-kodak.la: $(libsane_kodak_la_OBJECTS) $(libsane_kodak_la_DEPENDENCIES)
$(libsane_kodak_la_LINK) $(libsane_kodak_la_OBJECTS) $(libsane_kodak_la_LIBADD) $(LIBS)
libsane-kodakaio.la: $(libsane_kodakaio_la_OBJECTS) $(libsane_kodakaio_la_DEPENDENCIES)
$(libsane_kodakaio_la_LINK) $(libsane_kodakaio_la_OBJECTS) $(libsane_kodakaio_la_LIBADD) $(LIBS)
libsane-kvs1025.la: $(libsane_kvs1025_la_OBJECTS) $(libsane_kvs1025_la_DEPENDENCIES)
$(libsane_kvs1025_la_LINK) $(libsane_kvs1025_la_OBJECTS) $(libsane_kvs1025_la_LIBADD) $(LIBS)
libsane-kvs20xx.la: $(libsane_kvs20xx_la_OBJECTS) $(libsane_kvs20xx_la_DEPENDENCIES)
@ -2971,6 +3000,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhs2p_la-hs2p.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libibm_la-ibm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkodak_la-kodak.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkodakaio_la-kodakaio.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkvs1025_la-kvs1025.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkvs1025_la-kvs1025_low.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkvs1025_la-kvs1025_opt.Plo@am__quote@
@ -3056,6 +3086,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hs2p_la-hs2p-s.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_ibm_la-ibm-s.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_kodak_la-kodak-s.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_kodakaio_la-kodakaio-s.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_kvs20xx_la-kvs20xx-s.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_kvs40xx_la-kvs40xx-s.Plo@am__quote@
@ -3597,6 +3628,13 @@ libkodak_la-kodak.lo: kodak.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) $(libkodak_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkodak_la-kodak.lo `test -f 'kodak.c' || echo '$(srcdir)/'`kodak.c
libkodakaio_la-kodakaio.lo: kodakaio.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkodakaio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkodakaio_la-kodakaio.lo -MD -MP -MF $(DEPDIR)/libkodakaio_la-kodakaio.Tpo -c -o libkodakaio_la-kodakaio.lo `test -f 'kodakaio.c' || echo '$(srcdir)/'`kodakaio.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkodakaio_la-kodakaio.Tpo $(DEPDIR)/libkodakaio_la-kodakaio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kodakaio.c' object='libkodakaio_la-kodakaio.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) $(libkodakaio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkodakaio_la-kodakaio.lo `test -f 'kodakaio.c' || echo '$(srcdir)/'`kodakaio.c
libkvs1025_la-kvs1025.lo: kvs1025.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkvs1025_la-kvs1025.lo -MD -MP -MF $(DEPDIR)/libkvs1025_la-kvs1025.Tpo -c -o libkvs1025_la-kvs1025.lo `test -f 'kvs1025.c' || echo '$(srcdir)/'`kvs1025.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkvs1025_la-kvs1025.Tpo $(DEPDIR)/libkvs1025_la-kvs1025.Plo
@ -4192,6 +4230,13 @@ libsane_kodak_la-kodak-s.lo: kodak-s.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) $(libsane_kodak_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsane_kodak_la-kodak-s.lo `test -f 'kodak-s.c' || echo '$(srcdir)/'`kodak-s.c
libsane_kodakaio_la-kodakaio-s.lo: kodakaio-s.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_kodakaio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsane_kodakaio_la-kodakaio-s.lo -MD -MP -MF $(DEPDIR)/libsane_kodakaio_la-kodakaio-s.Tpo -c -o libsane_kodakaio_la-kodakaio-s.lo `test -f 'kodakaio-s.c' || echo '$(srcdir)/'`kodakaio-s.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsane_kodakaio_la-kodakaio-s.Tpo $(DEPDIR)/libsane_kodakaio_la-kodakaio-s.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kodakaio-s.c' object='libsane_kodakaio_la-kodakaio-s.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) $(libsane_kodakaio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsane_kodakaio_la-kodakaio-s.lo `test -f 'kodakaio-s.c' || echo '$(srcdir)/'`kodakaio-s.c
libsane_kvs1025_la-kvs1025-s.lo: kvs1025-s.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_kvs1025_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsane_kvs1025_la-kvs1025-s.lo -MD -MP -MF $(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Tpo -c -o libsane_kvs1025_la-kvs1025-s.lo `test -f 'kvs1025-s.c' || echo '$(srcdir)/'`kvs1025-s.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Tpo $(DEPDIR)/libsane_kvs1025_la-kvs1025-s.Plo
@ -4971,7 +5016,7 @@ install-firmware-path:
done
install-lockpath:
$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
$(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
uninstall-hook:
rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)

Wyświetl plik

@ -39,6 +39,7 @@ hpljm1005
hs2p
ibm
kodak
kodakaio
kvs1025
kvs20xx
leo

3180
backend/kodakaio.c 100644

Plik diff jest za duży Load Diff

Wyświetl plik

@ -0,0 +1,80 @@
### kodakaio.conf
###
### here are some examples for how to configure the kodakaio backend
### Timeout settings: SNMP autodetection, Scan data read requests and other
### read requests. All values are given in milliseconds,
### i.e. 1000 is 1 second.
# SNMP auto-detection waits 1.5 seconds
snmp-timeout 1500
# wait 15 seconds for scan data (scans may take several seconds to initialize,
# so we need to wait longer)
scan-data-timeout 7000
# Wait 5 seconds for all other data requests
request-timeout 5000
### Network: Format is "net IP_ADDRESS [USB_ID]" or "net autodiscovery"
### if USB_ID is left out, SNMP is used to detect the device type
### Currently autodiscovery seems to not work
### So always use "net IP_ADDRESS [USB_ID]" as shown below
### You can find the printer's IP address on its control panel
### There is a list of USB_IDs at the end of this file
net autodiscovery
### The following is a kodak HERO 9.1 with explicit IP-Address
#net 10.0.0.5 0x4067
# kodak ESP5250 is usb 0x040a 0x4041
#net 192.168.1.4 0x4041
# kodak HERO 9.1 is usb 0x040a 0x4067
#net 192.168.1.17 0x4067
### USB: format is "usb" for automatic (libusb) discovery, based on USB IDs,
### or "usb <vendor ID> <device ID> to force the use of a particular
### device (the backend has some additional checks and will not use
### non-kodak devices, though)
usb
### For libusb support for unknown scanners use the following command
### usb <product ID> <device ID>
### e.g.:
# kodak ESP5250 is usb 0x040a 0x4041
#usb 0x040a 0x4041
# kodak HERO 9.1 is usb 0x040a 0x4067
#usb 0x040a 0x4067
### List of USB device IDs
# 0x4059, /* kodak ESP 2150 */
# 0x4066, /* kodak ESP 2170 */
# 0x4043, /* kodak ESP 3200 */
# 0x4031, /* kodak ESP 3300 */
# 0x4053, /* kodak ESP 4100 */
# 0x4028, /* kodak ESP 5000 */
# 0x4025, /* kodak ESP 5100 */
# 0x4041, /* kodak ESP 5200 */
# 0x4026, /* kodak ESP 5300 */
# 0x4027, /* kodak ESP 5500 */
# 0x4054, /* kodak ESP 6100 */
# 0x4056, /* kodak ESP 7200 */
# 0x4065, /* kodak ESP 9200 */
# 0x4032, /* kodak ESP 5 */
# 0x403E, /* kodak ESP 7 */
# 0x403F, /* kodak ESP 9 */
# 0x4057, /* kodak ESP C110 */
# 0x4058, /* kodak ESP C115 */
# 0x405D, /* kodak ESP C310 */
# 0x405E, /* kodak ESP C315 */
# 0x4060, /* ADVENT WiFi AIO AW10 */
# 0x406D, /* kodak Hero 3.1 */
# 0x4064, /* kodak Hero 5.1 */
# 0x4062, /* kodak Office Hero 6.1 */
# 0x4063, /* kodak Hero 7.1 */
# 0x4067, /* kodak Hero 9.1 */

192
backend/kodakaio.h 100644
Wyświetl plik

@ -0,0 +1,192 @@
/*
* kodakaio.c - SANE library for Kodak ESP Aio scanners.
*
* Copyright (C) 2011-2012 Paul Newall
*
* Based on the Magicolor sane backend:
* Based on the epson2 sane backend:
* Based on Kazuhiro Sasayama previous
* work on epson.[ch] file from the SANE package.
* Please see those files for additional copyrights.
* Author: Paul Newall
*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation, version 2.
*/
#ifndef kodakaio_h
#define kodakaio_h
#undef BACKEND_NAME
#define BACKEND_NAME kodakaio
#define DEBUG_NOT_STATIC
#include <sys/ioctl.h>
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef NEED_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <stdio.h>
#include "../include/sane/sane.h"
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_backend.h"
#ifdef __GNUC__
#define __func__ __FUNCTION__
#else
#define __func__ "(undef)"
#endif
/* Silence the compiler for unused arguments */
#define NOT_USED(x) ( (void)(x) )
#define KODAKAIO_CONFIG_FILE "kodakaio.conf"
#define NUM_OF_HEX_ELEMENTS (16) /* number of hex numbers per line for data dump */
#define DEVICE_NAME_LEN (16) /* length of device name in extended status */
#define CAP_DEFAULT 0
/* Structure holding the device capabilities */
struct KodakaioCap
{
SANE_Word id;
const char *cmds; /* may be used for different command sets in future */
const char *model;
SANE_Int out_ep, in_ep; /* USB bulk out/in endpoints */
SANE_Int optical_res; /* optical resolution */
SANE_Range dpi_range; /* max/min resolutions */
SANE_Int *res_list; /* list of resolutions */
SANE_Int res_list_size; /* number of entries in this list */
SANE_Int maxDepth; /* max. color depth */
SANE_Word *depth_list; /* list of color depths */
/* SANE_Range brightness; brightness range */
SANE_Range fbf_x_range; /* flattbed x range */
SANE_Range fbf_y_range; /* flattbed y range */
SANE_Bool ADF; /* ADF is installed */
SANE_Bool adf_duplex; /* does the ADF handle duplex scanning */
SANE_Range adf_x_range; /* autom. document feeder x range */
SANE_Range adf_y_range; /* autom. document feeder y range */
};
/*
Options:OPT_BRIGHTNESS, used to be after BIT_DEPTH
*/
enum {
OPT_NUM_OPTS = 0,
OPT_MODE_GROUP,
OPT_MODE,
OPT_BIT_DEPTH,
OPT_RESOLUTION,
OPT_PREVIEW,
OPT_SOURCE,
OPT_ADF_MODE,
OPT_GEOMETRY_GROUP,
OPT_TL_X,
OPT_TL_Y,
OPT_BR_X,
OPT_BR_Y,
NUM_OPTIONS
};
typedef enum
{ /* hardware connection to the scanner */
SANE_KODAKAIO_NODEV, /* default, no HW specified yet */
SANE_KODAKAIO_USB, /* USB interface */
SANE_KODAKAIO_NET /* network interface */
} Kodakaio_Connection_Type;
/* Structure holding the hardware description */
struct Kodak_Device
{
struct Kodak_Device *next;
int missing;
char *name;
char *model;
SANE_Device sane;
SANE_Range *x_range; /* x range w/out extension */
SANE_Range *y_range; /* y range w/out extension */
Kodakaio_Connection_Type connection;
struct KodakaioCap *cap;
};
typedef struct Kodak_Device Kodak_Device;
/* Structure holding an instance of a scanner (i.e. scanner has been opened) */
struct KodakAio_Scanner
{
struct KodakAio_Scanner *next;
struct Kodak_Device *hw;
int fd;
SANE_Option_Descriptor opt[NUM_OPTIONS];
Option_Value val[NUM_OPTIONS];
SANE_Parameters params;
SANE_Bool eof;
SANE_Byte *buf, *end, *ptr;
SANE_Bool canceling;
SANE_Bool scanning; /* scan in progress */
SANE_Bool adf_loaded; /* paper in adf */
SANE_Int left, top; /* in optres units? */
SANE_Int width, height; /* in optres units? */
/* image block data */
SANE_Int data_len;
SANE_Int block_len;
SANE_Int last_len; /* to be phased out */
SANE_Int blocks; /* to be phased out */
SANE_Int counter;
SANE_Int bytes_unread; /* to track when to stop */
/* store how many bytes of the current pixel line we have already
* read in previous read attempts. Since each line will be padded
* to multiples of 512 bytes, this is needed to know which bytes
* to ignore */
SANE_Int bytes_read_in_line;
SANE_Byte *line_buffer;
/* How many bytes are scanned per line */
SANE_Int scan_bytes_per_line;
};
typedef struct KodakAio_Scanner KodakAio_Scanner;
struct mode_param
{
int flags;
int colors;
int depth;
};
enum {
MODE_GRAY, MODE_COLOR
};
#endif

36
configure vendored
Wyświetl plik

@ -4971,6 +4971,7 @@ fi
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@ -7579,6 +7580,7 @@ if test -n "$LIBV4L_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@ -7595,6 +7597,7 @@ if test -n "$LIBV4L_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@ -7614,9 +7617,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l1" 2>&1`
LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libv4l1" 2>&1`
else
LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1`
LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libv4l1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBV4L_PKG_ERRORS" >&5
@ -7660,6 +7663,7 @@ if test -n "$AVAHI_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.24 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@ -7676,6 +7680,7 @@ if test -n "$AVAHI_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.24 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@ -7695,9 +7700,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " avahi-client >= 0.6.24 " 2>&1`
AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " avahi-client >= 0.6.24 " 2>&1`
else
AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors " avahi-client >= 0.6.24 " 2>&1`
AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " avahi-client >= 0.6.24 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$AVAHI_PKG_ERRORS" >&5
@ -9541,6 +9546,20 @@ $as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h
fi
nl added by PN 3/2/12 to detect cups
$as_echo "checking for cups"
if test -e /usr/include/cups/cups.h ; then
$as_echo "#define HAVE_CUPS 1" >>confdefs.h
with_cups="yes"
LIBS="-lcups $LIBS"
else
$as_echo "cups.h not found, you may want to install a cups development package"
$as_echo "in order to autodetect network scanners in kodakaio."
with_cups="no"
fi
# Check whether --enable-libusb_1_0 was given.
if test "${enable_libusb_1_0+set}" = set; then :
@ -9645,6 +9664,7 @@ if test -n "$LIBUSB_1_0_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBUSB_1_0_CFLAGS=`$PKG_CONFIG --cflags " libusb-1.0 >= 1.0.0 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@ -9661,6 +9681,7 @@ if test -n "$LIBUSB_1_0_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBUSB_1_0_LIBS=`$PKG_CONFIG --libs " libusb-1.0 >= 1.0.0 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@ -9680,9 +9701,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libusb-1.0 >= 1.0.0 " 2>&1`
LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libusb-1.0 >= 1.0.0 " 2>&1`
else
LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --print-errors " libusb-1.0 >= 1.0.0 " 2>&1`
LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libusb-1.0 >= 1.0.0 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBUSB_1_0_PKG_ERRORS" >&5
@ -17658,7 +17679,7 @@ ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \
coolscan coolscan2 coolscan3 dc25 dc210 dc240 \
dell1600n_net dmc epjitsu epson epson2 fujitsu genesys \
gphoto2 gt68xx hp hp3500 hp3900 hp4200 hp5400 \
hp5590 hpsj5s hpljm1005 hs2p ibm kodak kvs1025 kvs20xx \
hp5590 hpsj5s hpljm1005 hs2p ibm kodak kodakaio kvs1025 kvs20xx \
kvs40xx leo lexmark ma1509 magicolor \
matsushita microtek microtek2 mustek mustek_pp \
mustek_usb mustek_usb2 nec net niash pie pint \
@ -20980,6 +21001,7 @@ fi
echo "IPv6 support: `eval eval echo ${ipv6}`"
echo "Avahi support: `eval eval echo ${enable_avahi}`"
echo "SNMP support: `eval eval echo ${with_snmp}`"
echo "CUPS support: `eval eval echo ${with_cups}`"
echo "-> The following backends will be built:"
for backend in ${BACKENDS} ; do
echo $ECHO_N "${backend} "

Wyświetl plik

@ -326,6 +326,18 @@ if test -c /dev/urandom ; then
AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
fi
nl added by PN 3/2/12 to detect cups
$as_echo "checking for cups"
if test -e /usr/include/cups/cups.h ; then
AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
with_cups="yes"
LIBS="-lcups $LIBS"
else
$as_echo "cups.h not found, you may want to install a cups development package"
$as_echo "in order to autodetect network scanners in kodakaio."
with_cups="no"
fi
dnl ***********
dnl USB Support
dnl ***********
@ -571,7 +583,7 @@ ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \
coolscan coolscan2 coolscan3 dc25 dc210 dc240 \
dell1600n_net dmc epjitsu epson epson2 fujitsu genesys \
gphoto2 gt68xx hp hp3500 hp3900 hp4200 hp5400 \
hp5590 hpsj5s hpljm1005 hs2p ibm kodak kvs1025 kvs20xx \
hp5590 hpsj5s hpljm1005 hs2p ibm kodak kodakaio kvs1025 kvs20xx \
kvs40xx leo lexmark ma1509 magicolor \
matsushita microtek microtek2 mustek mustek_pp \
mustek_usb mustek_usb2 nec net niash pie pint \
@ -771,6 +783,7 @@ fi
echo "IPv6 support: `eval eval echo ${ipv6}`"
echo "Avahi support: `eval eval echo ${enable_avahi}`"
echo "SNMP support: `eval eval echo ${with_snmp}`"
echo "CUPS support: `eval eval echo ${with_cups}`"
echo "-> The following backends will be built:"
for backend in ${BACKENDS} ; do
echo $ECHO_N "${backend} "

Wyświetl plik

@ -22,7 +22,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
sane-matsushita.5 sane-microtek.5 sane-microtek2.5 sane-mustek.5 \
sane-nec.5 sane-net.5 sane-pie.5 sane-pint.5 sane-pnm.5 \
sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 \
sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 sane-kodakaio.5 \
sane-fujitsu.5 sane-sharp.5 sane-s9036.5 sane-tamarack.5 \
sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.5 \
sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
@ -46,7 +46,7 @@ EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \
sane-microtek2.man sane-mustek.man sane-nec.man sane-net.man \
sane-pie.man sane-pint.man sane-pnm.man sane-umax.man \
sane-qcam.man sane-scsi.man sane-artec.man sane-fujitsu.man \
sane-sharp.man sane-s9036.man sane-tamarack.man sane-kodak.man \
sane-sharp.man sane-s9036.man sane-tamarack.man sane-kodak.man sane-kodakaio.man\
sane-ricoh.man sane-avision.man sane-plustek.man sane-st400.man \
sane-mustek_pp.man sane-dc210.man sane-v4l.man sane-snapscan.man \
sane-canon.man sane-coolscan.man sane-bh.man sane-dc240.man \
@ -174,8 +174,8 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
descriptions/hp3900.desc descriptions/hp4200.desc descriptions/hp5400.desc \
descriptions/hp5590.desc descriptions/hp.desc descriptions/hpljm1005.desc \
descriptions/hpsj5s.desc descriptions/hs2p.desc descriptions/ibm.desc \
descriptions/kodak.desc descriptions/kvs1025.desc descriptions/kvs20xx.desc \
descriptions/kvs40xx.desc \
descriptions/kodak.desc descriptions/kodakaio.desc descriptions/kvs1025.desc \
descriptions/kvs20xx.desc descriptions/kvs40xx.desc \
descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \
descriptions/magicolor.desc \
descriptions/matsushita.desc descriptions/microtek2.desc \

Wyświetl plik

@ -269,24 +269,25 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
sane-mustek.man sane-nec.man sane-net.man sane-pie.man \
sane-pint.man sane-pnm.man sane-umax.man sane-qcam.man \
sane-scsi.man sane-artec.man sane-fujitsu.man sane-sharp.man \
sane-s9036.man sane-tamarack.man sane-kodak.man sane-ricoh.man \
sane-avision.man sane-plustek.man sane-st400.man \
sane-mustek_pp.man sane-dc210.man sane-v4l.man \
sane-snapscan.man sane-canon.man sane-coolscan.man sane-bh.man \
sane-dc240.man sane-umax_pp.man sane-umax1220u.man \
sane-sm3600.man sane-usb.man sane-mustek_usb.man \
sane-sceptre.man sane-canon_pp.man sane-canon630u.man \
sane-teco1.man sane-teco2.man sane-teco3.man sane-test.man \
sane-sp15c.man sane-coolscan2.man sane-hpsj5s.man \
sane-gt68xx.man sane-artec_eplus48u.man sane-ma1509.man \
sane-ibm.man sane-hp5400.man sane-plustek_pp.man sane-u12.man \
sane-niash.man sane-sm3840.man sane-genesys.man \
sane-hp4200.man sane-mustek_usb2.man sane-hp3500.man \
sane-pixma.man sane-stv680.man sane-hp5590.man \
sane-hpljm1005.man sane-cardscan.man sane-hp3900.man \
sane-epjitsu.man sane-hs2p.man sane-canon_dr.man \
sane-xerox_mfp.man sane-rts8891.man sane-coolscan3.man \
sane-kvs1025.man sane-kvs20xx.man sane-kvs40xx.man sane-p5.man \
sane-s9036.man sane-tamarack.man sane-kodak.man \
sane-kodakaio.man sane-ricoh.man sane-avision.man \
sane-plustek.man sane-st400.man sane-mustek_pp.man \
sane-dc210.man sane-v4l.man sane-snapscan.man sane-canon.man \
sane-coolscan.man sane-bh.man sane-dc240.man sane-umax_pp.man \
sane-umax1220u.man sane-sm3600.man sane-usb.man \
sane-mustek_usb.man sane-sceptre.man sane-canon_pp.man \
sane-canon630u.man sane-teco1.man sane-teco2.man \
sane-teco3.man sane-test.man sane-sp15c.man sane-coolscan2.man \
sane-hpsj5s.man sane-gt68xx.man sane-artec_eplus48u.man \
sane-ma1509.man sane-ibm.man sane-hp5400.man \
sane-plustek_pp.man sane-u12.man sane-niash.man \
sane-sm3840.man sane-genesys.man sane-hp4200.man \
sane-mustek_usb2.man sane-hp3500.man sane-pixma.man \
sane-stv680.man sane-hp5590.man sane-hpljm1005.man \
sane-cardscan.man sane-hp3900.man sane-epjitsu.man \
sane-hs2p.man sane-canon_dr.man sane-xerox_mfp.man \
sane-rts8891.man sane-coolscan3.man sane-kvs1025.man \
sane-kvs20xx.man sane-kvs40xx.man sane-p5.man \
sane-magicolor.man sane.man saned.man descriptions.txt \
releases.txt sane-logo2.jpg sane-logo.png sane.png sane.tex \
net.tex html.sty $(DESC_FILES) descriptions/template.desc. \
@ -303,7 +304,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
sane-matsushita.5 sane-microtek.5 sane-microtek2.5 sane-mustek.5 \
sane-nec.5 sane-net.5 sane-pie.5 sane-pint.5 sane-pnm.5 \
sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 \
sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 sane-kodakaio.5 \
sane-fujitsu.5 sane-sharp.5 sane-s9036.5 sane-tamarack.5 \
sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.5 \
sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
@ -383,8 +384,8 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
descriptions/hp3900.desc descriptions/hp4200.desc descriptions/hp5400.desc \
descriptions/hp5590.desc descriptions/hp.desc descriptions/hpljm1005.desc \
descriptions/hpsj5s.desc descriptions/hs2p.desc descriptions/ibm.desc \
descriptions/kodak.desc descriptions/kvs1025.desc descriptions/kvs20xx.desc \
descriptions/kvs40xx.desc \
descriptions/kodak.desc descriptions/kodakaio.desc descriptions/kvs1025.desc \
descriptions/kvs20xx.desc descriptions/kvs40xx.desc \
descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \
descriptions/magicolor.desc \
descriptions/matsushita.desc descriptions/microtek2.desc \

Wyświetl plik

@ -0,0 +1,147 @@
:backend "kodakaio"
:url "http://sourceforge.net/projects/cupsdriverkodak/"
:version "2.4"
:manpage ""
:comment "New backend for Kodak aio ESP and Hero printers"
:devicetype :scanner
:new :yes
:mfg "Kodak"
:url "http://www.kodak.com/"
;======================================
; ESP series
:model "ESP 2150"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 2150"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 2170"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 3200"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 3300"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 4100"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 5000"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 5100"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 5200"
:interface "USB Ethernet"
:status :basic
:comment "USB good, Network good"
:model "ESP 5300"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 5500"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 6100"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 7200"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 9200"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 5"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 7"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP 9"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP C110"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP C115"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP C310"
:interface "USB"
:status :untested
:comment "Please test!"
:model "ESP C315"
:interface "USB"
:status :untested
:comment "Please test!"
;======================================
; Hero series
:model "Hero 3.1"
:interface "USB"
:status :untested
:comment "Please test!"
:model "Hero 5.1"
:interface "USB"
:status :untested
:comment "Please test!"
:model "Hero Office 6.1"
:interface "USB"
:status :untested
:comment "Please test!"
:model "Hero 7.1"
:interface "USB"
:status :untested
:comment "Please test!"
:model "Hero 9.1"
:interface "USB Ethernet"
:status :basic
:comment "USB good, Network good"

Wyświetl plik

@ -0,0 +1,40 @@
.TH sane\-kodakaio 2.4 "17 Jun 2012" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-kodakaio
.SH NAME
sane\-kodakaio \- SANE backend for Kodak aio printer / scanners
.SH DESCRIPTION
The
.B sane\-kodakaio
library implements a SANE (Scanner Access Now Easy) backend which
provides access to Kodak aio printer / scanners, like the ESP and Hero series.
This document describes backend version 2.4, which is the first candidate for
incorporation in sane-backends.
.SH SUPPORTED HARDWARE
This version should support models of the Kodak ESP and Hero series, and possibly some
Advent AiO scanners. The ESP 5250 and Hero 9.1 were used to develop the backend,
but other models may work. Please see the desc file.
If you have a model not on that list, or reported as 'untested': the best way
to determine level of support is to test the scanner directly.
.SH CONFIGURATION FILE
The configuration file "kodakaio.conf" is used to tell the backend how to look
for scanners, and provide options controlling the operation of the backend.
This file is read each time the frontend asks the backend for a list
of scanners, generally only when the frontend starts.
.SH ENVIRONMENT
The backend uses a single environment variable, SANE_DEBUG_KODAKAIO, which
enables debugging output to stderr.
.SH KNOWN ISSUES
Most hardware options are either not supported or not exposed for control by
the user, including: multifeed detection, image compression etc.
.PP
.SH AUTHOR
P. Newall

Wyświetl plik

@ -325,6 +325,11 @@ The SANE backend for some large Kodak scanners. See
.BR sane\-kodak (5)
for details.
.TP
.B kodakaio
The SANE backend for Kodak AiO printer/scanners. See
.BR sane\-kodakaio (5)
for details.
.TP
.B kvs1025
The SANE backend for Panasonic KV-S102xC scanners. See
.BR sane\-kvs1025 (5)

Wyświetl plik

@ -61,6 +61,9 @@
/* Define to 1 if you have the `cfmakeraw' function. */
#undef HAVE_CFMAKERAW
/* Is /usr/include/cups/cups.h available? */
#undef HAVE_CUPS
/* Define to 1 if you have the <ddk/ntddscsi.h> header file. */
#undef HAVE_DDK_NTDDSCSI_H