From owner-freebsd-ports@FreeBSD.ORG  Tue Aug 12 22:17:40 2003
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 65CCE37B401
	for <ports@FreeBSD.ORG>; Tue, 12 Aug 2003 22:17:40 -0700 (PDT)
Received: from ns.kobe1995.net (219.117.208.10.user.rb.il24.net
	[219.117.208.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 156B243FAF
	for <ports@FreeBSD.ORG>; Tue, 12 Aug 2003 22:17:35 -0700 (PDT)
	(envelope-from kaz@kobe1995.net)
Received: (from kaz@localhost)
	by ns.kobe1995.net (8.8.8/3.7W-primary) id OAA27208;
	Wed, 13 Aug 2003 14:17:31 +0900 (JST)
To: sane-devel@mostang.com, ports@FreeBSD.ORG
From: kaz@kobe1995.net (NAKAMURA Kazushi)
X-Mailer: mnews [version 1.22PL6] 2002-07/03(Wed)
Date: Wed, 13 Aug 2003 14:17:31 +0900
Message-ID: <030813141731.M0127146@ns.kobe1995.net>
cc: kaz@kobe1995.net
Subject: Please merge this for EPSON GT-9700F
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Aug 2003 05:17:40 -0000

Hi, the sane-backend works fine on my EPSON GT-9700F (USB & IEEE1394).
But it needs simokawa-san's patch for sane-1.0.11. Please merge it.
Thank you!

==> patch-epson.c <==
--- backend/epson_scsi.c.orig	Sun Apr 27 21:57:39 2003
+++ backend/epson_scsi.c	Tue Aug 12 14:26:20 2003
@@ -93,15 +93,16 @@
 {
 	u_char * cmd;
 
-	cmd = alloca( 6 + buf_size);
-	memset( cmd, 0, 6);
+#define	ALIGN	8
+	cmd = alloca( ALIGN + buf_size);
+	memset( cmd, 0, ALIGN);
 	cmd[ 0] = WRITE_6_COMMAND;
 	cmd[ 2] = buf_size >> 16;
 	cmd[ 3] = buf_size >> 8;
 	cmd[ 4] = buf_size;
-	memcpy( cmd + 6, buf, buf_size);
+	memcpy( cmd + ALIGN, buf, buf_size);
 
-	if( SANE_STATUS_GOOD == ( *status = sanei_scsi_cmd( fd, cmd, 6 + buf_size, NULL, NULL)))
+	if( SANE_STATUS_GOOD == ( *status = sanei_scsi_cmd2( fd, cmd, 6, cmd + ALIGN, buf_size, NULL, NULL)))
 		return buf_size;
 
 	return 0;
-- 
中村和志＠神戸		<mailto:kaz@kobe1995.net>
NAKAMURA Kazushi@KOBE	<http://kobe1995.jp/>
- Be Free(BSD), or Die...