diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-30 16:54:12 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 14:51:22 +1100 |
commit | bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0 (patch) | |
tree | 97b0acaade2d32ddb37147ff5112318f6c292cf8 /arch/powerpc/xmon | |
parent | 54b9a9aedc990dd2aefc45ab16d84f245cb7d8d0 (diff) | |
download | op-kernel-dev-bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0.zip op-kernel-dev-bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0.tar.gz |
[PATCH] powerpc: udbg updates
The udbg low level io layer has an issue with udbg_getc() returning a
char (unsigned on ppc) instead of an int, thus the -1 if you had no
available input device could end up turned into 0xff, filling your
display with bogus characters. This fixes it, along with adding a little
blob to xmon to do a delay before exiting when getting an EOF and fixing
the detection of ADB keyboards in udbg_adb.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index c45a6ad..465b75c 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -450,7 +450,6 @@ int xmon_core(struct pt_regs *regs, int fromipi) leave: cpu_clear(cpu, cpus_in_xmon); xmon_fault_jmp[cpu] = NULL; - #else /* UP is simple... */ if (in_xmon) { @@ -805,7 +804,10 @@ cmds(struct pt_regs *excp) break; case 'x': case 'X': + return cmd; case EOF: + printf(" <no input ...>\n"); + mdelay(2000); return cmd; case '?': printf(help_string); |