Wykres commitów

248 Commity (ad02a8f1ac67a34a64b8fa7ea26cc7938e206875)

Autor SHA1 Wiadomość Data
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
Henning Geinitz 293a629d7c OS/2 specific changes: memory for SRB now is allocated using _tcalloc()
instead of allocating on stack to avoid crossing 64k borders due to
restrictions of 16-bit device-driver.  Cosmetic changes and some casts to
reduce compiler-warnings. Patch from Franz Bakan <fbakan@gmx.net>.
2003-03-16 11:04:19 +00:00
Henning Geinitz 646fbd05bc Wait for the completion of all SCSI commands in sanei_scsi_flush_all_extended
(Linux). Without this fix, especially long running commands and command
queuing would cause memory corruption if the buffer was invalid after the
flush command.
2003-03-09 19:22:43 +00:00
Henning Geinitz df7d2cda19 Added function sanei_check_value in addition to the existing
sanei_constrain_value.  It checks if the value of a sane option fits into the
constraint but doesn't try to do any fixing/rounding.
2003-03-04 22:37:39 +00:00
Henning Geinitz 6df6af8d0e Round a word list value to the nearest entry (if necessary). Code was taken
from canon backend.
2003-02-26 18:52:55 +00:00
Henning Geinitz 08af36a2e8 Call sanei_usb_init only once. 2003-02-22 15:45:51 +00:00
Henning Geinitz 5d4e2220a0 Check all acceptable interfaces instead of using the first one. 2003-02-19 19:38:26 +00:00
Henning Geinitz b625db341a usb_clear_halt should only be called in libusb mode. 2003-02-18 20:14:08 +00:00
Henning Geinitz e3ceee04be Check the IP address of the remote host before any communication occurs.
Check for a errors before trsuting values that came from remote.  Make sure
that strings are 0-terminated.
2003-02-09 11:23:41 +00:00
Jochen Eisinger 705218fb1a 2003-01-25 Jochen Eisinger <jochen.eisinger@gmx.de>
* sanei/sanei_pa4s2.c: added some #ifdefs to make it compile with
	  the Intel C++ Compiler (icc). The icc cannot expand assembler
	  inline macros (at least not with -ip)
2003-01-26 14:13:04 +00:00
Jochen Eisinger 59071c8d43 2003-01-25 Jochen Eisinger <jochen.eisinger@gmx.de>
* sanei/sanei_pa4s2.c: added some #ifdefs to make it compile with
	  the Intel C++ Compiler (icc). The icc cannot expand assembler
	  inline macros (at least not with -ip)
2003-01-26 13:43:32 +00:00
Henning Geinitz c03e019f1c Scanning for devices is now done in sanei_usb_init instead of every time when
sanei_usb_find_devices is called. Also only devices that really exist are
opened. These changes fixe the slow detection of devices on systems using
devfs or old scanner drivers.
2003-01-22 16:54:14 +00:00
Henning Geinitz bf3553aacd Fixed regeneration of libsanei.a when the object files were changed. 2003-01-22 14:48:42 +00:00
Henning Geinitz cb2e483d60 Disable the new Linux SG interface for sparc64 to work-around 32 bit userland
/ 64 bit kernel problems.
2003-01-17 12:21:16 +00:00
Henning Geinitz 8ea589819e Don't call usb_clearhalt and usb_set_altinterface to avoid errors on Mac OS X. 2003-01-15 14:27:54 +00:00
Jochen Eisinger 2cd6ff39ac 2002-01-11 Jochen Eisinger <jochen.eisinger@gmx.de>
* sanei/sanei_pa4s2.h: prepared sanei for use with fork()ing
	  backends
2003-01-11 19:47:20 +00:00
Henning Geinitz d2d3aaf90d Comment out resetep at sane_close. This function sets th USB data toggle only
on the host side.
2003-01-10 16:44:53 +00:00
Henning Geinitz d9041acb54 Explicitely set first configuration. When claiming the interface, use the
interface number from bInterfaceNumber.  Explicitely set the alternative
setting. When closing, call clear_halt, and reset_ep, and release_interface
explicitley. On errors in write/read, call clear_halt.
2002-12-30 13:51:10 +00:00
Abel Deuring a690b94687 fixed an error in sanei_scsi.c from my last commit
Abel
2002-12-07 22:17:27 +00:00
Abel Deuring aa85bb0192 sanei/sanei_scsi.c: improved error handling for Linux 2002-12-07 18:10:45 +00:00
Karl Heinz Kremer 574cea3bcb Use endpoint address with directional information instead of just the
endpoint reference. This caused problems on Darwin systems.
2002-11-03 23:43:03 +00:00
Henning Geinitz a99e4f1ecd Really check for bulk_out ep when writing. 2002-10-15 08:42:42 +00:00
Gerhard Jaeger ff6e86ef36 Major update to support Canon CIS scanner N670/676U and N650/656U 2002-09-28 11:31:53 +00:00
Abel Deuring 9659512302 sanei/sanei_scci.c doc/sanei-scsi.man:
default timeout for SCSI commmands is now 120 seconds; added
the environment variable SANE_SCSICMD_TIMEOUT to override
the default value.

Abel
2002-09-04 22:13:44 +00:00
Frank Zago 6dc27bd66d Fixed a warning. 2002-08-23 02:09:05 +00:00
Henning Geinitz 433a923082 Made libusb_timeout static. 2002-07-27 20:33:18 +00:00
Henning Geinitz d9b5733f67 Check if file is already closed.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-07-17 17:56:26 +00:00