>Number:         8636
>Category:       port-sun3
>Synopsis:       need update si.c and si_sebuf.c for scsipi_xfer changes
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    port-sun3-maintainer (NetBSD/sun3 Portmaster)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 16 19:20:59 1999
>Last-Modified:
>Originator:     Izumi Tsutsui
>Organization:
Izumi Tsutsui	Himeji City, Japan
>Release:        NetBSD-current 1.4L 19991015
>Environment:
System: NetBSD 1.4L sun3/80

>Description:
MI scsipi_xfer flags were changed on Sep 30, but
si.c and si_sebuf.c on sun3 have not updated for the changes.

>How-To-Repeat:
Configure and make a sun3 GENERIC kernel.

---
cc  -O2 -fno-defer-pop -msoft-float -Werror -Wall -Wstrict-prototypes \
-Wmissing-prototypes  -Wpointer-arith -Wno-main -nostdinc -I. \
-I../../../../arch -I../../../.. -undef -D__NetBSD__ -Dm68k -Dmc68000 \
-D_KERNEL -Dsun3 -D_SUN3_ -DFPU_EMULATE -DHAVECACHE -DLKM -DLANCE_REVC_BUG \
-DMAXUSERS=4  -c ../../../../arch/sun3/dev/si.c
../../../../arch/sun3/dev/si.c: In function `si_dma_alloc':
../../../../arch/sun3/dev/si.c:356: structure has no member named `flags'
../../../../arch/sun3/dev/si.c:356: `SCSI_DATA_OUT' undeclared (first use in this function)
../../../../arch/sun3/dev/si.c:356: (Each undeclared identifier is reported only once
../../../../arch/sun3/dev/si.c:356: for each function it appears in.)
*** Error code 1

Stop.

>Fix:

Index: si.c
===================================================================
RCS file: /cvs/repository/src/sys/arch/sun3/dev/si.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 si.c
--- si.c	1999/09/11 15:54:45	1.1.1.1
+++ si.c	1999/10/17 02:02:18
@@ -353,7 +353,7 @@
 	dh->dh_dvma = 0;
 
 	/* Copy the "write" flag for convenience. */
-	if (xs->flags & SCSI_DATA_OUT)
+	if (xs->xs_control & XS_CTL_DATA_OUT)
 		dh->dh_flags |= SIDH_OUT;
 
 #if 0
Index: si_sebuf.c
===================================================================
RCS file: /cvs/repository/src/sys/arch/sun3/dev/si_sebuf.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 si_sebuf.c
--- si_sebuf.c	1999/09/11 15:54:45	1.1.1.1
+++ si_sebuf.c	1999/10/16 21:36:28
@@ -661,7 +661,7 @@
 	dh->dh_flags = SIDH_BUSY;
 
 	/* Copy the "write" flag for convenience. */
-	if (xs->flags & SCSI_DATA_OUT)
+	if (xs->xs_control & XS_CTL_DATA_OUT)
 		dh->dh_flags |= SIDH_OUT;
 
 	dh->dh_addr = (u_char*) addr;
>Audit-Trail:
>Unformatted: