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
Henning Geinitz
278709d3d4
Made buffer const SANE_Byte * in sanei_usb_bulk_write(). Try to call
...
usb_find_busses only once. Make sure that already opened devices aren't opened
again. Exit libusb scan loop if one device is found. Make error values more
expressive. Check for missing config descriptors before using them to avoid
segfaults.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-07-14 16:31:14 +00:00
Henning Geinitz
9e4ad2dcc9
Used dn (device number) instead of fd (file descriptor) to avoid
...
confusion. Updated doxygen documentation.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-07-03 19:48:45 +00:00
Henning Geinitz
e3476bd389
Added support for libusb.
...
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-07-03 14:07:44 +00:00
Henning Geinitz
bc16d554dc
Set buffer size to 64 kB for SOLARIS_USCSI_INTERFACE (reported by Ed Randall
...
<ed.randall@ingenotech.com>).
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-06-27 16:04:21 +00:00
Henning Geinitz
1c87df203c
Fixed possible segfault.
...
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-05-30 19:26:40 +00:00
Henning Geinitz
a1df2d83f5
Explicitely initialize vendorID and productID.
...
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-05-30 19:23:22 +00:00
Henning Geinitz
477e9c6334
Fixed request-sense handling for OpenStep (from Oliver Schirrmeister
...
<oschirr@abm.de>).
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-05-28 18:57:26 +00:00