diff options
author | Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2007-07-18 05:26:40 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-07-22 07:30:58 -0400 |
commit | 4d404edce30f911004850d472e05a31efd751662 (patch) | |
tree | 1af5420e00edbf160a1e332b88d44e5856f68a16 /arch/powerpc/xmon | |
parent | 776568d4c93fe8def5ab4060344af554fe2b44be (diff) |
[POWERPC] fix showing xmon help
In some configuration, xmon help string is larger than xmon_printf
buffer. We need not to use printf. This patch adds xmon_puts and
change to use it to show help string.
Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r-- | arch/powerpc/xmon/nonstdio.c | 5 | ||||
-rw-r--r-- | arch/powerpc/xmon/nonstdio.h | 1 | ||||
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/xmon/nonstdio.c b/arch/powerpc/xmon/nonstdio.c index 78765833f4c0..bfac84fbe780 100644 --- a/arch/powerpc/xmon/nonstdio.c +++ b/arch/powerpc/xmon/nonstdio.c | |||
@@ -132,3 +132,8 @@ void xmon_printf(const char *format, ...) | |||
132 | va_end(args); | 132 | va_end(args); |
133 | xmon_write(xmon_outbuf, n); | 133 | xmon_write(xmon_outbuf, n); |
134 | } | 134 | } |
135 | |||
136 | void xmon_puts(const char *str) | ||
137 | { | ||
138 | xmon_write(str, strlen(str)); | ||
139 | } | ||
diff --git a/arch/powerpc/xmon/nonstdio.h b/arch/powerpc/xmon/nonstdio.h index 22ec1bb8b720..23dd95f4599c 100644 --- a/arch/powerpc/xmon/nonstdio.h +++ b/arch/powerpc/xmon/nonstdio.h | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | extern int xmon_putchar(int c); | 6 | extern int xmon_putchar(int c); |
7 | extern int xmon_getchar(void); | 7 | extern int xmon_getchar(void); |
8 | extern void xmon_puts(const char *); | ||
8 | extern char *xmon_gets(char *, int); | 9 | extern char *xmon_gets(char *, int); |
9 | extern void xmon_printf(const char *, ...); | 10 | extern void xmon_printf(const char *, ...); |
10 | extern void xmon_map_scc(void); | 11 | extern void xmon_map_scc(void); |
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 669e6566ad70..121b04d165d1 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -833,7 +833,7 @@ cmds(struct pt_regs *excp) | |||
833 | mdelay(2000); | 833 | mdelay(2000); |
834 | return cmd; | 834 | return cmd; |
835 | case '?': | 835 | case '?': |
836 | printf(help_string); | 836 | xmon_puts(help_string); |
837 | break; | 837 | break; |
838 | case 'b': | 838 | case 'b': |
839 | bpt_cmds(); | 839 | bpt_cmds(); |