Wykres commitów

7269 Commity (ec8bdc31a337d7f3740810eda462cc0723e20f49)

Autor SHA1 Wiadomość Data
Stéphane Voltz ec8bdc31a3 define and use HAS_UTA flag for G4050
- remove unused ALT_SLOPE flag
- create HAS_UTA_FLAG
- ease some compilation warnings
2011-11-14 06:16:17 +01:00
Stéphane Voltz 99df6f2b0a lamp off at sane_close() 2011-11-14 06:16:17 +01:00
Chris Bagwell a6519d79aa Add changelog entries. 2011-11-10 19:29:21 -06:00
Chris Bagwell 10b778b5d0 Map SANE_Pid to pthread_t
Not all platforms use an integer for pthread_t and so
couldn't compile on those; namely mingw.

This is least riskest version I could come up with. Backends
that do things like "SANE_Pid pid = -1" or "if (pid == -1)" will
need to switch to sanei_thread_set_invalid()
sanei_thread_is_invalid() to be able to compile on mingw.
2011-11-10 19:22:07 -06:00
Chris Bagwell 9c4f8d51d0 Add replacement sleep(); mostly for mingw usage. 2011-11-10 19:21:13 -06:00
Chris Bagwell 3125506715 revert broken sleep()->usleep conversion.
Got unit conversion wrong.
2011-11-10 18:39:12 -06:00
Chris Bagwell 1e4595cbca update ChangeLog for previous commits. 2011-11-09 21:59:36 -06:00
Chris Bagwell 50475719ef portabilty mods to epson2 backend
No behavior changes.  Wrap some optional headers with #ifdef's and
use usleep() instead of sleep() since it exist everywhere.
2011-11-09 21:50:18 -06:00
Chris Bagwell ba10bb37cd remove unused variable. 2011-11-09 21:48:07 -06:00
Chris Bagwell 05c2825f17 Default enable_dynamic to yes/no based on librarys
My previous try was always defaulting to "yes" and user
and to manually specify --disable-dynamic to work correctly
on platforms that didn't support dynamic loading.
2011-11-09 21:46:12 -06:00
Chris Bagwell 11531d97d5 update README.windows to include mingw info. 2011-11-08 21:47:16 -06:00
Chris Bagwell e7f01c3b36 Add --disable-dynamic/--disable-preload and update docs
Options were in README but removed at some point.  They
are useful so add them back.

Document BACKENDS and PRELOADABLE_BACKENDS variables in
README as well as in configure --help output.
2011-11-08 21:28:30 -06:00
Chris Bagwell c64249fc31 fix compile failure on non-windows platform. 2011-11-08 21:22:42 -06:00
Chris Bagwell db068dd6b1 complete preload linking fix.
dll.c is were optional preload behavior is implemented.
Since its linked in using a convienence library, we need
to libraries to have different behavior.
2011-11-08 20:06:30 -06:00
Chris Bagwell 1aa332d710 Updates to use sockets on mingw
Add missing WSAStartup() and WSACleanup() code required
on windows to use ws2_32 library.

Also, O_NONBLOCK is tricky even on other platforms so create
a function to set that so portability logic doesn't need to be
done in every backend.  Windows requires using a non standard
function to enable nonblocking mode and also doesn't support
querying current state.
2011-11-07 21:49:54 -06:00
Chris Bagwell 0a6d41ff59 Add missing sanei_magic.lo to libsane backend.
At least Fujitsu backend uses it so needed to be able
to run "configure PRELOADABLE_BACKENDS=fujtsu".
2011-11-07 19:29:38 -06:00
Chris Bagwell 9be85b171b disable sane's libtool soname hack on mingw
Original logic was confusing the DLL creation process.
Each backend was creating a DLL of name libsane-1.dll;
overwriting each other each time.  Since libsane is built
last, you could never get access to other DLL's like
you can on unix platforms.

Windows doesn't use soname concept anyways.  You can copy any
libsane-*-1.dll to libsane-1.dll into same directory
as scanimage.exe and it will work as expected for that
one backend.
2011-11-07 19:23:42 -06:00
Chris Bagwell 03fbcb81a7 Update ChangeLog for recent commits. 2011-11-06 17:10:29 -06:00
Chris Bagwell 58c207a5e6 Add $(EXEEXT) to executable name to work on windows
Automake defines this for us. Might as well use it.
Should help both mingw and cygwin tests.
2011-11-06 16:43:49 -06:00
Chris Bagwell 1dd768d534 Do not link in preload backends for libsane-dll
Current backend/Makefile.am states difference between libsane and
libsane-dll as:

> libsane.la and libsane-dll.la are the same thing except for
> the addition of backends listed by PRELOADABLE_BACKENDS that are
> statically linked in.

We were (mistakenly) linking in dll-preload.h and thus symbols
for all preload backends for both libraries but we were only
linking in those symbols for libsane.

This mistake became obvious on mingw which does not allow for
any unresolved symbols.  Resolve by forcing an empty preload
backend list for libsane-dll.
2011-11-06 16:39:06 -06:00
Chris Bagwell 5061c2d5b2 More mingw portability updates.
Add check for winsock2.h for socket.h replancement. Also, use this
check to add ws2_32 library. Also, switch all winsock.h references
to winsock2.h.

