Wykres commitów

251 Commity (66fb96d9ad04a901824a0ab14269b525fbbbf7c4)

Autor SHA1 Wiadomość Data
Mattias Ellert 7d909bb234 cut and paste error correction. 2009-02-01 14:37:46 +00:00
Chris Bagwell 23ff26f9a5 * acinclude.m4, configure.in: Put all libraries into their
own *_LIB variables instead of $LIB so that we do not have to
link in the world to all executables. Modified SANE_CHECK_U_TYPES
to be a little more portable to platforms that use #define
for u_* types. Create SANE_CHECK_BACKENDS macro so that
PRELOADABLE_BACKENDS can also be valided.  Auto-populated
PRELAODABLE_BACKENDS when detect dlopen() won't work.
Various protability cleanups.
* backend/dll.c: Make dll-preload.c a .h since its an include and
not compilable byitself.
* frontend/Makefile.in, frontend/scanimage.c, include/laaloca.h,
  lib/Makefile.am, lib/alloca.c, strcasestr.c, tools/Makefile.in,
  tools/sane-desc.c: Convert lib/ to automake.  Create a liblib.la
  for everyone to use and a libfelib.la for only frontend programs.
  Make all internal programs be prefixed with sanei_ as not to conflict
  with other programs libsane is linked in with that will also most
  likely create similar internal utils on problem platforms.
  * include/getopt.h, lib/getopt.c, lib/getopt1.c: Always compile
  and link in getopt_long() but prefix it with sanei_.  Its
  easier to always use internal version then try to figure out what
  platforms support getopt_long() and what header files to use.
  * backend/Makefile.am: Convert backend makefile to automake.
  Initial version that is feature parity with original but uses
  specific rules instead of wildcards and only links in libraries/objs
  really required. Room for more cleanup of whats linked in once
  all makefiles have been converted to automake.
2009-01-31 03:12:18 +00:00
Chris Bagwell b52b0c0c14 * backend/epson2.c backend/pixma_bjnp.c, include/sane/sanei_backend.h,
sanei/sanei_tcp.c, sanie/sanei_udp.c: Improve portablity by
  removing usage of MSG_WAITALL since not all platforms support
  that (cygwin).  Default is to be blocking anyways.  Changed
  usage of MSG_NOTWAIT to use fcntl() function as needed as well.
  * configure.in, lib/Makefile.in, lib/strcasestr.c: Add internal
  strcasestr() for platforms missing it (cygwin).
  * pixma_common.c: My source match header prototype for picky
  compilers (cygwin).
  * backend/umax_pp_mid.c: Allow BACKEND_NAME to be filename
  yet debug to be SANE_DEBUG_UMAX_PP to match man page.
2009-01-29 15:10:19 +00:00
m. allan noah 9afc59953a Revert mistaken commit of half-finished code 2009-01-20 13:38:38 +00:00
m. allan noah 0c8a3a0775 add MFC-7840W 2009-01-20 01:41:14 +00:00
Chris Bagwell f385169bcf Convert top-level Makefile to be generated by automake.
"dist" target now includes m4 directory. Updated "libcheck"
target to look at dynamic libraries instead of static.
2009-01-18 02:00:25 +00:00
Chris Bagwell c90e23a6d2 Updates to Makefiles to prepare for transition to automake.
Fix a few bugs with "all" and "uninstall" targets to work when
$(builddir) != $(srcdir).  Added $(DESTDIR) to uninstall target.
Made $(distdir) related to current directory to match automake.
2009-01-16 23:39:48 +00:00
Nicolas Martin 316027d93d MP800/MP800R fixes and TPU support added, doc updates for MP980 2008-12-21 14:51:26 +00:00
m. allan noah b57a64d79e * sanei/sanei_usb.c, include/sane/sanei_usb.h:
- shorten debug lines to fit in 80 chars
- add sanei_usb_clear_halt() required by upcoming canon_dr backend
2008-11-05 02:30:44 +00:00
Stéphane Voltz 7069ba9295 - added a SANE_CURRENT_MINOR define 2008-10-03 04:45:32 +00:00
m. allan noah ba856d2aec 2008-09-25 m. allan noah <kitno455 a t gmail d o t com>
* include/sane/saneopts.h: underscore not allowed in option names
        * frontend/scanimage.c: fix broken unknown length (-1) binary scans,
          fix invalid tiff height with unknown length scans, fix compiler warn
