 @@ -1,14 +1,14 @@
-/* $Id: rmixl_com.c,v 1.1.2.8 2009/12/12 01:45:01 cliff Exp $ */
+/* $Id: rmixl_com.c,v 1.1.2.9 2009/12/14 07:18:55 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.8 2009/12/12 01:45:01 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.1.2.9 2009/12/14 07:18:55 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>
 @@ -133,37 +133,40 @@ static void rmixl_com_initmap(struct com
 static int rmixl_com_match(device_t, cfdata_t , void *);
 static void rmixl_com_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(rmixl_com, sizeof(struct rmixl_com_softc),
     rmixl_com_match, rmixl_com_attach, NULL, NULL);
 #ifndef	COM_REGMAP
 #error	COM_REGMAP not defined!
 #endif
 volatile uint32_t *com0addr = (uint32_t *)
 	MIPS_PHYS_TO_KSEG1(RMIXL_IO_DEV_PBASE + RMIXL_IO_DEV_UART_1);
 extern int comcnfreq;
 extern int comcnspeed;
 void
 rmixl_putchar_init(uint64_t io_pbase)
+{
 	int rate;
 	extern int comspeed(long, long, int);
 	com0addr = (uint32_t *)
 		MIPS_PHYS_TO_KSEG1(io_pbase + RMIXL_IO_DEV_UART_1);
-	if (CONSFREQ != -1) {
+	if (comcnfreq != -1) {
-		rate = comspeed(CONSPEED, CONSFREQ, COM_TYPE_NORMAL);
+		rate = comspeed(comcnspeed, comcnfreq, COM_TYPE_NORMAL);
 		if (rate < 0)
 			return;					/* XXX */
 		com0addr[com_ier] = 0;
 		com0addr[com_lctl] = htobe32(LCR_DLAB);
 		com0addr[com_dlbl] = htobe32(rate & 0xff);
 		com0addr[com_dlbh] = htobe32(rate >> 8);
 		com0addr[com_lctl] = htobe32(LCR_8BITS);	/* XXX */
 		com0addr[com_mcr]  = htobe32(MCR_DTR|MCR_RTS);
 		com0addr[com_fifo] = htobe32(
 			FIFO_ENABLE|FIFO_RCV_RST|FIFO_XMT_RST|FIFO_TRIGGER_1);
+	}
+}
 @@ -217,27 +220,27 @@ rmixl_puthex64(uint64_t val)
 	RMIXL_PUTHEX;
+}
 int
 rmixl_com_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct obio_attach_args *obio = aux;
 	bus_space_tag_t bst;
 	bus_addr_t addr;
 	bus_size_t size;
 	struct com_regs	regs;
 	int rv;
-	bst = obio->obio_bst;
+	bst = obio->obio_eb_bst;
 	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;
 @@ -252,29 +255,29 @@ rmixl_com_match(device_t parent, cfdata_
 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 = CONSFREQ;
+	sc->sc_frequency = comcnfreq;
-	bst = obio->obio_bst;
+	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);
 @@ -298,24 +301,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_obio_memt;
+	bst = (bus_space_tag_t)&rmixl_configuration.rc_obio_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);
+}