Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Update for SCSIPI changes.
details: https://anonhg.NetBSD.org/src/rev/6ed016e5e299
branches: trunk
changeset: 476885:6ed016e5e299
user: thorpej <thorpej%NetBSD.org@localhost>
date: Thu Sep 30 22:59:52 1999 +0000
description:
Update for SCSIPI changes.
diffstat:
sys/arch/amiga/dev/bzivsc.c | 6 +++---
sys/arch/amiga/dev/bzsc.c | 6 +++---
sys/arch/amiga/dev/bztzsc.c | 6 +++---
sys/arch/amiga/dev/cbiisc.c | 6 +++---
sys/arch/amiga/dev/cbsc.c | 6 +++---
sys/arch/amiga/dev/flsc.c | 16 ++++++++--------
sys/arch/amiga/dev/idesc.c | 21 +++++++++++----------
sys/arch/amiga/dev/sbic.c | 32 ++++++++++++++++----------------
sys/arch/amiga/dev/sci.c | 29 +++++++++++++++--------------
sys/arch/amiga/dev/siop.c | 19 ++++++++++---------
sys/arch/amiga/dev/siop2.c | 18 +++++++++---------
sys/arch/arm32/podulebus/asc.c | 6 +++---
sys/arch/arm32/podulebus/cosc.c | 6 +++---
sys/arch/arm32/podulebus/csc.c | 4 ++--
sys/arch/arm32/podulebus/esc.c | 18 +++++++++---------
sys/arch/arm32/podulebus/ptsc.c | 4 ++--
sys/arch/arm32/podulebus/sbic.c | 32 ++++++++++++++++----------------
sys/arch/arm32/podulebus/sfas.c | 18 +++++++++---------
sys/arch/atari/dev/ncr5380.c | 26 +++++++-------------------
sys/arch/mac68k/dev/ncr5380.c | 27 ++++++++-------------------
sys/arch/macppc/dev/mesh.c | 18 +++++++++---------
sys/arch/mvme68k/dev/sbic.c | 30 +++++++++++++++---------------
sys/arch/mvme68k/dev/siop.c | 18 +++++++++---------
sys/arch/newsmips/dev/sc_wrap.c | 18 +++++++++---------
sys/arch/x68k/dev/mha.c | 18 +++++++++---------
25 files changed, 194 insertions(+), 214 deletions(-)
diffs (truncated from 1541 to 300 lines):
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/bzivsc.c
--- a/sys/arch/amiga/dev/bzivsc.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/bzivsc.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bzivsc.c,v 1.7 1999/09/25 21:47:05 is Exp $ */
+/* $NetBSD: bzivsc.c,v 1.8 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -271,7 +271,7 @@
bsc->sc_reg[reg * 4] = v;
#ifdef DEBUG
-if (bzivsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL*/ &&
+if (bzivsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL */ &&
reg == NCR_CMD/* && bsc->sc_active*/) {
bzivsc_trace[(bzivsc_trace_ptr - 1) & 127].yy = v;
/* printf(" cmd %x", v);*/
@@ -289,7 +289,7 @@
return 0;
#ifdef DEBUG
-if (/*sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL &&*/ bzivsc_trace_enable) {
+if (/*sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL &&*/ bzivsc_trace_enable) {
bzivsc_trace[bzivsc_trace_ptr].status = bsc->sc_reg[NCR_STAT * 4];
bzivsc_trace[bzivsc_trace_ptr].xx = bsc->sc_reg[NCR_CMD * 4];
bzivsc_trace[bzivsc_trace_ptr].yy = bsc->sc_active;
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/bzsc.c
--- a/sys/arch/amiga/dev/bzsc.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/bzsc.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bzsc.c,v 1.25 1999/09/25 21:47:06 is Exp $ */
+/* $NetBSD: bzsc.c,v 1.26 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -275,7 +275,7 @@
bsc->sc_reg[reg * 2] = v;
#ifdef DEBUG
-if (bzsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL*/ &&
+if (bzsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL*/ &&
reg == NCR_CMD/* && bsc->sc_active*/) {
bzsc_trace[(bzsc_trace_ptr - 1) & 127].yy = v;
/* printf(" cmd %x", v);*/
@@ -293,7 +293,7 @@
return 0;
#ifdef DEBUG
-if (/*sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL &&*/ bzsc_trace_enable) {
+if (/*sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL &&*/ bzsc_trace_enable) {
bzsc_trace[bzsc_trace_ptr].status = bsc->sc_reg[NCR_STAT * 2];
bzsc_trace[bzsc_trace_ptr].xx = bsc->sc_reg[NCR_CMD * 2];
bzsc_trace[bzsc_trace_ptr].yy = bsc->sc_active;
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/bztzsc.c
--- a/sys/arch/amiga/dev/bztzsc.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/bztzsc.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bztzsc.c,v 1.12 1999/09/25 21:47:06 is Exp $ */
+/* $NetBSD: bztzsc.c,v 1.13 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -275,7 +275,7 @@
bsc->sc_reg[reg * 4] = v;
#ifdef DEBUG
-if (bztzsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL*/ &&
+if (bztzsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL*/ &&
reg == NCR_CMD/* && bsc->sc_active*/) {
bztzsc_trace[(bztzsc_trace_ptr - 1) & 127].yy = v;
/* printf(" cmd %x", v);*/
@@ -298,7 +298,7 @@
bsc->sc_reg[0xe0] = BZTZSC_PB_LED; /* Turn LED off */
#ifdef DEBUG
-if (/*sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL &&*/ bztzsc_trace_enable) {
+if (/*sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL &&*/ bztzsc_trace_enable) {
bztzsc_trace[bztzsc_trace_ptr].status = bsc->sc_reg[NCR_STAT * 4];
bztzsc_trace[bztzsc_trace_ptr].xx = bsc->sc_reg[NCR_CMD * 4];
bztzsc_trace[bztzsc_trace_ptr].yy = bsc->sc_active;
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/cbiisc.c
--- a/sys/arch/amiga/dev/cbiisc.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/cbiisc.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cbiisc.c,v 1.8 1999/09/25 21:47:07 is Exp $ */
+/* $NetBSD: cbiisc.c,v 1.9 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -267,7 +267,7 @@
csc->sc_reg[reg * 4] = v;
#ifdef DEBUG
-if (cbiisc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL*/ &&
+if (cbiisc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL*/ &&
reg == NCR_CMD/* && csc->sc_active*/) {
cbiisc_trace[(cbiisc_trace_ptr - 1) & 127].yy = v;
/* printf(" cmd %x", v);*/
@@ -290,7 +290,7 @@
csc->sc_reg[0x40] = 0;
#ifdef DEBUG
-if (/*sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL &&*/ cbiisc_trace_enable) {
+if (/*sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL &&*/ cbiisc_trace_enable) {
cbiisc_trace[cbiisc_trace_ptr].status = csc->sc_reg[NCR_STAT * 4];
cbiisc_trace[cbiisc_trace_ptr].xx = csc->sc_reg[NCR_CMD * 4];
cbiisc_trace[cbiisc_trace_ptr].yy = csc->sc_active;
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/cbsc.c
--- a/sys/arch/amiga/dev/cbsc.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/cbsc.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cbsc.c,v 1.9 1999/09/25 21:47:08 is Exp $ */
+/* $NetBSD: cbsc.c,v 1.10 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -271,7 +271,7 @@
csc->sc_reg[reg * 4] = v;
#ifdef DEBUG
-if (cbsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL*/ &&
+if (cbsc_trace_enable/* && sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL*/ &&
reg == NCR_CMD/* && csc->sc_active*/) {
cbsc_trace[(cbsc_trace_ptr - 1) & 127].yy = v;
/* printf(" cmd %x", v);*/
@@ -297,7 +297,7 @@
if ((csc->sc_reg[0x802] & CBSC_HB_CREQ) == 0)
return 0;
#ifdef DEBUG
-if (/*sc->sc_nexus && sc->sc_nexus->xs->flags & SCSI_POLL &&*/ cbsc_trace_enable) {
+if (/*sc->sc_nexus && sc->sc_nexus->xs->xs_control & XS_CTL_POLL &&*/ cbsc_trace_enable) {
cbsc_trace[cbsc_trace_ptr].status = csc->sc_reg[NCR_STAT * 4];
cbsc_trace[cbsc_trace_ptr].xx = csc->sc_reg[NCR_CMD * 4];
cbsc_trace[cbsc_trace_ptr].yy = csc->sc_active;
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/flsc.c
--- a/sys/arch/amiga/dev/flsc.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/flsc.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: flsc.c,v 1.24 1999/09/25 21:47:10 is Exp $ */
+/* $NetBSD: flsc.c,v 1.25 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -257,16 +257,16 @@
v = NCRCMD_TRANS;
}
/*
- * Can't do synchronous transfers in SCSI_POLL mode:
- * If starting SCSI_POLL command, clear defer sync negotiation
- * by clearing the T_NEGOTIATE flag. If starting SCSI_POLL and
+ * Can't do synchronous transfers in XS_CTL_POLL mode:
+ * If starting XS_CTL_POLL command, clear defer sync negotiation
+ * by clearing the T_NEGOTIATE flag. If starting XS_CTL_POLL and
* the device is currently running synchronous, force another
* T_NEGOTIATE with 0 offset.
*/
if (reg == NCR_SELID) {
ti = &sc->sc_tinfo[
sc->sc_nexus->xs->sc_link->scsipi_scsi.target];
- if (sc->sc_nexus->xs->flags & SCSI_POLL) {
+ if (sc->sc_nexus->xs->xs_control & XS_CTL_POLL) {
if (ti->flags & T_SYNCMODE) {
ti->flags ^= T_SYNCMODE | T_NEGOTIATE;
} else if (ti->flags & T_NEGOTIATE) {
@@ -286,7 +286,7 @@
}
if (reg == NCR_CMD && v == NCRCMD_SETATN &&
sc->sc_flags & NCR_SYNCHNEGO &&
- sc->sc_nexus->xs->flags & SCSI_POLL) {
+ sc->sc_nexus->xs->xs_control & XS_CTL_POLL) {
ti = &sc->sc_tinfo[
sc->sc_nexus->xs->sc_link->scsipi_scsi.target];
ti->offset = 0;
@@ -508,7 +508,7 @@
fsc->sc_pdmalen = len;
fsc->sc_datain = datain;
fsc->sc_dmasize = *dmasize;
- if (sc->sc_nexus->xs->flags & SCSI_POLL) {
+ if (sc->sc_nexus->xs->xs_control & XS_CTL_POLL) {
/* polling mode, use PIO */
*dmasize = fsc->sc_dmasize;
NCR_DMA(("pfsc_dma_setup: PIO %p/%d [%d]\n", *addr,
@@ -647,7 +647,7 @@
NCR_DMA(("flsc_dma_go: datain %d size %d\n", fsc->sc_datain,
fsc->sc_dmasize));
- if (sc->sc_nexus->xs->flags & SCSI_POLL) {
+ if (sc->sc_nexus->xs->xs_control & XS_CTL_POLL) {
fsc->sc_active = 1;
return;
} else if (fsc->sc_piomode == 0) {
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/idesc.c
--- a/sys/arch/amiga/dev/idesc.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/idesc.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: idesc.c,v 1.41 1999/04/17 19:49:24 mhitch Exp $ */
+/* $NetBSD: idesc.c,v 1.42 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -567,12 +567,12 @@
slp = xs->sc_link;
dev = slp->adapter_softc;
- flags = xs->flags;
+ flags = xs->xs_control;
- if (flags & SCSI_DATA_UIO)
+ if (flags & XS_CTL_DATA_UIO)
panic("ide: scsi data uio requested");
- if (dev->sc_xs && flags & SCSI_POLL)
+ if (dev->sc_xs && flags & XS_CTL_POLL)
panic("ide_scsicmd: busy");
s = splbio();
@@ -597,7 +597,7 @@
*/
ide_donextcmd(dev);
- if (flags & SCSI_POLL)
+ if (flags & XS_CTL_POLL)
return(COMPLETE);
return(SUCCESSFULLY_QUEUED);
}
@@ -615,9 +615,9 @@
xs = dev->sc_xs;
slp = xs->sc_link;
- flags = xs->flags;
+ flags = xs->xs_control;
- if (flags & SCSI_RESET)
+ if (flags & XS_CTL_RESET)
idereset(dev);
dev->sc_stat[0] = -1;
@@ -626,7 +626,7 @@
ide_scsidone(dev, -1);
return;
}
- if (flags & SCSI_POLL || ide_no_int)
+ if (flags & XS_CTL_POLL || ide_no_int)
stat = ideicmd(dev, slp->scsipi_scsi.target, xs->cmd, xs->cmdlen,
xs->data, xs->datalen);
else if (idego(dev, xs) == 0)
@@ -676,7 +676,8 @@
break;
}
}
- xs->flags |= ITSDONE;
+
+ xs->xs_status |= XS_STS_DONE;
/*
* grab next command before scsipi_done()
@@ -1448,7 +1449,7 @@
#endif
dev->sc_cur = ide;
- while ((xs->flags & ITSDONE) == 0) {
+ while ((xs->xs_status & XS_STS_DONE) == 0) {
ide_atapi_intr(dev);
for (i = 2000; i > 0; --i)
if ((regs->ide_status & IDES_DRQ) == 0)
diff -r 38471872d5f9 -r 6ed016e5e299 sys/arch/amiga/dev/sbic.c
--- a/sys/arch/amiga/dev/sbic.c Thu Sep 30 22:57:52 1999 +0000
+++ b/sys/arch/amiga/dev/sbic.c Thu Sep 30 22:59:52 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.34 1998/11/05 14:13:59 frueauf Exp $ */
+/* $NetBSD: sbic.c,v 1.35 1999/09/30 22:59:52 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -381,12 +381,12 @@
slp = xs->sc_link;
dev = slp->adapter_softc;
SBIC_TRACE(dev);
- flags = xs->flags;
+ flags = xs->xs_control;
- if (flags & SCSI_DATA_UIO)
+ if (flags & XS_CTL_DATA_UIO)
panic("sbic: scsi data uio requested");
- if (dev->sc_nexus && flags & SCSI_POLL)
+ if (dev->sc_nexus && flags & XS_CTL_POLL)
panic("sbic_scsicmd: busy");
if (slp->scsipi_scsi.target == slp->scsipi_scsi.adapter_target)
@@ -412,7 +412,7 @@
}
acb->flags = ACB_ACTIVE;
- if (flags & SCSI_DATA_IN)
+ if (flags & XS_CTL_DATA_IN)
acb->flags |= ACB_DATAIN;
acb->xs = xs;
bcopy(xs->cmd, &acb->cmd, xs->cmdlen);
Home |
Main Index |
Thread Index |
Old Index