[PATCH] xmon consistency clean up

Ishizaki Kou kou.ishizaki at toshiba.co.jp
Wed Jul 25 12:57:35 EST 2007


This patch cleans up xmon to keep consistency.

In xmon, we should use console I/O functions that are named the same
as user space stdio functions. But commit
4d404edce30f911004850d472e05a31efd751662 broke this consistency.

Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
---

Index: linux-powerpc-git/arch/powerpc/xmon/nonstdio.c
===================================================================
--- linux-powerpc-git.orig/arch/powerpc/xmon/nonstdio.c
+++ linux-powerpc-git/arch/powerpc/xmon/nonstdio.c
@@ -133,7 +133,7 @@ void xmon_printf(const char *format, ...
 	xmon_write(xmon_outbuf, n);
 }
 
-void xmon_puts(const char *str)
+void xmon_fputs(const char *str)
 {
 	xmon_write(str, strlen(str));
 }
Index: linux-powerpc-git/arch/powerpc/xmon/nonstdio.h
===================================================================
--- linux-powerpc-git.orig/arch/powerpc/xmon/nonstdio.h
+++ linux-powerpc-git/arch/powerpc/xmon/nonstdio.h
@@ -2,10 +2,11 @@
 
 #define printf	xmon_printf
 #define putchar	xmon_putchar
+#define fputs(str,stream)	xmon_fputs(str)	/* stream is ignored. */
 
 extern int xmon_putchar(int c);
 extern int xmon_getchar(void);
-extern void xmon_puts(const char *);
+extern void xmon_fputs(const char *);
 extern char *xmon_gets(char *, int);
 extern void xmon_printf(const char *, ...);
 extern void xmon_map_scc(void);
Index: linux-powerpc-git/arch/powerpc/xmon/xmon.c
===================================================================
--- linux-powerpc-git.orig/arch/powerpc/xmon/xmon.c
+++ linux-powerpc-git/arch/powerpc/xmon/xmon.c
@@ -833,7 +833,7 @@ cmds(struct pt_regs *excp)
 			mdelay(2000);
 			return cmd;
 		case '?':
-			xmon_puts(help_string);
+			fputs(help_string, stdout);
 			break;
 		case 'b':
 			bpt_cmds();



More information about the Linuxppc-dev mailing list