diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2003-08-05 19:51:33 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2003-08-05 19:51:33 +0000 |
| commit | d14ba4884fac9bbd19bc4db62a00607b88f71706 (patch) | |
| tree | be825d6808d0526b9300e503c26f6525024fbdd6 | |
| parent | 2003-08-05 Till Strauman <strauman@slac.stanford.edu> (diff) | |
| download | rtems-d14ba4884fac9bbd19bc4db62a00607b88f71706.tar.bz2 | |
2003-08-05 Till Strauman <strauman@slac.stanford.edu>
PR 437/bsps
* irq/irc.c: calls to bspIo/printk must not use '%i' format which is
apparently not supported
* pci/pci.c: calls to bspIo/printk must not use '%i' format which is
apparently not supported
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/irq/irq.c | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/pci/pci.c | 7 |
3 files changed, 16 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog index 0dfe4bfc5c..afbd20331b 100644 --- a/c/src/lib/libbsp/powerpc/shared/ChangeLog +++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog @@ -1,3 +1,11 @@ +2003-08-05 Till Strauman <strauman@slac.stanford.edu> + + PR 437/bsps + * irq/irc.c: calls to bspIo/printk must not use '%i' format which is + apparently not supported + * pci/pci.c: calls to bspIo/printk must not use '%i' format which is + apparently not supported + 2003-07-18 Till Straumann <strauman@slac.stanford.edu> PR 288/rtems diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.c b/c/src/lib/libbsp/powerpc/shared/irq/irq.c index dbb5e72f77..ad98e6d07b 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.c @@ -128,11 +128,11 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq) rtems_irq_connect_data* vchain; if (!isValidInterrupt(irq->name)) { - printk("Invalid interrupt vector %i\n",irq->name); + printk("Invalid interrupt vector %d\n",irq->name); return 0; } if ( (int)rtems_hdl_tbl[irq->name].next_handler == -1 ) { - printk("IRQ vector %i already connected to an unshared handler\n",irq->name); + printk("IRQ vector %d already connected to an unshared handler\n",irq->name); return 0; } _CPU_ISR_Disable(level); @@ -191,7 +191,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) unsigned int level; if (!isValidInterrupt(irq->name)) { - printk("Invalid interrupt vector %i\n",irq->name); + printk("Invalid interrupt vector %d\n",irq->name); return 0; } /* @@ -202,7 +202,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) * to get the previous handler before accepting to disconnect. */ if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) { - printk("IRQ vector %i already connected\n",irq->name); + printk("IRQ vector %d already connected\n",irq->name); return 0; } _CPU_ISR_Disable(level); diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.c b/c/src/lib/libbsp/powerpc/shared/pci/pci.c index 0661a8a60e..121ef3288a 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.c @@ -21,6 +21,7 @@ #include <libcpu/io.h> #include <bsp/pci.h> +#include <rtems/bspIo.h> /* allow for overriding these definitions */ #ifndef PCI_CONFIG_ADDR @@ -388,7 +389,7 @@ void FixupPCI( struct _int_map *bspmap, int (*swizzler)(int,int) ) } if( int_name == -1 ) { - printk("pci : Unable to resolve device %d:%d w/ swizzled int pin %i to an interrupt_line.\n", pbus, pslot, int_pin ); + printk("pci : Unable to resolve device %d:%d w/ swizzled int pin %d to an interrupt_line.\n", pbus, pslot, int_pin ); } else { @@ -458,7 +459,7 @@ void FixupPCI( struct _int_map *bspmap, int (*swizzler)(int,int) ) } if( int_name == -1 ) { - printk("pci : Unable to resolve device %d:%d w/ swizzled int pin %i to an interrupt_line.\n", pbus, pslot, int_pin ); + printk("pci : Unable to resolve device %d:%d w/ swizzled int pin %d to an interrupt_line.\n", pbus, pslot, int_pin ); } else { @@ -499,7 +500,7 @@ void FixupPCI( struct _int_map *bspmap, int (*swizzler)(int,int) ) } else { - printk("pci : No bridge from bus %i towards root found\n", tbus ); + printk("pci : No bridge from bus %d towards root found\n", tbus ); goto donesearch; } |