diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-30 00:54:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-08 22:51:22 -0500 |
commit | bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0 (patch) | |
tree | 97b0acaade2d32ddb37147ff5112318f6c292cf8 /arch/powerpc/xmon/xmon.c | |
parent | 54b9a9aedc990dd2aefc45ab16d84f245cb7d8d0 (diff) |
[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/xmon.c')
-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 c45a6ad5f3b7..465b75c5647e 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) | |||
450 | leave: | 450 | leave: |
451 | cpu_clear(cpu, cpus_in_xmon); | 451 | cpu_clear(cpu, cpus_in_xmon); |
452 | xmon_fault_jmp[cpu] = NULL; | 452 | xmon_fault_jmp[cpu] = NULL; |
453 | |||
454 | #else | 453 | #else |
455 | /* UP is simple... */ | 454 | /* UP is simple... */ |
456 | if (in_xmon) { | 455 | if (in_xmon) { |
@@ -805,7 +804,10 @@ cmds(struct pt_regs *excp) | |||
805 | break; | 804 | break; |
806 | case 'x': | 805 | case 'x': |
807 | case 'X': | 806 | case 'X': |
807 | return cmd; | ||
808 | case EOF: | 808 | case EOF: |
809 | printf(" <no input ...>\n"); | ||
810 | mdelay(2000); | ||
809 | return cmd; | 811 | return cmd; |
810 | case '?': | 812 | case '?': |
811 | printf(help_string); | 813 | printf(help_string); |