Wykres commitów

362 Commity (99f7e7872f2619c3ebec2590b91de3fb0ca28a1a)

Autor SHA1 Wiadomość Data
Olaf Meeuwissen 04d5e4a0cf Move #include <pthread.h> to sanei_thread.h
The sanei header file may need pthread_t.  If it does, make sure it
is available.
2016-02-13 17:34:46 +09:00
Olaf Meeuwissen 57ae115eaf sanei_thread: fix [-Wmaybe-uninitialized] compiler warning 2015-12-27 18:38:16 +09:00
Olaf Meeuwissen cd3453948d sanei_usb: const_cast data buffer
The libusb_bulk_transfer() API caters to both reads and writes and
as a result of that will not take a const pointer.
2015-12-27 18:38:03 +09:00
Olaf Meeuwissen be084e0d7b sanei_usb: Move variable declarations to scope of usage
Fixes an [-Wunused-variable] when compiling without libusb.
2015-12-27 15:36:18 +09:00
Volker Diels-Grabsch baec5e0395 Use consistently __func__ instead of __FUNCTION__
Some parts of SANE used __FUNCTION__ while other parts used __func__.
Now, __func__ is used consistently throughout the SANE sources.  This
fixes all occurrences of the following GCC warning:

warning: ISO C does not support '__FUNCTION__' predefined identifier
2015-12-20 15:27:45 +09:00
Volker Diels-Grabsch 93298674d0 Merge all compatibility macros around __func__ and __FUNCTION__
Various parts of SANE introduced their own compatibility macros for
old compilers that don't support __func__.  Most of these definitions
are identical or have minor differences.  This patch replaces them
with a single instance in the central header file for backends.
2015-12-20 15:27:45 +09:00
Volker Diels-Grabsch 7c8c8e29be Remove dead code due to unused variables
This fixes some occurrences of the following GCC warning:

warning: variable '...' set but not used
2015-12-20 15:21:45 +09:00
Volker Diels-Grabsch aba87a4582 Mark internal function toupper_ascii as static
This fixes the following GCC warning:

warning: no previous prototype for 'toupper_ascii'
2015-12-20 15:10:30 +09:00
Volker Diels-Grabsch badd7025b2 Bugfix: On error, return the actual error code in sanei_magic_rotate
Up to now, on failure the sanei_magic_rotate function returned a
success status.  This fixes the following GCC warning:

warning: variable 'ret' set but not used
2015-12-20 14:43:57 +09:00
Olaf Meeuwissen f1593204c7 Drop execute permission
Source code, description files and configuration templates should never
need to be executed.
2015-11-27 21:28:09 +09:00
Olaf Meeuwissen e094c5b43b Invert sense of sanei_thread validity check
Double negatives suck.
2015-11-24 18:19:31 +09:00
Olaf Meeuwissen fe12d31e68 Fix SANE_Pid related -Wsign-compare warnings
This may fix threading related issues on WIN32 platforms, BTW.
2015-11-24 18:19:31 +09:00
Olaf Meeuwissen fff1c5962a Fix "discards 'const' qualifier from pointer target type" warnings
The line variable is not (and cannot be) declared 'const'.  The string
variable points to a location in line, hence it is safe to cast away
'const'ness of the sanei_config_skip_whitespace() return value.
2015-11-11 22:41:58 +09:00
Thomas Klausner 72ecee97ce Add DragonFly BSD support (fixes 315205) 2015-11-08 19:00:32 +09:00
Alexander Hofmann 2239d2aaff Replace obsolete interface with standard include files 2015-10-07 18:09:33 +09:00
m. allan noah 2ecf18f6fb autoheader and automake
After recent PNG and SNMP changes, need to run autoheader and automake
2015-10-02 21:53:14 -04:00
Olaf Meeuwissen 5cae68b574 Make sequence-point warning go away
Sample code that mimicks the offending code gave different run-time
results when compiled with gcc-4.9.2 and clang-3.5.0.  Rewriting the
sample code so that results matched gcc-4.9.2 for both compilers was
used to determine how to "fix" the offending statement.
2015-09-28 20:36:16 +09:00
Olaf Meeuwissen 2f72ee5b8f Remove "nested" comment 2015-09-25 20:53:42 -04:00
Olaf Meeuwissen 22b17e232a Fix various types of unused variable warnings 2015-09-25 20:53:42 -04:00
m. allan noah 87bfd53512 Run autofoo for recent changes 2015-09-19 13:39:38 -04:00
Olaf Meeuwissen eb54dbf200 Don't detach unconditionally after pthread_join() 2015-09-19 13:39:37 -04:00
Olaf Meeuwissen efb2eb7251 Add sanei_ir.h from the directory it lives in
Fixes `make dist` target.
2015-09-19 13:39:37 -04:00
Luiz Angelo Daros de Luca 8434ea9162 Define IO_SUPPORT_MISSING when inb() and outb() aren't in <sys/io.h>
Fixes link issues on OpenWRT w/ musl on MIPS.
2015-09-19 13:39:37 -04:00
m. allan noah 7566619e53 rebuild with automake 1.14.1 2015-08-31 20:58:30 -04:00
Klaus Kämpf 5337625f3a New backend pieusb
This commit adds support for (slide) scanners based
on Pacific Image Electronics (PIE) oem scan hardware.