2008-09-25 02:39:52 +00:00
m. allan noah 7db4cb40da fix typos, improve formatting 2008-07-26 05:45:21 +00:00
m. allan noah 2dc0cb38bd separate x-resolution from resolution, and update all backends that use
it, to prevent ui change
2008-07-26 03:53:44 +00:00
Stéphane Voltz 9d605a2143 - doxygen fix 2008-07-10 05:46:01 +00:00
Stéphane Voltz c74a1be430 - add support for SANE_Bool in sanei_check_value
- add sanei_constrain_value.lo to libsane dependencies
	- add makedepend for .lo files in sanei
	- add configuration parsing framework
2008-07-10 05:40:25 +00:00
m. allan noah c204b01b89 SANE 1.1.0 well-known button options 2008-05-21 18:48:30 +00:00
m. allan noah e91fea4ac1 include/sane/sane.h: add SANE_STATUS_WARMING_UP and SANE_STATUS_HW_LOCKED, remove SANE_CAP_ALWAYS_SETTABLE,add SANE_FRAME_XML, improve comments on other new frame types.
include/sane/saneopts.h: add common option groups, add new page-width and page-height well-known options
2008-05-21 01:38:12 +00:00
Mattias Ellert d5ae0bbc3d Fix for bug #306751: sanei-thread with pthreads on 64 bit 2008-05-15 12:50:25 +00:00
Julien BLACHE f4ff1b74f6 Add mDNS DNS-SD support to saned and the net backend so they can announce
and discover each other automatically.

