CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi

[Cliff Neighbors]

Module Name:    src
Committed By:   cliff
Date:           Mon Dec 14 07:18:55 UTC 2009

Modified Files:
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_com.c

Log Message:
- replace single bus space with two (big & little endian) bus spaces for obio
- use comcnspeed instead of CONSPEED
- use comcnfreq instead of CONFREQ


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/rmi/rmixl_com.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/mips/rmi/rmixl_com.c
diff -u src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.8 src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.9
--- src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.8	Sat Dec 12 01:45:01 2009
+++ src/sys/arch/mips/rmi/rmixl_com.c	Mon Dec 14 07:18:55 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -101,7 +101,7 @@
  */
 
 #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>
@@ -143,6 +143,9 @@
 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)
 {
@@ -152,8 +155,8 @@
 	com0addr = (uint32_t *)
 		MIPS_PHYS_TO_KSEG1(io_pbase + RMIXL_IO_DEV_UART_1);
 
-	if (CONSFREQ != -1) {
-		rate = comspeed(CONSPEED, CONSFREQ, COM_TYPE_NORMAL);
+	if (comcnfreq != -1) {
+		rate = comspeed(comcnspeed, comcnfreq, COM_TYPE_NORMAL);
 		if (rate < 0)
 			return;					/* XXX */
 
@@ -227,7 +230,7 @@
 	struct com_regs	regs;
 	int rv;
 
-	bst = obio->obio_bst;
+	bst = obio->obio_eb_bst;
 	addr = obio->obio_addr;
 	size = obio->obio_size;
 
@@ -262,9 +265,9 @@
 	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;
 
@@ -308,7 +311,7 @@
 	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));