[sane-devel] [PATCH 0/2] build fix for win32
On Tuesday 17 January 2012, Ruediger Meier wrote: > From: Ruediger Meier > > Ruediger Meier (2): > add checks for ntddscsi.h and ddk/ntddscsi.h (to be used for win32) > build fix, use the right scsi header on win32 > > configure | 14 ++ > configure.in |1 + > include/sane/config.h.in |6 ++ > sanei/sanei_scsi.c| 10 -- > tools/sane-find-scanner.c | 17 +++-- > 5 files changed, 40 insertions(+), 8 deletions(-) > > -- > 1.7.6.1 Reviewing this again I wonder if we shouldn't remove any auto generated from the git repo as usually? And also here I messsed up a lot white spaces to let "git am" fail. Should I re-submit again? cu, Rudi
[sane-devel] Subject: [PATCH 0/4] fix and cleanup portable PATH_SEP and DIR_PATH defines
On Tuesday 17 January 2012, Chris Bagwell wrote: > This patch series makes minor portability fixes to following > backends. I've not seen any objections from various maintainers... so > if I do not hear back by weekend, I'll commit this patch series. Thx, I just see I've messed up that patch series a little while playing around with my MUA. Could you cleanly apply it? If not then I would reroll it. BTW is this list the right one to send patches at all? cu, Rudi
[sane-devel] build fix, use the right scsi header on win32
From: Ruediger Meier
Now we are using either ddk/ntddscsi.h or ntddscsi.h and even don't
stop if we have none of them.
---
sanei/sanei_scsi.c| 10 --
tools/sane-find-scanner.c | 17 +++--
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c
index 09127c8..6d171d3 100644
--- a/sanei/sanei_scsi.c
+++ b/sanei/sanei_scsi.c
@@ -62,6 +62,10 @@
#include
#include
+#if defined (HAVE_WINDOWS_H)
+# include
+#endif
+
#define STUBBED_INTERFACE 0
#define LINUX_INTERFACE1
#define BSD_INTERFACE 2
@@ -211,11 +215,13 @@
# include
# endif
# endif
-#elif defined (HAVE_WINDOWS_H)
+#elif defined (HAVE_DDK_NTDDSCSI_H)
# define USE WIN32_INTERFACE
-# include
# include
# include
+#elif defined (HAVE_NTDDSCSI_H)
+# define USE WIN32_INTERFACE
+# include
#endif
#ifndef USE
diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c
index 2b1b164..bfcfaf0 100644
--- a/tools/sane-find-scanner.c
+++ b/tools/sane-find-scanner.c
@@ -30,10 +30,15 @@
#include
#include
-#if defined (HAVE_WINDOWS_H)
-#include
-#include
-#include
+#if defined (HAVE_DDK_NTDDSCSI_H) || defined (HAVE_NTDDSCSI_H)
+# define WIN32_SCSI
+# include
+# if defined (HAVE_DDK_NTDDSCSI_H)
+# include
+# include
+# elif defined (HAVE_NTDDSCSI_H)
+# include
+# endif
#endif
#include "../include/sane/sanei.h"
@@ -1148,7 +1153,7 @@ get_next_file (char *dir_name, DIR * dir)
return file_name;
}
-#if defined (HAVE_WINDOWS_H)
+#if defined(WIN32_SCSI)
/* Return a list of potential scanners. There's a lot of hardcoded values here
that might break on a system with lots of scsi devices. */
static char **build_scsi_dev_list(void)
{
@@ -1840,7 +1845,7 @@ main (int argc, char **argv)
0
};
-#if defined (HAVE_WINDOWS_H) || \
+#if defined (WIN32_SCSI) || \
defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \
defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
--
1.7.6.1
[sane-devel] [PATCH 1/2] add checks for ntddscsi.h and ddk/ntddscsi.h (to be used for win32)
From: Ruediger Meier --- configure| 14 ++ configure.in |1 + include/sane/config.h.in |6 ++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ae60009..ba864b0 100755 --- a/configure +++ b/configure @@ -9867,6 +9867,20 @@ fi done +for ac_header in ntddscsi.h ddk/ntddscsi.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + if test "$ac_cv_header_sys_scsiio_h" = "yes" \ -a "$ac_cv_header_scsi_h" = "yes"; then diff --git a/configure.in b/configure.in index ac09173..6fac904 100644 --- a/configure.in +++ b/configure.in @@ -421,6 +421,7 @@ AC_CHECK_HEADERS(IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \ sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \ sys/passthrudef.h) AC_CHECK_HEADERS([io/cam/cam.h],,,[#include ]) +AC_CHECK_HEADERS([ntddscsi.h ddk/ntddscsi.h],,,[#include ]) dnl FreeBSD < 3 if test "$ac_cv_header_sys_scsiio_h" = "yes" \ diff --git a/include/sane/config.h.in b/include/sane/config.h.in index 738a521..00c8669 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -61,6 +61,9 @@ /* Define to 1 if you have the `cfmakeraw' function. */ #undef HAVE_CFMAKERAW +/* Define to 1 if you have the header file. */ +#undef HAVE_DDK_NTDDSCSI_H + /* Define to 1 if you have the header file. */ #undef HAVE_DEV_PPBUS_PPI_H @@ -210,6 +213,9 @@ /* Define to 1 if you have the `NSLinkModule' function. */ #undef HAVE_NSLINKMODULE +/* Define to 1 if you have the header file. */ +#undef HAVE_NTDDSCSI_H + /* Define to 1 if you have the header file. */ #undef HAVE_OS2_H -- 1.7.6.1
[sane-devel] [PATCH 0/2] build fix for win32
From: Ruediger Meier Ruediger Meier (2): add checks for ntddscsi.h and ddk/ntddscsi.h (to be used for win32) build fix, use the right scsi header on win32 configure | 14 ++ configure.in |1 + include/sane/config.h.in |6 ++ sanei/sanei_scsi.c| 10 -- tools/sane-find-scanner.c | 17 +++-- 5 files changed, 40 insertions(+), 8 deletions(-) -- 1.7.6.1
[sane-devel] Subject: [PATCH 0/4] fix and cleanup portable PATH_SEP and DIR_PATH defines
On Tue, Jan 17, 2012 at 3:01 PM, Ruediger Meier wrote: > On Tuesday 17 January 2012, Chris Bagwell wrote: >> This patch series makes minor portability fixes to following >> backends. I've not seen any objections from various maintainers... so >> if I do not hear back by weekend, I'll commit this patch series. > > Thx, I just see I've messed up that patch series a little while playing > around with my MUA. Could you cleanly apply it? If not then I would > reroll it. > I haven't tried yet. Can you resend directly to me to save time? You can send as attachements to me until you get MUA worked out. > BTW is this list the right one to send patches at all? Yes. Although most active developers have write access and commit themselves. So you don't always see a lot of patches to this list. Chris
[sane-devel] Subject: [PATCH 0/4] fix and cleanup portable PATH_SEP and DIR_PATH defines
5 of the 8 backends are mine, and I have no objection. allan On Tue, Jan 17, 2012 at 3:40 PM, Chris Bagwell wrote: > This patch series makes minor portability fixes to following backends. > ?I've not seen any objections from various maintainers... so if I do > not hear back by weekend, I'll commit this patch series. > > canon_dr > cardscan > epjitsu > fujitsu > kodak > gt68xx > microtek2 > dll > > Thanks for this and other windows patches, Ruediger. > > Chris > > On Sun, Jan 15, 2012 at 8:31 AM, Ruediger Meier wrote: >> From: Ruediger Meier >> >> This patch-set is to fix and unify PATH_SEP and DIR_PATH defines in the >> context of seeing them conflicting on cygwin. >> >> Ruediger Meier (4): >> ?fix, PATH_SEP and DIR_SEP were inconsistently defined on cygwin since >> ? ? ? ?5168206e (also see a28bd843) >> ?cleanup, remove all unused PATH_SEP defines >> ?cleanup, always use the same portable PATH_SEP define (note _WIN32 >> ? ? is not defined on cygwin) >> ?update ChangeLog for previous commits >> >> ?ChangeLog ? ? ? ? ? ?| ? ?6 ++ >> ?backend/canon_dr.h ? | ? ?8 >> ?backend/cardscan.h ? | ? ?8 >> ?backend/dll.c ? ? ? ?| ? ?6 +- >> ?backend/epjitsu.h ? ?| ? ?8 >> ?backend/fujitsu.h ? ?| ? ?8 >> ?backend/gt68xx.c ? ? | ? ?2 +- >> ?backend/kodak.h ? ? ?| ? ?8 >> ?backend/microtek2.h ?| ? ?2 +- >> ?sanei/sanei_access.c | ? ?2 +- >> ?sanei/sanei_config.c | ? ?5 + >> ?11 files changed, 11 insertions(+), 52 deletions(-) >> >> -- >> 1.7.6.1 >> >> -- >> sane-devel mailing list: sane-devel at lists.alioth.debian.org >> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel >> Unsubscribe: Send mail with subject "unsubscribe your_password" >> ? ? ? ? ? ? to sane-devel-request at lists.alioth.debian.org > > -- > sane-devel mailing list: sane-devel at lists.alioth.debian.org > http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel > Unsubscribe: Send mail with subject "unsubscribe your_password" > ? ? ? ? ? ? to sane-devel-request at lists.alioth.debian.org -- "The truth is an offense, but not a sin"
[sane-devel] How to submit new scanner backend code
I haven't received a reply to this and it's been nearly a month.
The patch makes the MX882 scanner work with Sane. I'd like to see it
included in the git tree. How can I gp about doing this?
(The MX882 is a desktop multi-function full-duplex flatbed copier.
fax, inkjet printer, scanner).
Thanks,
Bruce
On Tue, Dec 20, 2011 at 9:23 AM, Bruce Karsh wrote:
> I've added support in /backend for the MX882 scanner. I'd like to get
> this into the tree. What's the best way to go about this?
>
> (Although the box says MX882, it reports itself as an MX880). The
> patch is very short:
>
> diff -r SANE/sane-backends-1.0.22/backend/pixma_mp150.c
> SANE-ORIG/sane-backends-1.0.22/backend/pixma_mp150.c
> 165,167d164
> < /* PIXMA 2011 vintage */
> < #define MX880_PID 0x1750
> <
> 1230d1226
> < ? ? ? ? s->cfg->pid == MX880_PID ||
> 1648,1650d1643
> <
> < ? /* PIXMA 2011 vintage */
> < ? DEVICE ("Canon PIXMA MX880", "MX880", MX880_PID, 2400, 638, 877,
> PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
[sane-devel] Subject: [PATCH 0/4] fix and cleanup portable PATH_SEP and DIR_PATH defines
This patch series makes minor portability fixes to following backends. I've not seen any objections from various maintainers... so if I do not hear back by weekend, I'll commit this patch series. canon_dr cardscan epjitsu fujitsu kodak gt68xx microtek2 dll Thanks for this and other windows patches, Ruediger. Chris On Sun, Jan 15, 2012 at 8:31 AM, Ruediger Meier wrote: > From: Ruediger Meier > > This patch-set is to fix and unify PATH_SEP and DIR_PATH defines in the > context of seeing them conflicting on cygwin. > > Ruediger Meier (4): > ?fix, PATH_SEP and DIR_SEP were inconsistently defined on cygwin since > ? ? ? ?5168206e (also see a28bd843) > ?cleanup, remove all unused PATH_SEP defines > ?cleanup, always use the same portable PATH_SEP define (note _WIN32 > ? ? is not defined on cygwin) > ?update ChangeLog for previous commits > > ?ChangeLog ? ? ? ? ? ?| ? ?6 ++ > ?backend/canon_dr.h ? | ? ?8 > ?backend/cardscan.h ? | ? ?8 > ?backend/dll.c ? ? ? ?| ? ?6 +- > ?backend/epjitsu.h ? ?| ? ?8 > ?backend/fujitsu.h ? ?| ? ?8 > ?backend/gt68xx.c ? ? | ? ?2 +- > ?backend/kodak.h ? ? ?| ? ?8 > ?backend/microtek2.h ?| ? ?2 +- > ?sanei/sanei_access.c | ? ?2 +- > ?sanei/sanei_config.c | ? ?5 + > ?11 files changed, 11 insertions(+), 52 deletions(-) > > -- > 1.7.6.1 > > -- > sane-devel mailing list: sane-devel at lists.alioth.debian.org > http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel > Unsubscribe: Send mail with subject "unsubscribe your_password" > ? ? ? ? ? ? to sane-devel-request at lists.alioth.debian.org