Optional at configure time, requires Avahi >= 0.6.4.
2008-04-11 17:18:19 +00:00
Julien BLACHE 8ed0d66582 Do not blindly use ftok() in snapscani_mutex_open(). Compute an IPC key based
on the product ID, bus number and device number for libusb devices; fallback
to ftok() otherwise and check the return value.
2008-03-28 20:39:02 +00:00
Julien BLACHE 59e7f02026 Remove _stdint.h and byteorder.h in the distclean target. 2008-03-20 21:14:04 +00:00
Julien BLACHE dedf081f7e Revert unintentionally committed code. 2008-03-15 15:35:04 +00:00
Julien BLACHE c394bbb726 Fix typo in sanei_usb.h. 2008-03-15 14:57:51 +00:00
Alessandro Zummo bd8ece51d8 configure, configure.in, include/sanei.h: bumped version
number to 1.1.0 and enabled 1.1 frame types.
2008-02-19 10:37:06 +00:00
m. allan noah 753706f6e7 fix broken DISTFILES, etc 2008-02-10 23:02:31 +00:00
Mattias Ellert 22efa538b7 Fix warnings about ignored --datarootdir 2008-02-03 06:59:36 +00:00
Mattias Ellert 416a155ca3 make tiffio.h optional 2008-02-02 12:20:46 +00:00
m. allan noah 09f523defe remove support for SANE_FRAME_JPEG, add other frame types but commented out 2007-12-29 21:36:25 +00:00
Alessandro Zummo a386b0a960 added udp support functions 2007-12-26 11:18:26 +00:00
Mattias Ellert 0f3a068bfd Fixing doxygen warnings 2007-11-16 12:31:59 +00:00
Gerhard Jaeger 66269b670e Added sanei_usb_get_descriptor() to retrieve more info about a
device descriptor
2007-11-16 08:46:32 +00:00
Mattias Ellert 71be983cdd use SCSITaskSGElement if available 2007-11-10 15:44:41 +00:00
Mattias Ellert 93e856b53f Cross compilation fixes and libtool update 2007-11-10 07:12:55 +00:00
m. allan noah 2d543b02b7 try to make doxygen shutup when making docs for sanei/*.h
still one remaining in sanei_thread.h, but i cant figure it out
2007-07-10 16:54:54 +00:00
m. allan noah e343cc59cf * backend/fujitsu.[ch], backend/fujitsu-scsi.h: update to v1.0.50,
add JPEG support, usb command sending and scan params cleanups
* include/sane/sane.h: add SANE_FRAME_JPEG
* frontend/scanimage.c: dont crash on unknown frame types
2007-07-10 16:07:25 +00:00
Ilia Sotnikov db4174625b + Added HAVE_NETINET_IN_H define (result of the check for <netinet/in.h>
header)
2007-04-24 17:51:40 +00:00
Mattias Ellert c2df6b9677 Fix autogenerated files 2007-01-20 09:55:10 +00:00
Alessandro Zummo b400664851 2006-12-01 Alessandro Zummo <a.zummo@towertech.it>
* Added sanei_tcp interface.
2006-11-30 23:23:19 +00:00
Henning Geinitz fb0fd5a88b Disabled compilation warnings for release. 2006-06-29 19:01:38 +00:00
Gerard Klaver 1dbe87750e update with font_6x11.h (bugreport from Wittawat Yamwong) 2006-06-11 18:24:33 +00:00
Gerhard Jaeger c25e16f38a Added patch created by Vitaly Lipatov <LAV AT vl3143.spb.edu>:
Add --with-lockdir to configure for set path to lock dir
  Set PATH_SANE_LOCK_DIR really to lock dir (instead localstatedir)
Updated german translation file.
2006-06-07 07:28:31 +00:00
Gerard Klaver e662cad3fa added file for text mode in stv680 backend 2006-06-05 18:33:44 +00:00
Henning Geinitz 1695dd4278 Workaround for compilation problem on Windows/cygwin. 2006-02-04 20:51:07 +00:00
Henning Geinitz e29b6b82c5 Check for pthread_cancel() and pthread_testcancel(). 2005-10-16 20:17:19 +00:00
Henning Geinitz 2f8015cb6a Check for pthread_cancel(). 2005-10-16 20:11:48 +00:00
Henning Geinitz 64e53087da Fixed some bugs in doxygen documentation. Added some comments. 2005-10-03 18:18:02 +00:00
Mattias Ellert 21f94b0264 Fix SANE_DEBUG_SANEI_PV8630 2005-09-22 19:02:25 +00:00
Frank Zago ab5d790e26 Replaced __unused__ with __sane_unused__ to avoid a namespace conflict. 2005-09-19 19:57:48 +00:00
Henning Geinitz 2d224c4a75 Added support for usb functionality on OS/2 using the usbcalls interface (patch
from Paul Smedley <paul@smedley.info>).
2005-08-07 14:26:33 +00:00
Henning Geinitz 6c3427c52d Changes to support SANE on ZETA. Not all
patches have been applied yet, but it's a start. The backends
	  are not installed as shared libs but as add-ons, which are shared libs
	  but in a specific folder in [/system|~]/config/add-ons/ named SANE/.
	  The install target has been changed to account for this,
	  Some files don't exist in BeOS/ZETA (ipc.h, ...).
	  Bbackend function names get a prefix, I suppose to avoid namespace clashes.
	  Though we do have a libdl to implement dl_open, the native way is prefered.
	  Added a --with-docdir= configure arg.
	  BeOS has a broken get[name|addr]info() from bind. This is fixed in ZETA R1.
	  libtool needs -no-undefined. Various VPATH fixes.
	  Check for <be/drivers/USB_scanner.h>, but not used yet.
	  No S_IFSOCK (sockets are fds to /dev/net/api). Stub pio code, untested.
	  Patch from Francois Revol <revol@free.fr>.
2005-07-15 21:59:25 +00:00
Rene Rebe e5193fdcae Added support to set the USB timeout. 2005-07-15 09:02:02 +00:00
Henning Geinitz 56e3295552 Make sure that getopt is not built on OS/2 (from Franz Bakan <fbakan@gmx.net>). 2005-07-09 13:19:51 +00:00
Gerhard Jaeger 7cc112b202 Added outb_eppdata() functionality (thanks to Anderson Lizardo). 2005-04-25 09:51:32 +00:00
Gerard Klaver ec5677f0b9 - Header information added for changing configuration, interface or altsetting number
sanei_usb_set_configuration
   sanei_usb_claim_interface
   sanei_usb_release_interface
   sanei_usb_set_altinterface
2005-04-15 20:56:42 +00:00
Jochen Eisinger ecdbf48171 2005-04-10 Jochen Eisinger <jochen@penguin-breeder.org>
* backend/mustek_pp.c, backend/mustek_pp.conf, sanei/sanei_pa4s2.c,
	  include/sane/sanei_pa4s2.h, doc/sane-mustek_pp.man: added global
	  option "no_epp" to work around a known bug in the linux parport
	  code.
2005-04-10 11:53:16 +00:00
Gerhard Jaeger d498239305 Initial checkin. 2005-04-01 14:04:19 +00:00
Gerhard Jaeger 0dc8dfdb88 Added sane/sanei_access.h 2005-04-01 14:00:28 +00:00
Gerhard Jaeger 65a32f52e3 ENABLE_LOCKING has been added by automake/autoconf. 2005-04-01 13:53:01 +00:00
Frank Zago ae35d558dc Move __unused__ definition from sane.h to sanei_backend.h. Fixed a typo in sanei_backend.h. 2004-11-13 20:29:14 +00:00
Frank Zago 1abeb942c2 Added compiler attribute __unused__ for unused variables/functions. 2004-11-13 19:04:44 +00:00
Henning Geinitz 008bc74603 Limit the total amount of memory used for arrays and pointers while decoding the
wire to 1 MB (bug #300158). Run "make clean" before "make"!
2004-10-14 17:15:23 +00:00
Henning Geinitz b145a332e7 Removed dangling quotation mark. 2004-10-06 11:09:14 +00:00
Henning Geinitz 53ab3cc90e Added option for turning off the scanner's lamp on exit. 2004-10-03 10:51:40 +00:00
Julien BLACHE 746faf32c9 More auth_callback() fixes, although these ones aren't critical. 2004-09-05 09:27:28 +00:00
Henning Geinitz 4ddcadc20d Regenerated to include updates from niash and resource manager inclusion. 2004-08-03 17:25:58 +00:00
Rene Rebe 472a85788d * include/sane/sane.h: added extern "C" for compilation with a C++
compiler
2004-07-15 08:32:39 +00:00
Mattias Ellert ac9ec0ff1c Missed one... 2004-06-20 01:22:44 +00:00
Matthew Duggan db931572ef 2004-05-05 Matthew Duggan <stauff1@users.sourceforge.net>
* include/sane/saneopts.h: Added SANE_VALUE_SCAN_MODE_* strings.
	* backend/canon_pp.c: Used them.
2004-05-05 00:26:42 +00:00
Jochen Eisinger 40638d29d7 2004-04-06 Jochen Eisinger <jochen@penguin-breeder.org>
* sanei/sanei_pa4s2.c include/sane/sanei_pa4s2.h, backend/mustek_pp.c:
	  fixed compiler warnings
2004-04-06 18:02:57 +00:00
Gerard Klaver 5875781246 added options: WHITE_LEVEL_R, WHITE_LEVEL_G and WHITE_LEVEL_B 2004-01-15 17:19:56 +00:00
Gerhard Jaeger 1bc71ef4dc updated copyright info. 2004-01-13 07:41:06 +00:00
Henning Geinitz 08486e6be4 Added support for Mustek Paragon 600 II EP (SCSI-over-parallel port). This is
based on a patch from James Perry. Support for libiee1284 is missing until
now. Closes bug #300143.
2003-12-25 20:27:49 +00:00
Henning Geinitz a4b0143586 Include stdlib.h for size_t. 2003-12-21 21:42:34 +00:00
Henning Geinitz 66f4a68325 sanei_scsi.c should now compile with the new and old SCSI API of MacOS X. Patch
from Mattias Ellert <mattias.ellert@tsl.uu.se>.
2003-12-06 13:38:47 +00:00
Jochen Eisinger d2b0b094d2 2003-11-23 Jochen Eisinger <jochen@penguin-breeder.org>
* backend/mustek_pp_ccd300.c: forgot parameters to wait_bank_change
	* include/sane/sanei_pa4s2.h: fixed function prototype
2003-11-24 11:25:17 +00:00
Gerhard Jaeger 5ac3ab5f90 Removed OS/2 porting section. 2003-11-02 13:34:18 +00:00
Gerhard Jaeger aad3f45c6f Fixed udelay stuff, documentation update. 2003-11-02 13:33:56 +00:00
Gerhard Jaeger ccb3053773 Added some control-port definitions. 2003-10-30 15:52:04 +00:00
Gerhard Jaeger 7c1b8b259d Added functions sanei_pp_set_datadir() and sanei_pp_uses_directio().
Added some documentation.
2003-10-29 16:52:11 +00:00
Gerhard Jaeger edfe46590a Added sanei_pp_init() and sanei_pp_udelay(). 2003-10-26 10:58:01 +00:00
Gerhard Jaeger e81cfe2818 Added check for limits.h - HAVE_LIMITS_H. 2003-10-26 10:57:16 +00:00
Henning Geinitz b311a68214 Updated doxygen documentation for new sanei_thread interface. 2003-10-24 11:23:34 +00:00
Gerhard Jaeger 1c8a6ee4cd Added sanei_pp_getmode and SANEI_PP_MODE definitions. 2003-10-23 15:11:07 +00:00
Gerhard Jaeger 161a762cb5 Added generic parallel-port function lib. 2003-10-22 19:15:18 +00:00
Gerhard Jaeger 195cacb639 Added checks for iopl. 2003-10-22 07:02:36 +00:00
Gerhard Jaeger 5ceb18a5a6 Added test for setitimer. 2003-10-15 15:40:27 +00:00
Gerhard Jaeger cba31cdf64 Copyright update. 2003-10-13 07:16:54 +00:00
Gerhard Jaeger cd7b8f8cb2 Fixed OS/2 compilation. 2003-10-13 07:16:09 +00:00
Gerhard Jaeger 1f8c02707d Improved OS/2 support. 2003-10-12 15:39:04 +00:00
Gerhard Jaeger 25a38b2739 improved support of pthreads, changed behaviour of sanei_thread_kill(),
added functions sanei_thread_sendsig() and sanei_thread_get_status()
changed behaviour of sanei_thread_waitpid(), changed parameters
of sanei_thread_begin()
2003-10-08 20:31:15 +00:00
Henning Geinitz 3565c78d2f More verbose help messages for --enable-fork-process. Print message about
pthread support after all the tests. If libpthread isn't available, try if libc
supports pthreead_*. Use macro USE_PTHREAD to check if threads are used in the
code.
2003-10-07 11:28:03 +00:00
Gerhard Jaeger 81eaf06a10 * aclocal.m4 acinlcude.m4 configure configure.in: modified checks for
pthread support, added switch --enable-fork-process which toggles
  between the usage of fork and pthread, set the default behaviour to
  pthread usage on Darwin
* include/sane/config.h: added the HAVE_LIBPTHRAD stuff
* sanei/sanei_thread.c include/sane/sanei_thread.h: fixed compilation issue
  on OS/2, added support for fork too, so that we can use sanei_thread
  functions in any case.
* backend/plustek.[ch]: changes due to the sanei_thread-lib work
2003-10-07 07:38:37 +00:00
Gerhard Jaeger 39044887ca * aclocal.m4 configure configure.in: added checks for pthread.h and
added linker option -lpthread if pthread.h is found
* include/sane/config.in.h: added HAVE_PTHREAD_H
* sanei/sanei_thread.c include/sane/sanei_thread.h: added pthread_
  functions to library, so every backend is able to use either fork or
  pthread for its reader-process - see plustek backend for example
* backend/plustek.h backend/plustek.c: added sanei_thread stuff to support
  threading on MacOS X
* backend/plustek_pp*: some cleanup
2003-10-05 16:00:30 +00:00
Henning Geinitz 345401d726 Fixed some missing or duplicated spaces in option descriptions. 2003-10-05 11:43:20 +00:00
Henning Geinitz 6cc4885daa Minor fixes for sanei documentation. 2003-09-30 14:14:14 +00:00
Henning Geinitz fe31e3389c Updated links. 2003-09-24 15:57:14 +00:00
Frank Zago 3bda0d541d Port to Cygwin. 2003-09-24 03:41:48 +00:00
Stéphane Voltz 929c5c9e75 * backend/sane-umax_pp.c: fix default port address handling
(patch from Malcolm Parsons <malcolm.parsons@virgin.net>)
  	* configure.in configure include/sane/config.h.in: added detection of
	  machine/cpufunc.h and i386_set_ioperm() for FreeBSD support.
2003-09-18 05:17:23 +00:00
Henning Geinitz 0e70e29baf Moved union Option_Value from backend header files to sanei_backend.h. No need
to copy it over and over again. Changed header inclusion order in backend
files to include backend.h after sanei_backend.h. Based on a patch from stef
<stef-listes@wanadoo.fr>.
2003-09-12 16:10:33 +00:00
Henning Geinitz a4e842d946 Minor cleanup from the jpeg move. Reverted frontend link order. 2003-07-26 21:40:06 +00:00