[sane-devel] official ZETA port diffs
Hi, On Tue, Jul 12, 2005 at 03:58:09PM +0200, Fran?ois Revol wrote: - 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 ??), The sm3600 backend has been changed to use sanei_usb now instead of libusb directly. I've based the change in CVS on your patch. Thanks again! Bye, Henning
[sane-devel] official ZETA port diffs
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.cThu Feb 17 02:49:50 2005 +++ sane/backend/plustek-pp_scan.hFri 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.cThu 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.cThu Feb 3 17:18:43 2005 +++ sane/sanei/sanei_init_debug.c Thu Feb 3 17:18:17 2005 +++ sane/sanei/sanei_pio.cThu 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.cTue 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
[sane-devel] official ZETA port diffs
This is a multipart message in MIME format. Zoidberg-BeMail-temp Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Hi, 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, ...). Parts of it are of general interest, like checks for header files, and the removal of libusb dependancy in the sm3600 backend. 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. Yours, Fran=E7ois Revol francois dot revol at yellowtab dot com -- Software Architect YellowTab GmbH http://www.yellowtab.com/ Zoidberg-BeMail-temp Content-Transfer-Encoding: base64 Content-Disposition: Attachment Content-Type: text/plain; name=sane-backends-1.0.15.zeta.patch.001.txt VGhpcyBpcyB0aGUgZGlmZiBiZXR3ZWVuIHRoZSBzYW5lLWJhY2tlbmRzLTEuMC4xNSB1c2VkIGlu IFpldGEgYW5kIHRoZSBvZmZpY2lhbCBhcmNoaXZlLgpJdCBpcyB1c2VkIHdpdGggdGhlIGZvbGxv d2luZyBjb25maWd1cmUgb3B0aW9uczoKCkJPT1RSRUxfSU5TVEFMTF9ESVIgOj0gYmVvcwpJTlNU QUxMX0RJUiA6PSAvYm9vdC8kKEJPT1RSRUxfSU5TVEFMTF9ESVIpCi4vY29uZmlndXJlIC0tcHJl Zml4PSQoSU5TVEFMTF9ESVIpIFwKLS1iaW5kaXI9JChJTlNUQUxMX0RJUikvYmluIFwKLS1zYmlu ZGlyPSQoSU5TVEFMTF9ESVIpL2JpbiBcCi0tbGliZGlyPSQoSU5TVEFMTF9ESVIpL3N5c3RlbS9s aWIgXAotLWluY2x1ZGVkaXI9JChJTlNUQUxMX0RJUikvZXRjL2RldmVsb3AvemV0YS1yMS1nY2My LXg4Ni9oZWFkZXJzIFwKLS1kYXRhZGlyPSQoSU5TVEFMTF9ESVIpL2V0YyBcCi0td2l0aC1kb2Nk aXI9JChJTlNUQUxMX0RJUikvZXRjL0xhbmd1YWdlL2RvY3VtZW50YXRpb24vZW5VUy9zYW5lIFwK LS1lbmFibGUtc3RhdGljIC0tZGlzYWJsZS10cmFuc2xhdGlvbnMgLS1lbmFibGUtcG5tLWJhY2tl bmQKClNvbWUgbm90ZXMgb24gdGhlIGNoYW5nZXMsIHNvbWUgZnJvbSB0aGUgb2xkIEJlU0FORSBw b3J0LCBzb21lIGJ5IG1lOgotIHRoZSBiYWNrZW5kcyBhcmUgbm90IGluc3RhbGxlZCBhcyBzaGFy ZWQgbGlicyBidXQgYXMgYWRkLW9ucywgd2hpY2ggYXJlIHNoYXJlZCBsaWJzIApidXQgaW4gYSBz cGVjaWZpYyBmb2xkZXIgaW4gWy9zeXN0ZW18fl0vY29uZmlnL2FkZC1vbnMvIG5hbWVkIFNBTkUv LgpUaGUgaW5zdGFsbCB0YXJnZXQgaGFzIGJlZW4gY2hhbmdlZCB0byBhY2NvdW50IGZvciB0aGlz LAotIHNvbWUgZmlsZXMgZG9uJ3QgZXhpc3QgaW4gQmVPUy9aRVRBIChpcGMuaCwgLi4uKSwKLSBi YWNrZW5kIGZ1bmN0aW9uIG5hbWVzIGdldCBhIHByZWZpeCwgSSBzdXBwb3NlIHRvIGF2b2lkIG5h bWVzcGFjZSBjbGFzaGVzLAotIHRob3VnaCB3ZSBkbyBoYXZlIGEgbGliZGwgdG8gaW1wbGVtZW50 IGRsX29wZW4sIHRoZSBuYXRpdmUgd2F5IGlzIHByZWZlcmVkLAotIHdlIGRvbid0IGhhdmUgYSBs aWJ1c2IgcG9ydCwgYW5kIEkgaGFkIGEgc20zNjAwIGFyb3VuZCwgc28gSSBwb3J0ZWQgdGhlIGJh Y2tlbmQgb3ZlciB0byBzYW5laSAKKHdhcyBpdCBzb21lIGtpbmQgb2YgZm9yZWlnbiBjb2RlIG5v dCBmdWxseSBwb3J0ZWQgPz8pLAotIHNuYXBzY2FuIG11dGV4IHN0dWZmIGltcGxlbWVudGVkIG5h dGl2ZWx5LCBjb3VsZG4ndCB0ZXN0IGl0IHRob3VnaCwgbm90IGV2ZW4gc3VyZSBpdCBpcyB1c2Vk LAotIGFkZGVkIGEgLS13aXRoLWRvY2Rpcj0gY29uZmlndXJlIGFyZywKLSBCZU9TIGhhcyBhIGJy b2tlbiBnZXRbbmFtZXxhZGRyXWluZm8oKSBmcm9tIGJpbmQuIFRoaXMgaXMgZml4ZWQgaW4gWkVU QSBSMS4KLSBsaWJ0b29sIG5lZWRzIC1uby11bmRlZmluZWQgKHRoaXMgc2hvdWxkIHJlYWxseSBi ZSBvbiBieSBkZWZhdWx0IGFueXdheSwgZm9yIGNvZGUgY29ycmVjdG5lc3MpLAotIHZhcmlvdXMg VlBBVEggZml4ZXMsCi0gY2hlY2sgZm9yIDxiZS9kcml2ZXJzL1VTQl9zY2FubmVyLmg+LCBidXQg bm90IHVzZWQgeWV0LAotIGdldHBhc3MgcmVwbGFjZW1lbnQsCi0gbm8gU19JRlNPQ0sgKHNvY2tl dHMgYXJlIGZkcyB0byAvZGV2L25ldC9hcGkpLAotIHN0dWIgcGlvIGNvZGUsIHVudGVzdGVkLAoK RnJhbmNvaXMgUmV2b2wuCgoKZGlmZiAtdXJOIC9EZXZlbC9zYW5lLWJhY2tlbmRzLTEuMC4xNS9S RUFETUUuemV0YSBzYW5lL1JFQURNRS56ZXRhCi0tLSAvRGV2ZWwvc2FuZS1iYWNrZW5kcy0xLjAu MTUvUkVBRE1FLnpldGEJVGh1IEphbiAgMSAwMTowMDowMCAxOTcwCisrKyBzYW5lL1JFQURNRS56 ZXRhCVR1ZSBGZWIgMTUgMTU6MzA6NDMgMjAwNQpAQCAtMCwwICsxLDI2IEBACitTQU5FIGFuZCBa ZXRhCistLS0tLS0tLS0tLS0tCisKK1RoZSBaZXRhIHBvcnQgaXMgYmFzZWQgb24gZXhpc3Rpbmcg QmVPUyBwb3J0LCB3aXRoIHNvbWUgY2hhbmdlcyAKK3RvIGFjY29tb2RhdGUgeWVsbG93VEFCJ3Mg aW50ZXJuYWwgYnVpbGQgcHJvY2VkdXJlLCBhbmQgc29tZSBuZXcgCitjb252ZW50aW9ucyBicm91 Z2h0IHVwIGJ5IFpldGEuCisKK0NmLiBSRUFETUUuYmVvcyBmb3IgbW9yZSBoaXN0b3JpY2FsIHN0 dWZmLgorCitTQU5FIDEuMC45IHdhcyB1cGRhdGVkIGZvciBaZXRhIGJ5IEl0aGFtYXIgQWRlbWEg Zm9yIHllbGxvd1RBQi4KKworU0FORSAxLjAuMTUgd2FzIHVwZGF0ZWQgZm9yIEJlT1MgYW5kIFpl dGEgYnkgRnJhbsOnb2lzIFJldm9sIGZvciB5ZWxsb3dUQUIuCisKK1pldGEgdXNlcyBhIG1vZGlm aWVkIHZlcnNpb24gb2YgUGhpbGlwcGUgSG91ZG9pbidzIFNhbml0eSBHVUkgZnJvbnRlbmQuCito dHRwOi8vcGhpbGlwcGUuaG91ZG9pbi5mcmVlLmZyL3BoaWwvYmVvcy9zYW5pdHkvaW5kZXgtZW4u aHRtbAorCitTQU5FIHdhcyByZXBvcnRlZCB0byB3b3JrIHdpdGggdGhlIGZvbGxvd2luZyBjb25m aWd1cmF0aW9uIGFuZCBmZWF0dXJlczoKKworUGxhdGZvcm06IFpldGEgUjEgKD09IEJlT1MgUjYu eCkgaXg4NgorTGF0ZXN0IFNBTkUgdmVyc2lvbiB0ZXN0ZWQ6IDEuMC4xNQorQ29tcGlsZXI6IGdj YyAyLjk1LjMKK1VzZXItbGV2ZWwgU0NTSSBzdXBwb3J0OiB5ZXMKK1VTQiBzdXBwb3J0OiB5ZXMK K1NoYXJlZCBsaWJyYXJ5IHN1cHBvcnQ6IHllcworRHluYW1pYyBsb2FkaW5nIHN1cHBvcnQ6IHll cyAgCitYMTEgY2xpZW50czogbm8KZGlmZiAtdXJOIC9EZXZlbC9zYW5lLWJhY2tlbmRzLTEuMC4x NS9iYWNrZW5kL01ha2VmaWxlLmluIHNhbmUvYmFja2VuZC9NYWtlZmlsZS5pbgotLS0gL0RldmVs L3NhbmUtYmFja2VuZHMtMS4wLjE1L2JhY2tlbmQvTWFrZWZpbGUuaW4JU3VuIE9jdCAxMCAxNDo0 Mzo0MiAyMDA0CisrKyBzYW5lL2JhY2tlbmQvTWFrZWZpbGUuaW4JV2VkIEFwciAgNiAxNTozODo0