CVS commit: src/sys/arch/mmeye/dev

[KIYOHARA Takashi]

Module Name:    src
Committed By:   kiyohara
Date:           Wed Feb  2 04:46:25 UTC 2011

Modified Files:
        src/sys/arch/mmeye/dev: com_mainbus.c

Log Message:
Use cf_name to match instead of cd_name.
Call com_is_console().
Using bus_space_tag_t and bus_space_handle_t is manners for more machines.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mmeye/dev/com_mainbus.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/mmeye/dev/com_mainbus.c
diff -u src/sys/arch/mmeye/dev/com_mainbus.c:1.9 src/sys/arch/mmeye/dev/com_mainbus.c:1.10
--- src/sys/arch/mmeye/dev/com_mainbus.c:1.9	Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mmeye/dev/com_mainbus.c	Wed Feb  2 04:46:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mainbus.c,v 1.9 2008/04/28 20:23:29 martin Exp $	*/
+/*	$NetBSD: com_mainbus.c,v 1.10 2011/02/02 04:46:25 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.9 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.10 2011/02/02 04:46:25 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,10 +70,9 @@
 int
 com_mainbus_match(device_t parent, cfdata_t match, void *aux)
 {
-	extern struct cfdriver com_cd;
 	struct mainbus_attach_args *ma = aux;
 
-	if (strcmp(ma->ma_name, com_cd.cd_name) == 0)
+	if (strcmp(ma->ma_name, match->cf_name) == 0)
 		return (1);
 
 	return (0);
@@ -85,13 +84,20 @@
 	struct mainbus_attach_args *ma = aux;
 	struct com_mainbus_softc *sc = device_private(self);
 	struct com_softc *csc = &sc->sc_com;
+	const bus_space_tag_t iot = 0;
+	bus_space_handle_t ioh;
 
+	if (!com_is_console(iot, ma->ma_addr1, &ioh))
+		if (bus_space_map(iot, ma->ma_addr1, COM_NPORTS, 0, &ioh)) {
+			aprint_error(": can't map i/o space\n");
+			return;
+		}
 	csc->sc_dev = self;
 	csc->sc_frequency = COM_FREQ;
-	COM_INIT_REGS(csc->sc_regs, 0, ma->ma_addr1, 0);
+	COM_INIT_REGS(csc->sc_regs, iot, ioh, ma->ma_addr1);
 
 	/* sanity check */
-	if (!comprobe1(0, ma->ma_addr1)) {
+	if (!comprobe1(iot, ioh)) {
 		aprint_error(": device problem. don't attach.\n");
 		return;
 	}
@@ -115,7 +121,8 @@
 void
 comcninit(struct consdev *cp)
 {
+	const bus_space_tag_t iot = 0;
 
-	comcnattach(0, CONADDR, COMCN_SPEED, COM_FREQ, COM_TYPE_NORMAL,
+	comcnattach(iot, CONADDR, COMCN_SPEED, COM_FREQ, COM_TYPE_NORMAL,
 	    CONMODE);
 }