It is known to match the following USB scanners

  PIE PowerSlide 3600       Untested
  PIE PowerSlide 3650       Untested
  PIE PowerSlide 4000       Untested
  PIE PowerSlide 5000       Untested
  Reflecta CrystalScan 7200 Untested
  Reflecta ProScan 7200     Untested
  Reflecta DigitDia 4000    Untested
  Reflecta DigitDia 5000    Untested
  Reflecta DigitDia 6000    Ok

The backend is based on work by Jan Vleeshouwers and Michael Rickmann.

Special thanks to Stéphane Voltz for the code review.

Add pieusb to backend/Makefile.am
Add pieusb to doc/Makefile.am
Add missing sanei/sanei_ir.c, sanei/sanei_ir.h, adapt Makefile.am
configure.ac: Add 'pieusb' to ALL_BACKENDS
ChangeLog: Add pieusb as new backend
Mark infrared functions as internal: sane_ir_* -> sanei_ir_*
sanei/sanei_ir.c: fix memory leaks
pieusb: rename cmdGetMode and cmdSetScanHead
	... to their sanei_pieusb_cmd_... equivalent
pieusb: rename definition_list_head to pieusb_definition_list_head
Add pieusb to AUTHORS
pieusb: copyright 2012-2015
pieusb: don't include sanei_thread.h
2015-08-31 21:07:12 +02:00
Alessandro Zummo ccd15dc966 Revert "epsonds: enable double feed detection"
This reverts commit 005c3928a5.
2015-04-26 23:09:08 +02:00
Alessandro Zummo 005c3928a5 epsonds: enable double feed detection 2015-04-26 22:44:01 +02:00
m. allan noah 014b45d920 sanei_usb: Linux USB3/xhci workarounds
add calls to sanei_usb_set_altinterface in sanei_usb_close and
sanei_usb_clear_halt- hopefully work around USB3/xhci problems
in Linux. Also, remove some unused code, and fix debug messages.
2014-12-16 10:23:55 -05:00
Olaf Meeuwissen 365b619dfe Set USB configuration only if different from the current one
This follows up on earlier USB3 fixes.  It only addresses libusb-1.0
because there is no convenience API for libusb-0.1 to get the current
configuration.
2014-12-10 21:25:08 -05:00
Olaf Meeuwissen 5283a8792e Fix memory leak w/ libusb-1.0 (introduced in 71c1a00) 2014-12-10 21:24:53 -05:00
Olaf Meeuwissen 71c1a0068f Set USB configuration only if there are alternative ones
This fixes USB3 issues for the epson and epson2 backends.  Both these
backends already made sure to send an even number of reads and writes
but were affected nevertheless.

