Wykres commitów

274 Commity (d07bb2eee836c8aafdbffcbffa6fe3c8ea0f960d)

Autor SHA1 Wiadomość Data
Karl Heinz Kremer 3d057d04c6 Applied Henning's patch, Fixed some compiler warnings. 2006-06-11 19:46:09 +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
Wittawat Yamwong 2baa01effa Modified sanei_read_int(): call usb_clear_halt() if and only if the endpoint
is halted.
2006-05-26 07:58:15 +00:00
Henning Geinitz 92d177c049 Added USB support for DragonFlyBSD (bug #303183). 2006-03-11 12:56:34 +00:00
Henning Geinitz 1695dd4278 Workaround for compilation problem on Windows/cygwin. 2006-02-04 20:51:07 +00:00
Henning Geinitz 2b425ad61c Added checks for altsetting =! 0. 2006-01-22 16:52:13 +00:00
Mattias Ellert 6f301b10ed Fixing compilation warnings 2006-01-22 09:04:41 +00:00
Henning Geinitz a157bd3f09 Added warning if libusb support is not built in and some more debug messages. 2006-01-07 18:04:17 +00:00
Gerhard Jaeger 29c677e984 Fixed problem, when the device name contains one or more
path-separators. These characters are now converted. The
problem occurs on 2.4 based installations as well as on OpenBSD.
2005-12-07 13:49:39 +00:00
Jochen Eisinger eb446e2de1 2005-11-28 Jochen Eisinger <jochen@penguin-breeder.org>
* sanei/sanei_pa4s2.c: incorrect test of a bit mask.
2005-11-28 22:24:17 +00:00
Mattias Ellert cfd52e328f Adding some debugging. Fixing some warnings. 2005-11-22 21:17:20 +00:00
Oliver Schwartz 034f05523d Fixes for Benq 5000 2005-11-02 19:22:06 +00:00
Henning Geinitz f85bbc0a0b Added support for detecting vendor and product id with FreeBSD kernel scanner
driver (based on patch in FreeBSD ports).
2005-11-01 20:57:03 +00:00
Henning Geinitz 947339db25 Run "makedepend" if it's available. This way "make" builds
backends correctly even if only included files (e.g. headers) are
	  changed. Don't be too verbose when running makedepend.
	  Create links libsane-*.so.1 to the real library files if the
	  links are not there. This fixes dynamic loading on OpenBSD. The
	  links are not created for MacOS X as they don't work there.
	  Remove any libsane.* links in /usr/local/lib/sane. Such links
	  are created by libtool. As they point to libsane-v4l.so,
	  scanimage -L doesn't find any scanner in case of ld.so
	  misconfigurations.
	  The install target is much quiter now and prints the libtool
	  message only once now.
2005-10-29 20:01:54 +00:00
Henning Geinitz b27183004c Ignore EBUSY from usb_set_configuration. This function fails, if a different
interface of the same device is claimed (e.g. by usblp).
2005-09-23 12:52:35 +00:00
Mattias Ellert 21f94b0264 Fix SANE_DEBUG_SANEI_PV8630 2005-09-22 19:02:25 +00:00
Henning Geinitz 4b2d240870 Minor fixes for usbcalls interface (patch from Paul Smedley <paul@smedley.info>). 2005-08-09 16:28:38 +00:00
Henning Geinitz b29ea31da2 Fixed some compilation warnings. 2005-08-07 15:53:03 +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 00e9b16d58 Removed "const" to make gcc on OS/2 happy. 2005-07-17 16:18:34 +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
Henning Geinitz 2dd4b1822c Fixed comment (we still use 30 seconds USB timeout by default). 2005-07-15 18:16:35 +00:00
Rene Rebe e5193fdcae Added support to set the USB timeout. 2005-07-15 09:02:02 +00:00
Gerhard Jaeger 87b05d4524 Added PATH_MAX, in case it's not defined by any
header (i.e. OS/2).
2005-05-10 06:51:25 +00:00
Gerhard Jaeger 7cc112b202 Added outb_eppdata() functionality (thanks to Anderson Lizardo). 2005-04-25 09:51:32 +00:00
Gerard Klaver 7e1d450ca9 -More debug info for control and isochronous mode
-Detects endpoints for different configurations, interface and
altsetting numbers > 0
- Routine 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:48:24 +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 ada4c07892 Added sanei_access.c 2005-04-01 14:03:52 +00:00
Gerhard Jaeger 7193bf15f9 Cleanup, uses now static array for parport
management instead of dynamically allocated.
Fixes at least a potential memory leak.
2005-02-08 11:32:14 +00:00
Rene Rebe 2d579021a0 2004-11-19 Rene Rebe <rene@exactcode.de>
* sanei/sanei_usb.c configure.in: use usb_interrupt_read instead of
          usb_bulk_read for sanei_usb_read_int. Fixes bug #300878. Added a                missing DBG output in sanei_usb_read_int. Check for
          usb_interrupt_read to make sure, we have at least version 0.1.8.
2004-11-19 16:44:32 +00:00
Frank Zago 5cab9b20c7 fixes for 64 bits platforms. 2004-11-13 19:43:01 +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
Gerhard Jaeger 0fb34bb098 Added missing pthread_detach() so the thread resources could be reused again. 2004-10-14 06:51:17 +00:00
Henning Geinitz af58065746 64 bit platform fixes (bug #300799). 2004-10-03 17:34:36 +00:00
Gerhard Jaeger 62e590d341 Removed "wrong" return... 2004-08-30 13:26:41 +00:00
Gerhard Jaeger d27a5ab9ce Fixed memory leak. 2004-08-30 11:52:15 +00:00
Gerhard Jaeger ab64285ff9 Added resource manager library support. 2004-07-26 15:15:39 +00:00
Gerhard Jaeger 31633a2f0e Cleanup work. 2004-07-16 11:49:16 +00:00
Mattias Ellert ac9ec0ff1c Missed one... 2004-06-20 01:22:44 +00:00
Mattias Ellert 3458605b55 SCSI scanners can now be selected by LUN on MacOS X
sane-find-scanner now finds SCSI scanners on MacOS X
making some sanei_scsi internal functions static
2004-06-19 21:31:42 +00:00
Gerhard Jaeger 1cb426ee47 fixed compilation problem on HP-UX. 2004-05-22 13:54:29 +00:00
Oliver Rauch a28bd84350 Added DIR_SEP and PATH_SEP defintions for windows 2004-05-16 22:08:03 +00:00
Gerhard Jaeger c95a1a3cde fixed some warning conditions. 2004-04-14 19:33:56 +00:00
Gerhard Jaeger 7344dc079f Fixes bug-reports #300617 & #300618. 2004-04-09 12:19:47 +00:00
Jochen Eisinger 088177205c 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-09 08:50:57 +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
Henning Geinitz f99aea20cb Increased SCSI buffer size on MacOS X. Patch from Mattias Ellert, bug #300601. 2004-03-29 18:01:23 +00:00
Henning Geinitz b79b8b4db3 Fixed inconsistent error message (patch from Mattias Ellert <mattias.ellert@tsl.uu.se>). 2004-02-04 20:27:58 +00:00
Gerhard Jaeger 1fc1de58c5 Added MacOSX patch for sanei_thread_kill(). 2004-02-01 19:14:28 +00:00
Gerhard Jaeger afa13763ec fixed return value handling for sanei_wait_pid(). 2004-01-13 07:40:28 +00:00
Julien BLACHE f048679136 * sanei/sanei_pa4s2.c: libieee1284 support for scsi_pp functions. This is untested but should work. 2004-01-10 18:38:34 +00:00
Henning Geinitz e7484c515e Silenced some compilation warnings. 2003-12-27 17:48:39 +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 c4743af452 Fixed overflow (bug #300389). 2003-12-21 21:54:29 +00:00
Henning Geinitz 895dc697d3 Check for /dev/uscanner* for NetBSD and OpenBSD. Patch from bug tracker
#300373.
2003-12-06 16:36:26 +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 f5c4172119 2003-11-23 Jochen Eisinger <jochen@penguin-breeder.org>
* backend/mustek_pp.c, sanei/sanei_pa4s2.c: added support for auto
	  probing of the port
	* configure{.in}, backend/mustek_pp_ccd.*, backend/Makefile.in,
	  backend/dll.conf, doc/sane-mustek_pp_ccd.man, doc/sane.man,
	  doc/Makefile.in, doc/descriptions/mustek_pp_ccd.desc: mustek_pp_ccd
	  backend removed
	* backend/mustek_pp.conf, mustek_pp_ccd300.[ch],
	  doc/sane-mustek_pp.man, doc/descriptions/mustek_pp.desc: fixed CCD
	  support for mustek_pp backend
	* backend/mustek_pp_null.c: beautified debug scanner name
2003-11-24 08:58:19 +00:00
Gerhard Jaeger bf91647c3d Fixed parport mode setting in direct mode. 2003-11-04 18:20:53 +00:00
Gerhard Jaeger 84c0a8797c Fixed problem in sanei_pp_setmode(). 2003-11-04 16:10:26 +00:00
Gerhard Jaeger aad3f45c6f Fixed udelay stuff, documentation update. 2003-11-02 13:33:56 +00:00
Gerhard Jaeger 4d7c900cb9 Made sanei_pp_set_datadir work in no ieee1284 mode.
Fixed a minor bug in delay calculation.
2003-10-30 15:51:41 +00:00
Gerhard Jaeger 0b224ac076 Added functions sanei_pp_set_datadir() and sanei_pp_uses_directio(). 2003-10-29 16:51:48 +00:00
Gerhard Jaeger ba973e5a70 Fixed OS/2 compilation problems. 2003-10-27 15:07:43 +00:00
Gerhard Jaeger edfe46590a Added sanei_pp_init() and sanei_pp_udelay(). 2003-10-26 10:58:01 +00:00
Gerhard Jaeger 7905efbb09 Added sanei_pp_getmode, fixed conditional compilation stuff. 2003-10-23 15:11:45 +00:00
Gerhard Jaeger 161a762cb5 Added generic parallel-port function lib. 2003-10-22 19:15:18 +00:00
Gerhard Jaeger 22fd3e4b5b Fixed compilation errors. 2003-10-17 12:20:05 +00:00
Gerhard Jaeger bf9ea737d3 Added SIGPIPE handling, when compiled for pthread support. 2003-10-17 11:06:00 +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 fe97c01e62 Fixed segfault condition in sanei_thread_waitpid. 2003-10-10 13:01:46 +00:00
Gerhard Jaeger 73caefebca Fixed some compilation errors on Darwin and OS/2. 2003-10-10 06:57:36 +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
Henning Geinitz 3cc8ce04e2 Made some internal functions static. 2003-10-06 17:39:19 +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
Frank Zago 3bda0d541d Port to Cygwin. 2003-09-24 03:41:48 +00:00
Henning Geinitz 6210c9a282 Actually return 0 if there is no second quotation mark. 2003-09-21 08:57:21 +00:00
Henning Geinitz 2cf12103d8 Added support for the MacOS X IOKit SCSI Architecture Model API. Added support
for Firewire scanners. Patch from Guy Brooker <guy_brooker@mac.com>.
2003-08-21 10:33:34 +00:00
Henning Geinitz a4e842d946 Minor cleanup from the jpeg move. Reverted frontend link order. 2003-07-26 21:40:06 +00:00
Henning Geinitz 6329fa602d Added GPL + SANE exception license. 2003-07-26 17:49:10 +00:00
Peter Fales aa9845ccd1 Move jpeg files to sanei 2003-07-26 17:07:36 +00:00
Peter Fales 94b53bbd61 Put back changes that weren're ready to commit yet 2003-07-26 03:34:50 +00:00
Peter Fales afb823152a Move sanei_jpeg.c from backend directory to sanei directory 2003-07-26 03:04:41 +00:00
Abel Deuring ee430a8af6 2003-07-17 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sanei/sanei_scsi.c: improved SCSI error handling in
          sanei_scsi_cmd2 for FREEBSD_CAM_INTERFACE
2003-07-17 20:35:25 +00:00
Henning Geinitz 8007efa1a3 Enable close_on_exec in sanei_usb_open. 2003-07-17 15:05:14 +00:00
Jochen Eisinger 5acbad270b 2003-06-05 Jochen Eisinger <jochen.eisinger@gmx.de>
* include/sane/sanei_pa4s2.h, sanei/sanei_pa4s2.c: New sanei_pa4s2
	  version supporting both raw IO and libieee1284. If you don't
	  have libieee1284 installed, you need to enable raw IO when
	  running configure
2003-06-06 09:52:04 +00:00
Henning Geinitz fcd3e424a8 Fixed C++-like code for MacOS X (patch from Mattias Ellert
<mattias.ellert@tsl.uu.se>).
2003-06-04 18:55:38 +00:00
Henning Geinitz 30812eaa05 Added SCSI support for MacOS X (from Mattias Ellert
<mattias.ellert@tsl.uu.se>).
2003-04-30 23:02:17 +00:00
Henning Geinitz 74de40f1da Removed Frank's memleak fix. The memory is allocated only once in
sanei_usb_init, not in sanei_usb_open.  So releasing it in sanei_usb_close
breaks backends that open devices more than once.
2003-04-20 14:59:07 +00:00
Frank Zago a188d9febc Added some debug traces. 2003-04-19 03:58:44 +00:00
Frank Zago bce2146bd0 Fixed memleak. 2003-04-19 03:57:06 +00:00
Henning Geinitz 967a3b2a37 Fixed some warnings. 2003-04-02 22:41:54 +00:00
Henning Geinitz 3e84a1d216 Removed unnecessary variable. 2003-04-02 22:14:57 +00:00
Henning Geinitz 90fa11913c Added a function to print the buffer contents for the read and write
functions. Fixed some DBGs. Fixed a wrong return value.
2003-04-02 18:05:01 +00:00
Rene Rebe a6858b5057 Support for interrupt endpoint reads:
/** Initiate a interrupt transfer read.
 *
 * Read up to size bytes from the interrupt endpoint from the device to
 * buffer. After the read, size contains the number of bytes actually read.
 *
 * @param dn device number
 * @param buffer buffer to store read data in
 * @param size size of the data
 *
 * @return
 * - SANE_STATUS_GOOD - on succes
 * - SANE_STATUS_EOF - if zero bytes have been read
 * - SANE_STATUS_IO_ERROR - if an error occured during the read
 * - SANE_STATUS_INVAL - on every other error
 *
 */
2003-03-24 01:36:27 +00:00
Henning Geinitz 8ea8fe0223 Increased stacksize for thread. Patch from Franz Bakan <fbakan@gmx.net>. 2003-03-16 11:05:11 +00:00