Module Name: src
Committed By: nakayama
Date: Mon Mar 2 14:17:06 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: consinit.c
src/sys/arch/sparc64/sparc64: db_tlb_access.S locore.s ofw_machdep.c
Log Message:
prom_printf converts "\n" to "\r\n" internally, so omit "\r".
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/dev/consinit.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/sparc64/db_tlb_access.S
cvs rdiff -u -r1.380 -r1.381 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc64/sparc64/ofw_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/sparc64/dev/consinit.c
diff -u src/sys/arch/sparc64/dev/consinit.c:1.27 src/sys/arch/sparc64/dev/consinit.c:1.28
--- src/sys/arch/sparc64/dev/consinit.c:1.27 Thu Sep 12 12:57:48 2013
+++ src/sys/arch/sparc64/dev/consinit.c Mon Mar 2 14:17:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.27 2013/09/12 12:57:48 martin Exp $ */
+/* $NetBSD: consinit.c,v 1.28 2015/03/02 14:17:06 nakayama Exp $ */
/*-
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.27 2013/09/12 12:57:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.28 2015/03/02 14:17:06 nakayama Exp $");
#include "opt_ddb.h"
#include "pcons.h"
@@ -172,7 +172,7 @@ consinit(void)
char buffer[128];
const char *consname = "unknown";
- DBPRINT(("consinit()\r\n"));
+ DBPRINT(("consinit()\n"));
if (cn_tab != &consdev_prom)
return;
@@ -180,13 +180,13 @@ consinit(void)
if ((prom_stdin_node = prom_instance_to_package(prom_stdin())) == 0) {
printf("WARNING: no PROM stdin\n");
}
- DBPRINT(("stdin node = %x\r\n", prom_stdin_node));
+ DBPRINT(("stdin node = %x\n", prom_stdin_node));
if ((prom_stdout_node = prom_instance_to_package(prom_stdout())) == 0)
printf("WARNING: no PROM stdout\n");
- DBPRINT(("stdout package = %x\r\n", prom_stdout_node));
+ DBPRINT(("stdout package = %x\n", prom_stdout_node));
- DBPRINT(("buffer @ %p\r\n", buffer));
+ DBPRINT(("buffer @ %p\n", buffer));
if (prom_stdin_node != 0 &&
(prom_getproplen(prom_stdin_node, "keyboard") >= 0)) {
Index: src/sys/arch/sparc64/sparc64/db_tlb_access.S
diff -u src/sys/arch/sparc64/sparc64/db_tlb_access.S:1.2 src/sys/arch/sparc64/sparc64/db_tlb_access.S:1.3
--- src/sys/arch/sparc64/sparc64/db_tlb_access.S:1.2 Tue Feb 23 05:32:08 2010
+++ src/sys/arch/sparc64/sparc64/db_tlb_access.S Mon Mar 2 14:17:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: db_tlb_access.S,v 1.2 2010/02/23 05:32:08 mrg Exp $ */
+/* $NetBSD: db_tlb_access.S,v 1.3 2015/03/02 14:17:06 nakayama Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -105,7 +105,7 @@ ENTRY_NOPROFILE(print_itlb)
2:
.asciz "%2d:%016lx %016lx "
3:
- .asciz "%2d:%016lx %016lx\r\n"
+ .asciz "%2d:%016lx %016lx\n"
.text
#else
ENTRY_NOPROFILE(print_dtlb)
@@ -196,6 +196,6 @@ ENTRY_NOPROFILE(print_itlb)
2:
.asciz "%2d:%08x:%08x %08x:%08x "
3:
- .asciz "%2d:%08x:%08x %08x:%08x\r\n"
+ .asciz "%2d:%08x:%08x %08x:%08x\n"
.text
#endif
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.380 src/sys/arch/sparc64/sparc64/locore.s:1.381
--- src/sys/arch/sparc64/sparc64/locore.s:1.380 Mon Mar 2 13:58:55 2015
+++ src/sys/arch/sparc64/sparc64/locore.s Mon Mar 2 14:17:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.380 2015/03/02 13:58:55 nakayama Exp $ */
+/* $NetBSD: locore.s,v 1.381 2015/03/02 14:17:06 nakayama Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -1627,7 +1627,7 @@ asmptechk:
.data
2:
- .asciz "asmptechk: %x %x %x %x:%x\r\n"
+ .asciz "asmptechk: %x %x %x %x:%x\n"
_ALIGN
.text
#endif
@@ -3513,7 +3513,7 @@ setup_sparcintr:
STACKFRAME(-CC64FSZ) ! Get a clean register window
LOAD_ASCIZ(%o0,\
- "interrupt_vector: number %lx softint mask %lx pil %lu slot %p\r\n")
+ "interrupt_vector: number %lx softint mask %lx pil %lu slot %p\n")
mov %g2, %o1
rdpr %pil, %o3
mov %g1, %o4
@@ -3545,7 +3545,7 @@ ret_from_intr_vector:
#if 1
set PANICSTACK-STKB, %g1 ! Use panic stack temporarily
save %g1, -CC64FSZ, %sp ! Get a clean register window
- LOAD_ASCIZ(%o0, "interrupt_vector: spurious vector %lx at pil %d\r\n")
+ LOAD_ASCIZ(%o0, "interrupt_vector: spurious vector %lx at pil %d\n")
mov %g7, %o1
GLOBTOLOC
clr %g4
@@ -3830,7 +3830,7 @@ sparc_intr_retry:
nop
STACKFRAME(-CC64FSZ) ! Get a clean register window
- LOAD_ASCIZ(%o0, "sparc_interrupt: func %p arg %p\r\n")
+ LOAD_ASCIZ(%o0, "sparc_interrupt: func %p arg %p\n")
mov %i0, %o2 ! arg
GLOBTOLOC
call prom_printf
@@ -3890,7 +3890,7 @@ intrcmplt:
nop
STACKFRAME(-CC64FSZ) ! Get a clean register window
- LOAD_ASCIZ(%o0, "sparc_interrupt: done\r\n")
+ LOAD_ASCIZ(%o0, "sparc_interrupt: done\n")
GLOBTOLOC
call prom_printf
nop
@@ -4542,7 +4542,7 @@ ENTRY_NOPROFILE(cpu_initialize) /* for c
nop
.data
1:
- .asciz "Setting trap base...\r\n"
+ .asciz "Setting trap base...\n"
_ALIGN
.text
0:
@@ -4640,7 +4640,7 @@ ENTRY_NOPROFILE(cpu_initialize) /* for c
.data
1:
- .asciz "Calling startup routine %p with stack at %p...\r\n"
+ .asciz "Calling startup routine %p with stack at %p...\n"
_ALIGN
.text
0:
@@ -4659,7 +4659,7 @@ ENTRY_NOPROFILE(cpu_initialize) /* for c
nop
.data
1:
- .asciz "main() returned\r\n"
+ .asciz "main() returned\n"
_ALIGN
.text
@@ -5036,7 +5036,7 @@ ENTRY(sp_tlb_flush_pte_us)
restore
.data
1:
- .asciz "sp_tlb_flush_pte_us: demap ctx=%x va=%08x res=%x\r\n"
+ .asciz "sp_tlb_flush_pte_us: demap ctx=%x va=%08x res=%x\n"
_ALIGN
.text
2:
@@ -5090,7 +5090,7 @@ ENTRY(sp_tlb_flush_pte_usiii)
restore
.data
1:
- .asciz "sp_tlb_flush_pte_usiii: demap ctx=%x va=%08x res=%x\r\n"
+ .asciz "sp_tlb_flush_pte_usiii: demap ctx=%x va=%08x res=%x\n"
_ALIGN
.text
2:
Index: src/sys/arch/sparc64/sparc64/ofw_machdep.c
diff -u src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.43 src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.44
--- src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.43 Sat Sep 6 20:56:39 2014
+++ src/sys/arch/sparc64/sparc64/ofw_machdep.c Mon Mar 2 14:17:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_machdep.c,v 1.43 2014/09/06 20:56:39 palle Exp $ */
+/* $NetBSD: ofw_machdep.c,v 1.44 2015/03/02 14:17:06 nakayama Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.43 2014/09/06 20:56:39 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.44 2015/03/02 14:17:06 nakayama Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -67,11 +67,11 @@ get_mmu_handle(void)
u_int chosen;
if ((chosen = OF_finddevice("/chosen")) == -1) {
- prom_printf("get_mmu_handle: cannot get /chosen\r\n");
+ prom_printf("get_mmu_handle: cannot get /chosen\n");
return -1;
}
if (OF_getprop(chosen, "mmu", &mmuh, sizeof(mmuh)) == -1) {
- prom_printf("get_mmu_handle: cannot get mmuh\r\n");
+ prom_printf("get_mmu_handle: cannot get mmuh\n");
return -1;
}
return mmuh;
@@ -83,11 +83,11 @@ get_memory_handle(void)
u_int chosen;
if ((chosen = OF_finddevice("/chosen")) == -1) {
- prom_printf("get_memory_handle: cannot get /chosen\r\n");
+ prom_printf("get_memory_handle: cannot get /chosen\n");
return -1;
}
if (OF_getprop(chosen, "memory", &memh, sizeof(memh)) == -1) {
- prom_printf("get_memory_handle: cannot get memh\r\n");
+ prom_printf("get_memory_handle: cannot get memh\n");
return -1;
}
return memh;
@@ -161,7 +161,7 @@ prom_vtop(vaddr_t vaddr)
} args;
if (mmuh == -1 && ((mmuh = get_mmu_handle()) == -1)) {
- prom_printf("prom_vtop: cannot get mmuh\r\n");
+ prom_printf("prom_vtop: cannot get mmuh\n");
return 0;
}
args.name = ADR2CELL(&"call-method");
@@ -173,7 +173,7 @@ prom_vtop(vaddr_t vaddr)
if (openfirmware(&args) == -1)
return -1;
#if 0
- prom_printf("Called \"translate\", mmuh=%x, vaddr=%x, status=%x %x,\r\n retaddr=%x %x, mode=%x %x, phys_hi=%x %x, phys_lo=%x %x\r\n",
+ prom_printf("Called \"translate\", mmuh=%x, vaddr=%x, status=%x %x,\n retaddr=%x %x, mode=%x %x, phys_hi=%x %x, phys_lo=%x %x\n",
mmuh, vaddr, (int)(args.status>>32), (int)args.status, (int)(args.retaddr>>32), (int)args.retaddr,
(int)(args.mode>>32), (int)args.mode, (int)(args.phys_hi>>32), (int)args.phys_hi,
(int)(args.phys_lo>>32), (int)args.phys_lo);
@@ -203,7 +203,7 @@ prom_claim_virt(vaddr_t vaddr, int len)
} args;
if (mmuh == -1 && ((mmuh = get_mmu_handle()) == -1)) {
- prom_printf("prom_claim_virt: cannot get mmuh\r\n");
+ prom_printf("prom_claim_virt: cannot get mmuh\n");
return 0;
}
args.name = ADR2CELL(&"call-method");
@@ -240,7 +240,7 @@ prom_alloc_virt(int len, int align)
} args;
if (mmuh == -1 && ((mmuh = get_mmu_handle()) == -1)) {
- prom_printf("prom_alloc_virt: cannot get mmuh\r\n");
+ prom_printf("prom_alloc_virt: cannot get mmuh\n");
return -1LL;
}
args.name = ADR2CELL(&"call-method");
@@ -274,7 +274,7 @@ prom_free_virt(vaddr_t vaddr, int len)
} args;
if (mmuh == -1 && ((mmuh = get_mmu_handle()) == -1)) {
- prom_printf("prom_free_virt: cannot get mmuh\r\n");
+ prom_printf("prom_free_virt: cannot get mmuh\n");
return -1;
}
args.name = ADR2CELL(&"call-method");
@@ -307,7 +307,7 @@ prom_unmap_virt(vaddr_t vaddr, int len)
} args;
if (mmuh == -1 && ((mmuh = get_mmu_handle()) == -1)) {
- prom_printf("prom_unmap_virt: cannot get mmuh\r\n");
+ prom_printf("prom_unmap_virt: cannot get mmuh\n");
return -1;
}
args.name = ADR2CELL(&"call-method");
@@ -344,7 +344,7 @@ prom_map_phys(paddr_t paddr, off_t size,
} args;
if (mmuh == -1 && ((mmuh = get_mmu_handle()) == -1)) {
- prom_printf("prom_map_phys: cannot get mmuh\r\n");
+ prom_printf("prom_map_phys: cannot get mmuh\n");
return 0;
}
args.name = ADR2CELL(&"call-method");
@@ -388,7 +388,7 @@ prom_alloc_phys(int len, int align)
} args;
if (memh == -1 && ((memh = get_memory_handle()) == -1)) {
- prom_printf("prom_alloc_phys: cannot get memh\r\n");
+ prom_printf("prom_alloc_phys: cannot get memh\n");
return -1;
}
args.name = ADR2CELL(&"call-method");
@@ -427,7 +427,7 @@ prom_claim_phys(paddr_t phys, int len)
} args;
if (memh == -1 && ((memh = get_memory_handle()) == -1)) {
- prom_printf("prom_claim_phys: cannot get memh\r\n");
+ prom_printf("prom_claim_phys: cannot get memh\n");
return -1;
}
args.name = ADR2CELL(&"call-method");
@@ -464,7 +464,7 @@ prom_free_phys(paddr_t phys, int len)
} args;
if (memh == -1 && ((memh = get_memory_handle()) == -1)) {
- prom_printf("prom_free_phys: cannot get memh\r\n");
+ prom_printf("prom_free_phys: cannot get memh\n");
return -1;
}
args.name = ADR2CELL(&"call-method");
@@ -502,7 +502,7 @@ prom_get_msgbuf(int len, int align)
paddr_t addr;
if (memh == -1 && ((memh = get_memory_handle()) == -1)) {
- prom_printf("prom_get_msgbuf: cannot get memh\r\n");
+ prom_printf("prom_get_msgbuf: cannot get memh\n");
return -1;
}
if (OF_test("test-method") == 0) {
@@ -519,17 +519,17 @@ prom_get_msgbuf(int len, int align)
args.status = -1;
if (openfirmware(&args) == 0 && args.status == 0) {
return (paddr_t)CELL2HDQ(args.phys_hi, args.phys_lo);
- } else prom_printf("prom_get_msgbuf: SUNW,retain failed\r\n");
- } else prom_printf("prom_get_msgbuf: test-method failed\r\n");
- } else prom_printf("prom_get_msgbuf: test failed\r\n");
+ } else prom_printf("prom_get_msgbuf: SUNW,retain failed\n");
+ } else prom_printf("prom_get_msgbuf: test-method failed\n");
+ } else prom_printf("prom_get_msgbuf: test failed\n");
/* Allocate random memory -- page zero avail?*/
addr = prom_claim_phys(0x000, len);
- prom_printf("prom_get_msgbuf: allocated new buf at %08x\r\n", (int)addr);
+ prom_printf("prom_get_msgbuf: allocated new buf at %08x\n", (int)addr);
if (addr == -1) {
- prom_printf("prom_get_msgbuf: cannot get allocate physmem\r\n");
+ prom_printf("prom_get_msgbuf: cannot get allocate physmem\n");
return -1;
}
- prom_printf("prom_get_msgbuf: claiming new buf at %08x\r\n", (int)addr);
+ prom_printf("prom_get_msgbuf: claiming new buf at %08x\n", (int)addr);
{ int i; for (i=0; i<200000000; i++); }
return addr; /* Kluge till we go 64-bit */
}