It also solves USB3 issues with the third party epkowa backend.  This
one doesn't bother to ensure even counts of packets read and written.
It works fine when this fix is applied (and it no longer clears halts
w/o a stall condition).  Note, there is no need to ensure even packet
counts.
2014-12-10 21:18:20 -05:00
Nils Philippsen 66cb9b55c2 remove code which is never reached 2013-11-05 14:47:27 +01:00
m. allan noah 3fdf42fe7b do our own upcasing to allow backend debugging in Turkish. 2013-09-17 20:53:07 -04:00
m. allan noah 9229049d4d Revert "Use "C" LC_CTYPE when converting backend names to env vars"
This reverts commit dd4f26a805.
2013-09-17 20:43:19 -04:00
Olaf Meeuwissen dd4f26a805 Use "C" LC_CTYPE when converting backend names to env vars 2013-08-27 20:48:24 -04:00
Chris Bagwell af10791227 Improve libusb's error code for permission issues.
libusb on my Linux box is returning EACCES error when invalid
permissions exist.  Modify open to translate that into
SANE_STATUS_ECCESS_DENIED since that error description is
used for this case.

Modify sanei_usb_test.c to not treat access denied or busy
error codes as real failures since its expected to occur on
boxes that USB device is already claimed by another driver
and if that device uses default root only permissions.
2013-08-26 21:21:20 -05:00
Chris Bagwell 8b0e4257a9 Add support for winpthreads needed by mingw64
Keep existing pthread-win32 support.

Based on work from Michael Cronenworth for Fedora's mingw64
sane-backends package.
2013-08-15 13:51:05 -05:00
Chris Bagwell bc2dc68fa5 Improve snmp detection when cross compiling.
Improving here means do not set LIBS/CFLAGS if library is not detected.
This prevents some unknown options based to ld when host is Linux and
target is mingw32/64.  Further improvements are needed if one wants this
snmp support when cross compiling to really work.

Also, to make commit bisectable, updated all autofoo files using
'autoreconf -i -f' and repatching ltmain.sh.

Also, test-driver was missing from git repo but the Makefile.in
checked in expected it to exist.
2013-08-15 13:10:39 -05:00
Stéphane Voltz b10f87f7ed fixed range overflow due to rounding in sanei_constrain_value
- fixed a bug in sanei_constrain_value spotted by
  viresh_shirol@yahoo.co.uk where range max was exceeded due to rounding
  in quantization
- added test case for sane fixed values range
2013-08-04 09:04:47 +02:00
m. allan noah 9fc683d883 fujitsu backend v116
add swskip option
add sanei_magic_isBlank2
2013-04-03 21:54:48 -04:00
Stéphane Voltz 88e04fbb4d move test_wire.c from sanei to testsuite/sanei
- move sanei_w_* functions test program to test directory to keep
  production code separated from test code
2013-03-24 14:50:17 +01:00
Stéphane Voltz 5a1d5a62ee guard against device that went missing in claim/release interface
- add test for missing devices in claim or release
- changlog entry for all the sanei_usb work
2013-03-24 14:25:45 +01:00
Stéphane Voltz 2a66940c6b don't use kernel device when libusb is available 2013-03-24 14:20:06 +01:00
Stéphane Voltz d45f1bec5a fix memleak when reusing an already stored device 2013-03-24 14:20:06 +01:00
Stéphane Voltz a0b45146e1 rewrite sanei_usb_get_vendor_product
- rewrite sanei_usb_get_vendor_product using the same logic
  than sanei_usb_get_vendor_product_byname
2013-03-24 14:20:06 +01:00
Stéphane Voltz 018408bf20 white space cleanup 2013-03-24 14:20:06 +01:00
Stéphane Voltz 9e47eb4a37 unused and reassigned values fixes 2013-03-24 14:20:06 +01:00
Stéphane Voltz b3f01a9010 improve missing test logic 2013-03-24 14:20:06 +01:00
Stéphane Voltz 52ba4844ca add sanei_usb_exit() function
- create a sanei_usb_exit() function to free allocated resources during use
  of sanei_usb functions by a backend
2013-03-24 14:20:06 +01:00
Stéphane Voltz caf4614f61 correct debug messages
- change debug messages to match their new function using __func__
2013-03-24 14:20:06 +01:00