Add check for getuid and getpass; which are not on mingw.

Add a syslog() replacement that is basically a print(). This
is also used by vsyslog() replacement.

Comment out parts of replacement sigprocmask.c on mingw.

To support these configure.in changes, I need to rebuild all
related files with autoconf 2.68 and libtool 2.4. Hand ported
our sane-backend specific changes to newer ltmain.sh.
2011-11-06 12:40:00 -06:00
Chris Bagwell 3e1d15d2c4 Only redefine O_NONBLOCK when a valid alias exists
On mingw, O_NONBLOCK is not defined.  Since we were always
redefining to an invalid FNDELAY, the compile failure message
would mislead you during debugging.  Its better for compile
failure to point to real issue; which is missing O_NONBLOCK.
2011-11-06 11:28:18 -06:00
Chris Bagwell cf348762cb Add missing ChangeLog-1.0.22 to Makefile.am
It was submitted for Makefile.in but not for Makefile.am.
2011-11-06 11:26:26 -06:00
Chris Bagwell e7d1932f5b use usleep consistently in umax_pp_low.c
It was about an 90/10 split with usleep/sleep. We have portablity
logic to make usleep on all platforms but not sleep. This is
needed to link tools directory under mingw.
2011-11-06 11:24:45 -06:00
Chris Bagwell 9bdff1dbdf mingw32 compile fixes
The following updates were made to all directories but backends.
That still needs work. There are also still some pthread issues
and syslog is missing.

 Windows doesn't support SIGHUP or SIGPIPE so make that optional.
 Only include socket header files when sys/socket.h is detected.
 Use winsock.h on windows.
 Only include syslog.h when vsyslog() was detect by configure.
 Skip FD_CLOEXEC when not supported by OS (not defined).
 Only include sys/ioctl.h on platforms that define it.
2011-11-05 11:19:34 -05:00
Stéphane Voltz 8f0f05225b includes for genesys_gl841.c 2011-11-02 08:41:10 +01:00
Stéphane Voltz 9ea9ed9237 genesys changelog entry 2011-11-02 08:41:10 +01:00
Stéphane Voltz 11d8819768 genesys code cleanup
- create an include file for genesys_gl841.c
- simplify includes
- cleanup warnings
2011-11-02 08:40:25 +01:00
m. allan noah bbecafdfba did I mention I don't like git? 2011-11-01 16:14:27 -04:00
m. allan noah 938469218b Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends
Conflicts:
	ChangeLog
2011-11-01 16:12:03 -04:00
m. allan noah 8ee3e59375 canon_dr: DR-2580C pads the backside of duplex scans 2011-11-01 15:23:08 -04:00
Stéphane Voltz f0e42223a7 include <sys/types> in a clean way 2011-11-01 16:10:07 +01:00
Stéphane Voltz 638d7750a9 fix gpo description of LIDE210 2011-11-01 10:08:36 +01:00
Mattias Ellert a7ad2b1b8b This "check" is "a (bank) check" not "to check" 2011-10-30 14:26:35 +01:00
Mattias Ellert 88151344ff Update Swedish translation 2011-10-30 13:50:42 +01:00
Mattias Ellert 9e639753a3 Include <sys/types.h> for definition of u_long on MacOS X 2011-10-30 10:32:34 +01:00
Mattias Ellert c048a73700 Use more precise path to internal headers 2011-10-30 10:27:47 +01:00
Mattias Ellert 97e89c3ad7 Use portable endian macros from config.h 2011-10-30 10:19:07 +01:00
m. allan noah dd1b8a07fd updated i1440 PID, added i1405 2011-10-26 13:55:26 -04:00
m. allan noah 785b5fbab2 correct kodak VID 2011-10-25 13:37:49 -04:00
m. allan noah f5d0a8dbfe added usb ids, a few new models, and updated backend comment 2011-10-25 13:19:12 -04:00
Stéphane Voltz fb59aea859 Changelog and doc changes for genesys backend update 2011-10-21 07:58:31 +02:00
Stéphane Voltz 0c75f5ca4e minor compatibility change for KV-SS080 2011-10-21 07:45:45 +02:00
Stéphane Voltz 6aec6884b1 G4010/G4050 device description cleanup 2011-10-21 07:45:45 +02:00
Stéphane Voltz 61daa4300b shading data bug is fixed 2011-10-21 07:45:44 +02:00
Stéphane Voltz d35e4a072f GL843 progress, working 1200 and 2400 dpi modes
- shading is working using SHDAREA
2011-10-21 07:45:44 +02:00
Stéphane Voltz 1329a3dfe0 G4050 progress : working 1200/2400 dpi
- handle undocumented register 0xaa
2011-10-21 07:45:44 +02:00
Stéphane Voltz 20b6d224fb adjust ld shift to normal case when needed 2011-10-21 07:45:44 +02:00
Stéphane Voltz b05ca3c3f3 move specific gl843 shading function to genesys_gl843.c 2011-10-21 07:45:44 +02:00
Stéphane Voltz 155bc33c62 handle different domains for ld distance shift 2011-10-21 07:45:44 +02:00