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

[Cliff Neighbors]

Module Name:    src
Committed By:   cliff
Date:           Tue Sep 15 10:32:41 UTC 2009

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

Log Message:
fix typo assigning bus_space_tag in rmixl_com_cnattach
set sc_dev in rmixl_com_attach


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 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.3 src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.4
--- src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.3	Tue Sep 15 02:33:39 2009
+++ src/sys/arch/mips/rmi/rmixl_com.c	Tue Sep 15 10:32:41 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -101,7 +101,7 @@
  */
 
 #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>
@@ -218,6 +218,7 @@
 	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;
@@ -241,6 +242,7 @@
 	bus_addr_t addr;
 	bus_size_t size;
 
+	sc->sc_dev = self;
 	sc->sc_frequency = -1;	/* XXX */
 
 	bst = obio->obio_eb_bst;
@@ -253,6 +255,7 @@
 		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);
@@ -286,7 +289,7 @@
 	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));