diff options
| author |   dlg <dlg@openbsd.org> | 2014-01-18 22:33:59 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2014-01-18 22:33:59 +0000 |
| commit | faa9569f00ddaf09e3815cb0793ec556d2d98b66 (patch) | |
| tree | d0a092a5cc11baade351a1b9cd08be9e5208f624 /sys/dev/tc | |
| parent | use the standard notation of <set>XX.tgz for the install sets (diff) | |
| download | wireguard-openbsd-faa9569f00ddaf09e3815cb0793ec556d2d98b66.tar.xz wireguard-openbsd-faa9569f00ddaf09e3815cb0793ec556d2d98b66.zip | |
instead of having every bit of glue set up and attach an identical
scsi_adapter struct, just do it once in the chip code.
ok krw@
Diffstat (limited to 'sys/dev/tc')
| -rw-r--r-- | sys/dev/tc/asc.c | 9 | ||||
| -rw-r--r-- | sys/dev/tc/asc_tc.c | 6 | ||||
| -rw-r--r-- | sys/dev/tc/asc_tcds.c | 6 |
3 files changed, 5 insertions, 16 deletions
diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c index ead505bdf44..2683fe7cf9d 100644 --- a/sys/dev/tc/asc.c +++ b/sys/dev/tc/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.25 2010/06/28 18:31:02 krw Exp $ */ +/* $OpenBSD: asc.c,v 1.26 2014/01/18 22:33:59 dlg Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -70,13 +70,6 @@ struct cfdriver asc_cd = { NULL, "asc", DV_DULL, }; -struct scsi_adapter asc_switch = { - ncr53c9x_scsi_cmd, - scsi_minphys, /* no max at this level; handled by DMA code */ - NULL, - NULL, -}; - /* * Glue functions */ diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c index c5c3591b267..b7eb1069fbe 100644 --- a/sys/dev/tc/asc_tc.c +++ b/sys/dev/tc/asc_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_tc.c,v 1.11 2010/11/11 17:54:54 miod Exp $ */ +/* $OpenBSD: asc_tc.c,v 1.12 2014/01/18 22:33:59 dlg Exp $ */ /* $NetBSD: asc_tc.c,v 1.19 2001/11/15 09:48:19 lukem Exp $ */ /*- @@ -61,8 +61,6 @@ struct cfattach asc_tc_ca = { sizeof(struct asc_tc_softc), asc_tc_match, asc_tc_attach }; -extern struct scsi_adapter asc_switch; - int asc_dma_isintr(struct ncr53c9x_softc *); void asc_tc_reset(struct ncr53c9x_softc *); int asc_tc_intr(struct ncr53c9x_softc *); @@ -179,7 +177,7 @@ asc_tc_attach(parent, self, aux) sc->sc_freq /= 1000; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &asc_switch); + ncr53c9x_attach(sc); } void diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c index 4d3f4d1522a..64a40a8035d 100644 --- a/sys/dev/tc/asc_tcds.c +++ b/sys/dev/tc/asc_tcds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_tcds.c,v 1.7 2010/06/28 18:31:02 krw Exp $ */ +/* $OpenBSD: asc_tcds.c,v 1.8 2014/01/18 22:33:59 dlg Exp $ */ /* $NetBSD: asc_tcds.c,v 1.5 2001/11/15 09:48:19 lukem Exp $ */ /*- @@ -113,8 +113,6 @@ struct ncr53c9x_glue asc_tcds_glue = { tcds_clear_latched_intr, }; -extern struct scsi_adapter asc_switch; - int asc_tcds_match(parent, cf, aux) struct device *parent; @@ -210,7 +208,7 @@ asc_tcds_attach(parent, self, aux) sc->sc_maxxfer = 64 * 1024; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &asc_switch); + ncr53c9x_attach(sc); } void |