CVS commit: src/sys/arch/mips/ralink

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Wed Apr 30 00:52:49 UTC 2014

Modified Files:
        src/sys/arch/mips/ralink: ralink_mainbus.c

Log Message:
Instead of
mainbus0 (root): Ralink System Bus
be more explicit about the system:
mainbus0 (root): Mediatek MT7620 System Bus


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/ralink/ralink_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/mips/ralink/ralink_mainbus.c
diff -u src/sys/arch/mips/ralink/ralink_mainbus.c:1.3 src/sys/arch/mips/ralink/ralink_mainbus.c:1.4
--- src/sys/arch/mips/ralink/ralink_mainbus.c:1.3	Wed Mar 26 17:42:00 2014
+++ src/sys/arch/mips/ralink/ralink_mainbus.c	Wed Apr 30 00:52:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ralink_mainbus.c,v 1.3 2014/03/26 17:42:00 christos Exp $	*/
+/*	$NetBSD: ralink_mainbus.c,v 1.4 2014/04/30 00:52:49 matt Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.3 2014/03/26 17:42:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.4 2014/04/30 00:52:49 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -86,16 +86,33 @@ mainbus_attach(device_t parent, device_t
 {
 	mainbus_softc_t * const sc = device_private(self);
 	struct mainbus_attach_args ma;
+	union {
+		char buf[9];
+		uint32_t id[2];
+	} xid;
 
 	mainbus_found = true;
 
-	aprint_naive(": Ralink System Bus\n");
-	aprint_normal(": Ralink System Bus\n");
-
 	sc->sc_dev = self;
+	sc->sc_memt = &ra_bus_memt;
+	sc->sc_dmat = &ra_bus_dmat;
+
+	xid.id[0] = bus_space_read_4(sc->sc_memt, ra_sysctl_bsh, RA_SYSCTL_ID0);
+	xid.id[1] = bus_space_read_4(sc->sc_memt, ra_sysctl_bsh, RA_SYSCTL_ID1);
+	xid.buf[8] = '\0';
+	if (xid.buf[6] == ' ') {
+		xid.buf[6] = '\0';
+	} else if (xid.buf[7] == ' ') {
+		xid.buf[7] = '\0';
+	}
+	const char * const manuf = xid.buf[0] == 'M' ? "Mediatek" : "Ralink";
+
+	aprint_naive(": %s %s System Bus\n", manuf, xid.buf);
+	aprint_normal(": %s %s System Bus\n", manuf, xid.buf);
+
 	ma.ma_name = NULL;
-	ma.ma_memt = sc->sc_memt = &ra_bus_memt;
-	ma.ma_dmat = sc->sc_dmat = &ra_bus_dmat;
+	ma.ma_memt = sc->sc_memt;
+	ma.ma_dmat = sc->sc_dmat;
 
 	/* attach critical devices */
 	mainbus_attach_critical(sc);