diff options
Diffstat (limited to 'sys/arch/mac68k')
| -rw-r--r-- | sys/arch/mac68k/dev/esp.c | 11 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/ncr5380.c | 10 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/sbc.c | 11 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/sbc_obio.c | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/sbcvar.h | 3 |
5 files changed, 6 insertions, 32 deletions
diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c index 124d747e900..f38532e73cb 100644 --- a/sys/arch/mac68k/dev/esp.c +++ b/sys/arch/mac68k/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.29 2010/06/26 23:24:43 guenther Exp $ */ +/* $OpenBSD: esp.c,v 1.30 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: esp.c,v 1.17 1998/09/05 15:15:35 pk Exp $ */ /* @@ -114,13 +114,6 @@ struct scsi_adapter esp_switch = { NULL, }; -struct scsi_device esp_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - /* * Functions and the switch for the MI code. */ @@ -318,7 +311,7 @@ espattach(parent, self, aux) /* * Now try to attach all the sub-devices */ - ncr53c9x_attach(sc, &esp_switch, &esp_dev); + ncr53c9x_attach(sc, &esp_switch); } /* diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index 201cab11ff6..fcc953ae3ae 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.38 2010/03/23 01:57:19 krw Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.39 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -84,13 +84,6 @@ struct scsi_adapter ncr5380_switch = { NULL /* free_dev() */ }; -struct scsi_device ncr5380_dev = { - NULL, /* use default error handler */ - NULL, /* do not have a start functio */ - NULL, /* have no async handler */ - NULL /* Use default done routine */ -}; - static SC_REQ req_queue[NREQ]; static SC_REQ *free_head = NULL; /* Free request structures */ @@ -237,7 +230,6 @@ void *auxp; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = 7; sc->sc_link.adapter = &ncr5380_switch; - sc->sc_link.device = &ncr5380_dev; sc->sc_link.openings = NREQ - 1; /* diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c index 93ded6121c7..f627bd26335 100644 --- a/sys/arch/mac68k/dev/sbc.c +++ b/sys/arch/mac68k/dev/sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc.c,v 1.19 2010/06/26 23:24:43 guenther Exp $ */ +/* $OpenBSD: sbc.c,v 1.20 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: sbc.c,v 1.24 1997/04/18 17:38:08 scottr Exp $ */ /* @@ -84,15 +84,6 @@ struct scsi_adapter sbc_ops = { NULL, /* free_dev() */ }; -/* This is copied from julian's bt driver */ -/* "so we have a default dev struct for our link struct." */ -struct scsi_device sbc_dev = { - NULL, /* Use default error handler. */ - NULL, /* Use default start handler. */ - NULL, /* Use default async handler. */ - NULL, /* Use default "done" routine. */ -}; - struct cfdriver sbc_cd = { NULL, "sbc", DV_DULL }; diff --git a/sys/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c index 34c1b494557..2917acde15e 100644 --- a/sys/arch/mac68k/dev/sbc_obio.c +++ b/sys/arch/mac68k/dev/sbc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc_obio.c,v 1.16 2010/06/26 23:24:43 guenther Exp $ */ +/* $OpenBSD: sbc_obio.c,v 1.17 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: sbc_obio.c,v 1.1 1997/03/01 20:18:59 scottr Exp $ */ /* @@ -166,7 +166,6 @@ sbc_obio_attach(parent, self, args) ncr_sc->sc_link.adapter_softc = sc; ncr_sc->sc_link.adapter_target = 7; ncr_sc->sc_link.adapter = &sbc_ops; - ncr_sc->sc_link.device = &sbc_dev; ncr_sc->sc_link.openings = 4; /* diff --git a/sys/arch/mac68k/dev/sbcvar.h b/sys/arch/mac68k/dev/sbcvar.h index acd78c3de51..059413013e7 100644 --- a/sys/arch/mac68k/dev/sbcvar.h +++ b/sys/arch/mac68k/dev/sbcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbcvar.h,v 1.8 2006/12/13 21:12:56 miod Exp $ */ +/* $OpenBSD: sbcvar.h,v 1.9 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: sbcvar.h,v 1.1 1997/03/01 20:19:00 scottr Exp $ */ /* @@ -106,7 +106,6 @@ extern int sbc_debug; extern int sbc_link_flags; extern int sbc_options; extern struct scsi_adapter sbc_ops; -extern struct scsi_device sbc_dev; int sbc_pdma_in(struct ncr5380_softc *, int, int, u_char *); int sbc_pdma_out(struct ncr5380_softc *, int, int, u_char *); |