CVS commit: src/sys/arch/evbppc/explora/dev

[Rin Okuyama]

Module Name:    src
Committed By:   rin
Date:           Fri Mar  5 06:17:02 UTC 2021

Modified Files:
        src/sys/arch/evbppc/explora/dev: pckbc_elb.c

Log Message:
Avoid doubly bus_space_map(9) when pckbc(4) is already attached as console.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/explora/dev/pckbc_elb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c
diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.11 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.12
--- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.11	Fri Mar  5 06:14:47 2021
+++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c	Fri Mar  5 06:17:02 2021
@@ -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
 	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;