[sane-devel] [patch] umax_pp: fixes for x86_64

Frank Zago fzago@austin.rr.com
Sat, 13 Nov 2004 13:50:50 -0600


This is a multi-part message in MIME format.
--------------080906040001030401050006
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

This patch makes umax_pp recognize the amd64 cpus.

--------------080906040001030401050006
Content-Type: text/plain;
 name="sane.diff.part29"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sane.diff.part29"

--- backend/umax_pp_low.c	8 Oct 2004 05:16:43 -0000	1.61
+++ backend/umax_pp_low.c	13 Nov 2004 19:34:18 -0000
@@ -208,7 +208,7 @@ sanei_outsl (unsigned int port, const un
 
 
 /* linux GCC on i386 */
-#if ( ! defined SANE_INB ) && ( defined HAVE_SYS_IO_H ) && ( defined __GNUC__ ) && ( defined __i386__ )
+#if ( ! defined SANE_INB ) && ( defined HAVE_SYS_IO_H ) && ( defined __GNUC__ ) && ( defined __i386__ || defined __x86_64__)
 #define SANE_INB 3
 
 static int
@@ -305,6 +305,8 @@ sanei_insb (unsigned int port, unsigned 
 static void
 sanei_insl (unsigned int port, unsigned char *addr, unsigned long count)
 {
+  int i;
+
   for (i = 0; i < count * 4; i++)
     addr[i] = sanei_inb (port);
 }

--------------080906040001030401050006--