[sane-devel] official ZETA port diffs

[Henning Meier-Geinitz]

Hi,

On Tue, Jul 12, 2005 at 03:58:09PM +0200, François Revol wrote:
> I'm sending the diffs against sane-backends-1.0.15 for the sane port we
> use in ZETA, which is based on the BeSANE port from intuiware, and
> subsequent work from yellowTAB (usb support, ...).

Thanks for your work. Please also have a look on our platforms page:
http://www.sane-project.org/sane-support.html
Is the information about BeOS / Zeta still correct? If no, what should
be changed?

> Parts of it are of general interest, like checks for header files, and
> the removal of libusb dependancy in the sm3600 backend.

Have you (or anyone else9 tested the sm3600 backend with sanei_usb? U
would really like to remove its dependence on libusb.

> We did our best to clean it up, but there might still be some margin of
> improvement in the code, though I hope most of it will make to cvs.
> Comments are welcome.

I've commited quite a lot of it to CVS. Details below.

> - we don't have a libusb port, and I had a sm3600 around, so I ported the backend over to sanei 
> (was it some kind of foreign code not fully ported ??),

When it was included into sane, SANE did not support libusb via
sanei_usb yet. 

> +++ sane/README.zeta	Tue Feb 15 15:30:43 2005

Applied.

> +++ sane/backend/Makefile.in	Wed Apr  6 15:38:44 2005

Applied (without sm3600 change).

> +++ sane/backend/artec_eplus48u.h	Fri Feb  4 07:59:33 2005
> +++ sane/backend/dll.c	Thu Feb 17 02:49:50 2005
> +++ sane/backend/plustek-pp_scan.h	Fri Feb  4 11:26:52 2005

Applied.

> +++ sane/backend/sm3600-scanusb.c	Wed Apr 13 18:03:04 2005
> +++ sane/backend/sm3600.c	Wed Apr 13 18:03:05 2005

Not applied. Let's see if anyone can test this with a real scanner
using sanei_usb.

> +++ sane/backend/snapscan-mutex.c	Fri Feb  4 15:42:37 2005

Not applied. I'll leave that for the snapscan maintainer.

> +++ sane/configure.in	Wed Apr  6 15:38:45 2005

Applied (without sm3600 changes).

> +++ sane/doc/Makefile.in	Thu Feb 17 18:55:11 2005

Applied.
> +++ sane/frontend/saned.c	Thu Feb  3 17:23:03 2005
> @@ -30,7 +30,7 @@
>  
>  #include "../include/sane/config.h"
>  #include "../include/lalloca.h"
> -#include "../include/sys/types.h"
> +#include <sys/types.h>

Applied. I'm surprised that nobody noticed that and that it works at
all.

> +++ sane/include/sane/config.h.in	Tue Feb 15 20:52:31 2005

config.h.in is autogenerated by autoheader. If you need anything that
is not generated from configure.in (like the #ifdef), you must add it
to configure.in manually (look for "AH_BOTTOM").

Not applied (I used the file generated by autoheader).

> +++ sane/lib/Makefile.in	Thu Feb  3 17:21:37 2005
> +++ sane/lib/getpass.c	Thu Feb  3 17:22:28 2005

Not applied. The license of that file looks a bit strange and I don't
want to add yet another license to SANE (GPL, SANE exception, LGPL,
JPEG license for now).

Let's see if there is a LGPL file for that or if something else can be
used for getpass. At least on Linux, it's marked as "obsolete" in the
man page.

> +++ sane/sanei/sanei_config.c	Tue May 24 11:31:47 2005
> +++ sane/sanei/sanei_config2.c	Thu Feb  3 17:18:43 2005
> +++ sane/sanei/sanei_init_debug.c	Thu Feb  3 17:18:17 2005
> +++ sane/sanei/sanei_pio.c	Thu Feb  3 17:17:36 2005

Applied.

> +++ sane/sanei/sanei_scsi.c	Tue Jul  5 16:06:25 2005

Not applied because I don't like this:

> +#ifndef __BEOS__ // nuke all code, replace by BeOS code at the end of file
>  #if USE == DOMAINOS_INTERFACE

[...]

This is easy for you but not for the next one who wants to add a new
operating system. Therefore there is the "USE" system.

> +++ sane/sanei/sanei_thread.c	Tue Feb 15 20:52:32 2005

Applied.

> +++ sane/sanei/sanei_usb.c	Tue Mar  1 09:08:04 2005

Applied.

Please have a look at the CVS version of SANE which has the above
mentioned patches applied. 

Bye,
  Henning