diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-10 16:35:33 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-10 16:35:33 +0000 |
| commit | 0d6849e76a7da35135a6f50ed8520ce643519f8e (patch) | |
| tree | 951098f3629cb54e035daa5a5781d3586a8dbb0a /c/src/lib/libbsp/powerpc/shared/openpic | |
| parent | 2003-04-10 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-0d6849e76a7da35135a6f50ed8520ce643519f8e.tar.bz2 | |
2003-04-10 Till Straumann <strauman@slac.stanford.edu>
PR 379/bsps
* console/polled_io.c: libcpu provides 'printk' already.
Therefore, the implementation in this file was removed (still
used for the bootloader, though). It now provides BSP_output_char()
for libcpu's printk().
* console/uart.c, console/uart.h: BSP_output_char_via_serial()
prototype changed to match the BSP_output_char_function_type. Note
that the motorola BSPs use polled-io for the output_char routine, not
the uart.c version. The latter can be used be other BSPs however
(e.g. SVGM).
* console/console.c, console/consoleIo.h, console/polled_io.c,
irq/irq_init.c, openpic/openpic.c, pci/detect_raven_bridge.c:
Unfortunately, the supported 'printk' format string subset of the
polled-io and libcpu implementations are different - hence, a few
format strings in the ppc/shared BSP were changed.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/shared/openpic')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/openpic/openpic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c index 22da8cac66..1a923d78ce 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c @@ -23,7 +23,6 @@ #include <rtems/bspIo.h> #include <bsp/openpic.h> #include <bsp/pci.h> -#include <bsp/consoleIo.h> #include <libcpu/io.h> #include <libcpu/byteorder.h> #include <bsp.h> @@ -69,7 +68,7 @@ static unsigned int NumSources; printk("openpic.c:%d: illegal priority %d\n", __LINE__, pri); #define check_arg_irq(irq) \ if (irq < 0 || irq >= NumSources) \ - printk("openpic.c:%d: illegal irq %d from %p,[%p],[[%p]]\n", \ + printk("openpic.c:%d: illegal irq %d from 0x%08x,[0x%08x],[[0x%08x]]\n", \ __LINE__, irq, __builtin_return_address(0), \ __builtin_return_address(1), __builtin_return_address(2) \ ); @@ -222,7 +221,7 @@ void openpic_init(int main_pic, unsigned char *polarities, unsigned char *senses break; } } - printk("OpenPIC Version %s (%d CPUs and %d IRQ sources) at %p\n", version, + printk("OpenPIC Version %s (%d CPUs and %d IRQ sources) at 0x%08x\n", version, NumProcessors, NumSources, OpenPIC); printk("OpenPIC Vendor %d (%s), Device %d (%s), Stepping %d\n", vendorid, |