diff options
| author |   mickey <mickey@openbsd.org> | 2003-01-08 05:20:35 +0000 |
|---|---|---|
| committer | mickey <mickey@openbsd.org> | 2003-01-08 05:20:35 +0000 |
| commit | f95b89f848560ed3452f996d2e4f714c6992787e (patch) | |
| tree | b658ab1a03864011950528c69645af7165879a1e | |
| parent | this one is old and must die now (diff) | |
| download | wireguard-openbsd-f95b89f848560ed3452f996d2e4f714c6992787e.tar.xz wireguard-openbsd-f95b89f848560ed3452f996d2e4f714c6992787e.zip | |
better osiop at gsc attachment and kill dead siop from files.hppa
| -rw-r--r-- | sys/arch/hppa/conf/files.hppa | 9 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/osiop_gsc.c | 21 | ||||
| -rw-r--r-- | sys/conf/files | 4 |
3 files changed, 9 insertions, 25 deletions
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa index 0909280c59e..653b666378f 100644 --- a/sys/arch/hppa/conf/files.hppa +++ b/sys/arch/hppa/conf/files.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: files.hppa,v 1.37 2003/01/08 02:11:38 krw Exp $ +# $OpenBSD: files.hppa,v 1.38 2003/01/08 05:20:35 mickey Exp $ # # hppa-specific configuration info @@ -146,11 +146,8 @@ file arch/hppa/gsc/lpt_gsc.c lpt_gsc attach ie at gsc with ie_gsc file arch/hppa/gsc/if_ie_gsc.c ie_gsc -attach siop at gsc -file arch/hppa/gsc/siop_gsc.c siop - -attach osiop at gsc -file arch/hppa/gsc/osiop_gsc.c osiop +attach osiop at gsc with osiop_gsc +file arch/hppa/gsc/osiop_gsc.c osiop_gsc device hil: tty attach hil at gsc diff --git a/sys/arch/hppa/gsc/osiop_gsc.c b/sys/arch/hppa/gsc/osiop_gsc.c index 1ad2728258d..f9d3c110747 100644 --- a/sys/arch/hppa/gsc/osiop_gsc.c +++ b/sys/arch/hppa/gsc/osiop_gsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: osiop_gsc.c,v 1.1 2003/01/08 02:11:38 krw Exp $ */ +/* $OpenBSD: osiop_gsc.c,v 1.2 2003/01/08 05:20:35 mickey Exp $ */ /* $NetBSD: osiop_gsc.c,v 1.6 2002/10/02 05:17:50 thorpej Exp $ */ /* @@ -27,9 +27,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -/* $OpenBSD: osiop_gsc.c,v 1.1 2003/01/08 02:11:38 krw Exp $ */ - /* * Copyright (c) 1998 Michael Shalayeff * All rights reserved. @@ -89,10 +86,8 @@ int osiop_gsc_match(struct device *, void *, void *); void osiop_gsc_attach(struct device *, struct device *, void *); int osiop_gsc_intr(void *); -struct cfattach osiop_ca = { - sizeof(struct osiop_softc), - osiop_gsc_match, - osiop_gsc_attach +struct cfattach osiop_gsc_ca = { + sizeof(struct osiop_softc), osiop_gsc_match, osiop_gsc_attach }; int @@ -101,21 +96,13 @@ osiop_gsc_match(parent, match, aux) void *match, *aux; { struct gsc_attach_args *ga = aux; - bus_space_handle_t ioh; - int rv = 1; if (ga->ga_type.iodc_type != HPPA_TYPE_FIO || (ga->ga_type.iodc_sv_model != HPPA_FIO_GSCSI && ga->ga_type.iodc_sv_model != HPPA_FIO_SCSI)) return 0; - if (bus_space_map(ga->ga_iot, ga->ga_hpa, - OSIOP_GSC_OFFSET + OSIOP_NREGS, 0, &ioh)) - return 0; - - - bus_space_unmap(ga->ga_iot, ioh, OSIOP_GSC_OFFSET + OSIOP_NREGS); - return rv; + return 1; } void diff --git a/sys/conf/files b/sys/conf/files index 40426a1b4d3..b2decf384d7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.265 2003/01/08 02:11:38 krw Exp $ +# $OpenBSD: files,v 1.266 2003/01/08 05:20:35 mickey Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -172,7 +172,7 @@ file dev/ic/siop.c siop # Symbios/NCR 53c720/53c8xx SCSI controllers device osiop: scsi -file dev/ic/osiop.c osiop +file dev/ic/osiop.c osiop & osiop_gsc # 3Com Etherlink-III Ethernet controller device ep: ether, ifnet, ifmedia, mii |