diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-06 10:51:17 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-20 11:03:25 +1000 |
| commit | af2771493a1bf79cd9a1ab4f30327c428b5bd67c (patch) | |
| tree | 59016ca742c666ef09ec6f2af517ffeafd6ea58c | |
| parent | dd797738643cd3c2dd9cdff7e4c3a04d318ab23a (diff) | |
| download | blackbird-op-linux-af2771493a1bf79cd9a1ab4f30327c428b5bd67c.tar.gz blackbird-op-linux-af2771493a1bf79cd9a1ab4f30327c428b5bd67c.zip | |
powerpc: Improve prom_printf()
Adds the ability to print decimal numbers and adds some more
format string variants
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 941ff4dbc567..7839bd7bfd15 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -335,6 +335,7 @@ static void __init prom_printf(const char *format, ...) const char *p, *q, *s; va_list args; unsigned long v; + long vs; struct prom_t *_prom = &RELOC(prom); va_start(args, format); @@ -368,12 +369,35 @@ static void __init prom_printf(const char *format, ...) v = va_arg(args, unsigned long); prom_print_hex(v); break; + case 'd': + ++q; + vs = va_arg(args, int); + if (vs < 0) { + prom_print(RELOC("-")); + vs = -vs; + } + prom_print_dec(vs); + break; case 'l': ++q; - if (*q == 'u') { /* '%lu' */ + if (*q == 0) + break; + else if (*q == 'x') { + ++q; + v = va_arg(args, unsigned long); + prom_print_hex(v); + } else if (*q == 'u') { /* '%lu' */ ++q; v = va_arg(args, unsigned long); prom_print_dec(v); + } else if (*q == 'd') { /* %ld */ + ++q; + vs = va_arg(args, long); + if (vs < 0) { + prom_print(RELOC("-")); + vs = -vs; + } + prom_print_dec(vs); } break; } |
