diff options
| author | rin <rin@NetBSD.org> | 2021-03-05 06:17:02 +0000 |
|---|---|---|
| committer | rin <rin@NetBSD.org> | 2021-03-05 06:17:02 +0000 |
| commit | 9bb0b5b33247559bf2cd1f6134621672bb8f03ea (patch) | |
| tree | 0c81b2db5cdb1af6843bd555d129f7fad19744f9 /sys/arch/evbppc/explora/dev | |
| parent | 1a8c044369acdaf8f77da3339e58c58dd1cf35a2 (diff) | |
Avoid doubly bus_space_map(9) when pckbc(4) is already attached as console.
Diffstat (limited to 'sys/arch/evbppc/explora/dev')
| -rw-r--r-- | sys/arch/evbppc/explora/dev/pckbc_elb.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/arch/evbppc/explora/dev/pckbc_elb.c b/sys/arch/evbppc/explora/dev/pckbc_elb.c index 5eaff4ea157..c65a0db6196 100644 --- a/sys/arch/evbppc/explora/dev/pckbc_elb.c +++ b/sys/arch/evbppc/explora/dev/pckbc_elb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_elb.c,v 1.11 2021/03/05 06:14:47 rin Exp $ */ +/* $NetBSD: pckbc_elb.c,v 1.12 2021/03/05 06:17:02 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.11 2021/03/05 06:14:47 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.12 2021/03/05 06:17:02 rin Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -84,19 +84,23 @@ pckbc_elb_attach(device_t parent, device_t self, void *aux) msc->sc_irq = eaa->elb_irq; sc->intr_establish = pckbc_elb_intr_establish; - if (pckbc_is_console(eaa->elb_bt, eaa->elb_base)) { + if (pckbc_is_console(eaa->elb_bt, + _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base))) { t = &pckbc_consdata; pckbc_console_attached = 1; } else { t = kmem_zalloc(sizeof(struct pckbc_internal), KM_SLEEP); + + t->t_iot = eaa->elb_bt; + bus_space_map(eaa->elb_bt, + _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base), 1, 0, + &t->t_ioh_d); + bus_space_map(eaa->elb_bt, + _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base2), 1, 0, + &t->t_ioh_c); + t->t_addr = eaa->elb_base; } - t->t_iot = eaa->elb_bt; - bus_space_map(eaa->elb_bt, - _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base), 1, 0, &t->t_ioh_d); - bus_space_map(eaa->elb_bt, - _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base2), 1, 0, &t->t_ioh_c); - t->t_addr = eaa->elb_base; t->t_sc = sc; sc->id = t; |
