Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys/arch/amiga/dev Make these pass a compile test o...
details: https://anonhg.NetBSD.org/src/rev/a4a486dd52e4
branches: thorpej_scsipi
changeset: 477432:a4a486dd52e4
user: bouyer <bouyer%NetBSD.org@localhost>
date: Thu Mar 29 09:57:40 2001 +0000
description:
Make these pass a compile test on i386.
diffstat:
sys/arch/amiga/dev/cbiiisc.c | 4 ++--
sys/arch/amiga/dev/gtsc.c | 4 ++--
sys/arch/amiga/dev/sbic.c | 16 ++++++++--------
sys/arch/amiga/dev/sci.c | 4 ++--
sys/arch/amiga/dev/scivar.h | 3 +--
sys/arch/amiga/dev/siop.c | 18 +++++++++---------
sys/arch/amiga/dev/siop2.c | 23 +++++++++++------------
sys/arch/amiga/dev/zssc.c | 15 ++-------------
8 files changed, 37 insertions(+), 50 deletions(-)
diffs (truncated from 362 to 300 lines):
diff -r 0d3bcd942e02 -r a4a486dd52e4 sys/arch/amiga/dev/cbiiisc.c
--- a/sys/arch/amiga/dev/cbiiisc.c Thu Mar 29 09:39:51 2001 +0000
+++ b/sys/arch/amiga/dev/cbiiisc.c Thu Mar 29 09:57:40 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cbiiisc.c,v 1.5.2.2 2001/03/29 09:02:55 bouyer Exp $ */
+/* $NetBSD: cbiiisc.c,v 1.5.2.3 2001/03/29 09:57:40 bouyer Exp $ */
/*
* Copyright (c) 1994,1998 Michael L. Hitch
@@ -91,7 +91,7 @@
struct device *pdp, *dp;
void *auxp;
{
- struct siop_softc *sc (struct siop_softc *)dp;
+ struct siop_softc *sc = (struct siop_softc *)dp;
struct zbus_args *zap;
siop_regmap_p rp;
struct scsipi_adapter *adapt = &sc->sc_adapter;
diff -r 0d3bcd942e02 -r a4a486dd52e4 sys/arch/amiga/dev/gtsc.c
--- a/sys/arch/amiga/dev/gtsc.c Thu Mar 29 09:39:51 2001 +0000
+++ b/sys/arch/amiga/dev/gtsc.c Thu Mar 29 09:57:40 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gtsc.c,v 1.27.10.1 2000/11/20 19:58:35 bouyer Exp $ */
+/* $NetBSD: gtsc.c,v 1.27.10.2 2001/03/29 09:57:41 bouyer Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -103,7 +103,7 @@
{
volatile struct sdmac *rp;
struct gvpbus_args *gap;
- struct sbic_softc *sc (struct sbic_softc *)dp;
+ struct sbic_softc *sc = (struct sbic_softc *)dp;
struct scsipi_adapter *adapt = &sc->sc_adapter;
struct scsipi_channel *chan = &sc->sc_channel;
diff -r 0d3bcd942e02 -r a4a486dd52e4 sys/arch/amiga/dev/sbic.c
--- a/sys/arch/amiga/dev/sbic.c Thu Mar 29 09:39:51 2001 +0000
+++ b/sys/arch/amiga/dev/sbic.c Thu Mar 29 09:57:40 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.36.2.2 2001/03/29 09:02:55 bouyer Exp $ */
+/* $NetBSD: sbic.c,v 1.36.2.3 2001/03/29 09:57:41 bouyer Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -375,7 +375,7 @@
int flags, s, stat;
switch (req) {
- case ADAPTER_REQ_RUN_XFER;
+ case ADAPTER_REQ_RUN_XFER:
xs = arg;
periph = xs->xs_periph;
@@ -443,7 +443,7 @@
if (dev->sc_nexus) {
splx(s);
SBIC_TRACE(dev);
- return(SUCCESSFULLY_QUEUED);
+ return;
}
/*
@@ -460,7 +460,7 @@
#endif
return;
- case ADAPTER_REQ_GROW_RESOURCES;
+ case ADAPTER_REQ_GROW_RESOURCES:
return;
case ADAPTER_REQ_SET_XFER_MODE:
@@ -493,8 +493,8 @@
TAILQ_REMOVE(&dev->ready_list, acb, chain);
dev->sc_nexus = acb;
- ti = &dev->sc_tinfo[periph->perih_target];
- ti->lubusy |= (1 << periph->perih_lun);
+ ti = &dev->sc_tinfo[periph->periph_target];
+ ti->lubusy |= (1 << periph->periph_lun);
acb->sc_pa.dc_addr = acb->pa_addr; /* XXXX check */
break;
}
@@ -546,7 +546,7 @@
xs = acb->xs;
periph = xs->xs_periph;
- dev = slp->adapter_softc;
+ dev = (void *)periph->periph_channel->chan_adapter->adapt_dev;
SBIC_TRACE(dev);
#ifdef DIAGNOSTIC
if (acb == NULL || xs == NULL) {
@@ -573,7 +573,7 @@
if (xs->error == XS_NOERROR) {
if (stat == SCSI_CHECK || stat == SCSI_BUSY)
- xs->error == XS_BUSY;
+ xs->error = XS_BUSY;
}
/*
diff -r 0d3bcd942e02 -r a4a486dd52e4 sys/arch/amiga/dev/sci.c
--- a/sys/arch/amiga/dev/sci.c Thu Mar 29 09:39:51 2001 +0000
+++ b/sys/arch/amiga/dev/sci.c Thu Mar 29 09:57:40 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sci.c,v 1.21.2.2 2001/03/29 09:02:56 bouyer Exp $ */
+/* $NetBSD: sci.c,v 1.21.2.3 2001/03/29 09:57:41 bouyer Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -122,7 +122,6 @@
{
struct scsipi_xfer *xs;
struct scsipi_periph *periph;
- struct sci_pending *pendp;
struct sci_softc *dev = (void *)chan->chan_adapter->adapt_dev;
int flags, s;
@@ -165,6 +164,7 @@
case ADAPTER_REQ_SET_XFER_MODE:
return;
+ }
}
/*
diff -r 0d3bcd942e02 -r a4a486dd52e4 sys/arch/amiga/dev/scivar.h
--- a/sys/arch/amiga/dev/scivar.h Thu Mar 29 09:39:51 2001 +0000
+++ b/sys/arch/amiga/dev/scivar.h Thu Mar 29 09:57:40 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scivar.h,v 1.12.10.1 2000/11/20 19:58:42 bouyer Exp $ */
+/* $NetBSD: scivar.h,v 1.12.10.2 2001/03/29 09:57:41 bouyer Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -47,7 +47,6 @@
struct isr sc_isr;
struct scsipi_adapter sc_adapter;
struct scsipi_channel sc_channel;
- struct sci_pending sc_xsstore[8][8];
struct scsipi_xfer *sc_xs; /* transfer from high level code */
volatile u_char *sci_data; /* r: Current data */
diff -r 0d3bcd942e02 -r a4a486dd52e4 sys/arch/amiga/dev/siop.c
--- a/sys/arch/amiga/dev/siop.c Thu Mar 29 09:39:51 2001 +0000
+++ b/sys/arch/amiga/dev/siop.c Thu Mar 29 09:57:40 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.43.2.2 2001/03/29 09:02:56 bouyer Exp $ */
+/* $NetBSD: siop.c,v 1.43.2.3 2001/03/29 09:57:41 bouyer Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -81,7 +81,7 @@
void siopsetdelay __P((int));
void siop_scsidone __P((struct siop_acb *, int));
void siop_sched __P((struct siop_softc *));
-int siop_poll __P((struct siop_softc *, struct siop_acb *));
+void siop_poll __P((struct siop_softc *, struct siop_acb *));
void siopintr __P((struct siop_softc *));
void scsi_period_to_siop __P((struct siop_softc *, int));
void siop_start __P((struct siop_softc *, int, int, u_char *, int, u_char *, int));
@@ -228,7 +228,7 @@
* This should never happen as we track the resources
* in the mid-layer.
*/
- if (abc == NULL) {
+ if (acb == NULL) {
scsipi_printaddr(periph);
printf("unable to allocate acb\n");
panic("siop_scsipi_request");
@@ -259,9 +259,10 @@
case ADAPTER_REQ_SET_XFER_MODE:
return;
+ }
}
-int
+void
siop_poll(sc, acb)
struct siop_softc *sc;
struct siop_acb *acb;
@@ -299,7 +300,7 @@
--to;
if (to <= 0) {
siopreset(sc);
- return(COMPLETE);
+ return;
}
}
delay(20);
@@ -322,7 +323,6 @@
break;
}
splx(s);
- return (COMPLETE);
}
/*
@@ -406,7 +406,7 @@
if (xs->error == XS_NOERROR) {
if (stat == SCSI_CHECK || stat == SCSI_BUSY)
- xs->error == XS_BUSY;
+ xs->error = XS_BUSY;
}
/*
@@ -622,7 +622,7 @@
rp->siop_dmode = 0x80; /* burst length = 4 */
rp->siop_sien = 0x00; /* don't enable interrupts yet */
rp->siop_dien = 0x00; /* don't enable interrupts yet */
- rp->siop_scid = 1 << sc->sc_channel->chan_id;
+ rp->siop_scid = 1 << sc->sc_channel.chan_id;
rp->siop_dwt = 0x00;
rp->siop_ctest0 |= SIOP_CTEST0_BTD | SIOP_CTEST0_EAN;
rp->siop_ctest7 |= sc->sc_ctest7;
@@ -639,7 +639,7 @@
splx (s);
delay (siop_reset_delay * 1000);
- printf("siop id %d reset V%d\n", sc->sc_channel->chan_id,
+ printf("siop id %d reset V%d\n", sc->sc_channel.chan_id,
rp->siop_ctest8 >> 4);
if ((sc->sc_flags & SIOP_ALIVE) == 0) {
diff -r 0d3bcd942e02 -r a4a486dd52e4 sys/arch/amiga/dev/siop2.c
--- a/sys/arch/amiga/dev/siop2.c Thu Mar 29 09:39:51 2001 +0000
+++ b/sys/arch/amiga/dev/siop2.c Thu Mar 29 09:57:40 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siop2.c,v 1.14.2.2 2001/03/29 09:02:56 bouyer Exp $ */
+/* $NetBSD: siop2.c,v 1.14.2.3 2001/03/29 09:57:42 bouyer Exp $ */
/*
* Copyright (c) 1994,1998 Michael L. Hitch
@@ -84,7 +84,7 @@
void siopngsetdelay __P((int));
void siopng_scsidone __P((struct siop_acb *, int));
void siopng_sched __P((struct siop_softc *));
-int siopng_poll __P((struct siop_softc *, struct siop_acb *));
+void siopng_poll __P((struct siop_softc *, struct siop_acb *));
void siopngintr __P((struct siop_softc *));
void scsi_period_to_siopng __P((struct siop_softc *, int));
void siopng_start __P((struct siop_softc *, int, int, u_char *, int, u_char *, int));
@@ -248,7 +248,7 @@
}
}
-int
+void
siopng_poll(sc, acb)
struct siop_softc *sc;
struct siop_acb *acb;
@@ -286,7 +286,7 @@
--to;
if (to <= 0) {
siopngreset(sc);
- return(COMPLETE);
+ return;
}
}
delay(20);
@@ -308,7 +308,6 @@
break;
}
splx(s);
- return (COMPLETE);
}
/*
@@ -385,14 +384,14 @@
return;
}
periph = xs->xs_periph;
- sc = (void *)periph->periph_chan->chan_adapter->adapt_dev;
+ sc = (void *)periph->periph_channel->chan_adapter->adapt_dev;
xs->status = stat;
xs->resid = 0; /* XXXX */
if (xs->error == XS_NOERROR) {
if (stat == SCSI_CHECK || stat == SCSI_BUSY)
- xs->error == XS_BUSY;
+ xs->error = XS_BUSY;
}
/*
@@ -616,9 +615,9 @@
rp->siop_dmode = 0xc0; /* XXX burst length */
rp->siop_sien = 0x00; /* don't enable interrupts yet */
rp->siop_dien = 0x00; /* don't enable interrupts yet */
- rp->siop_scid = sc->sc_channel->chan_id |
+ rp->siop_scid = sc->sc_channel.chan_id |
SIOP_SCID_RRE | SIOP_SCID_SRE;
- rp->siop_respid = 1 << sc->channel->chan_id;
+ rp->siop_respid = 1 << sc->sc_channel.chan_id;
rp->siop_dwt = 0x00;
rp->siop_stime0 = 0x0c; /* XXXXX check */
@@ -640,7 +639,7 @@
Home |
Main Index |
Thread Index |
Old Index