Module Name: src
Committed By: tsutsui
Date: Sun Nov 22 18:44:25 UTC 2015
Modified Files:
src/sys/arch/landisk/landisk: machdep.c
src/sys/arch/sh3/sh3: sh3_machdep.c
Log Message:
Remove \n from set_cpumodel(), and explicitly print \n during boot instead.
Fixes dmesg on NetBSD/dreamcast 7.0 (and probably NetBSD/hpcsh 7.0):
---
NetBSD 7.0 (GENERIC.201509250726Z)
SEGA Dreamcasttotal memory = 16384 KB
avail memory = 13668 KB
---
which was mangled when cpu_getmode() and cpu_setmodel() were introduced:
http://mail-index.netbsd.org/source-changes/2014/03/24/msg053273.html
Should be pulled up to netbsd-7 and netbsd-7-0.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/landisk/landisk/machdep.c
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/sh3/sh3/sh3_machdep.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/landisk/landisk/machdep.c
diff -u src/sys/arch/landisk/landisk/machdep.c:1.17 src/sys/arch/landisk/landisk/machdep.c:1.18
--- src/sys/arch/landisk/landisk/machdep.c:1.17 Mon Mar 24 20:06:32 2014
+++ src/sys/arch/landisk/landisk/machdep.c Sun Nov 22 18:44:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.17 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.18 2015/11/22 18:44:25 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2015/11/22 18:44:25 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -147,7 +147,7 @@ cpu_startup(void)
{
/* XXX: show model (LANDISK/USL-5P) */
- cpu_setmodel("Model: I-O DATA LANDISK\n");
+ cpu_setmodel("Model: I-O DATA LANDISK");
sh_startup();
}
Index: src/sys/arch/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.102 src/sys/arch/sh3/sh3/sh3_machdep.c:1.103
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.102 Mon Mar 24 20:06:32 2014
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Sun Nov 22 18:44:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.102 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.103 2015/11/22 18:44:25 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.102 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.103 2015/11/22 18:44:25 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -277,7 +277,7 @@ sh_startup(void)
printf("%s%s", copyright, version);
if (*model != '\0')
- printf("%s", model);
+ printf("%s\n", model);
#ifdef DEBUG
printf("general exception handler:\t%d byte\n",
sh_vector_generic_end - sh_vector_generic);
