 @@ -1,14 +1,14 @@
-/* $Id: rmixl_com.c,v 1.1.2.3 2009/09/15 02:33:39 cliff Exp $ */
+/* $Id: rmixl_com.c,v 1.1.2.4 2009/09/15 10:32:41 cliff Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -91,27 +91,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)com.c	7.5 (Berkeley) 5/16/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.1.2.3 2009/09/15 02:33:39 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.1.2.4 2009/09/15 10:32:41 cliff Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/termios.h>
 #include <sys/ttydefaults.h>
 #include <sys/types.h>
 #include <machine/bus.h>
 #include <dev/cons.h>
 #include <dev/ic/comreg.h>
 @@ -208,61 +208,64 @@ rmixl_com_match(device_t parent, cfdata_
 	struct com_regs	regs;
 	int rv;
 	bst = obio->obio_eb_bst;	/* com is always big endian */
 	addr = obio->obio_addr;
 	size = obio->obio_size;
 	if (com_is_console(bst, addr, &regs.cr_ioh))
 		return 1;
 	if (bus_space_map(bst, addr, size, 0, &regs.cr_ioh))
 		return 0;		/* FAIL */
 	memset(&regs, 0, sizeof(regs));
 	regs.cr_iot = bst;
 	regs.cr_iobase = addr;
 	regs.cr_nports = size;
 	rmixl_com_initmap(&regs);
 	rv = com_probe_subr(&regs);
 	bus_space_unmap(bst, regs.cr_ioh, size);
 	return rv;
+}
 void
 rmixl_com_attach(device_t parent, device_t self, void *aux)
+{
 	struct rmixl_com_softc *rsc = device_private(self);
 	struct com_softc *sc = &rsc->sc_com;
 	struct obio_attach_args *obio = aux;
 	bus_space_tag_t bst;
 	bus_space_handle_t ioh;
 	bus_addr_t addr;
 	bus_size_t size;
 	sc->sc_dev = self;
 	sc->sc_frequency = -1;	/* XXX */
 	bst = obio->obio_eb_bst;
 	addr = obio->obio_addr;
 	size = obio->obio_size;
 	if (!com_is_console(bst, addr, &ioh)
 	&&  bus_space_map(bst, addr, size, 0, &ioh) != 0) {
 		aprint_error(": can't map registers\n");
 		return;
+	}
 	memset(&sc->sc_regs, 0, sizeof(sc->sc_regs));
 	COM_INIT_REGS(sc->sc_regs, bst, ioh, addr);
 	sc->sc_regs.cr_nports = size;
 	rmixl_com_initmap(&sc->sc_regs);
 	com_attach_subr(sc);
 #ifdef NOTYET
 	rmixl_intr_establish(obio->obio_intr, comintr, sc);
 #endif
+}
 void
 rmixl_com_initmap(struct com_regs *regsp)
 @@ -276,24 +279,24 @@ rmixl_com_initmap(struct com_regs *regsp
 	sz = sizeof(regsp->cr_map) / sizeof(regsp->cr_map[0]);
 	for (i = 0; i < 16; i++)
 		regsp->cr_map[i] = com_std_map[i] * 4;
+}
 void
 rmixl_com_cnattach(bus_addr_t addr, int speed, int freq,
 	int type, tcflag_t mode)
+{
 	bus_space_tag_t bst;
 	bus_size_t sz;
 	struct com_regs	regs;
-	bst = (bus_space_tag_t)&rmixl_configuration.rc_el_memt;
+	bst = (bus_space_tag_t)&rmixl_configuration.rc_eb_memt;
 	sz = COM_NPORTS * sizeof(uint32_t);	/* span of UART regs in bytes */
 	memset(&regs, 0, sizeof(regs));
 	rmixl_com_initmap(&regs);
 	regs.cr_iot = bst;
 	regs.cr_iobase = addr;
 	regs.cr_nports = sz;
 	comcnattach1(&regs, speed, freq, type, mode);
+}