mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-05 15:15:44 +00:00
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
This commit is contained in:
@@ -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>
|
2003-07-18 Till Straumann <strauman@slac.stanford.edu>
|
||||||
|
|
||||||
PR 288/rtems
|
PR 288/rtems
|
||||||
|
|||||||
@@ -128,11 +128,11 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
|
|||||||
rtems_irq_connect_data* vchain;
|
rtems_irq_connect_data* vchain;
|
||||||
|
|
||||||
if (!isValidInterrupt(irq->name)) {
|
if (!isValidInterrupt(irq->name)) {
|
||||||
printk("Invalid interrupt vector %i\n",irq->name);
|
printk("Invalid interrupt vector %d\n",irq->name);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if ( (int)rtems_hdl_tbl[irq->name].next_handler == -1 ) {
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
_CPU_ISR_Disable(level);
|
_CPU_ISR_Disable(level);
|
||||||
@@ -191,7 +191,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
|
|||||||
unsigned int level;
|
unsigned int level;
|
||||||
|
|
||||||
if (!isValidInterrupt(irq->name)) {
|
if (!isValidInterrupt(irq->name)) {
|
||||||
printk("Invalid interrupt vector %i\n",irq->name);
|
printk("Invalid interrupt vector %d\n",irq->name);
|
||||||
return 0;
|
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.
|
* to get the previous handler before accepting to disconnect.
|
||||||
*/
|
*/
|
||||||
if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
_CPU_ISR_Disable(level);
|
_CPU_ISR_Disable(level);
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
#include <libcpu/io.h>
|
#include <libcpu/io.h>
|
||||||
#include <bsp/pci.h>
|
#include <bsp/pci.h>
|
||||||
|
#include <rtems/bspIo.h>
|
||||||
|
|
||||||
/* allow for overriding these definitions */
|
/* allow for overriding these definitions */
|
||||||
#ifndef PCI_CONFIG_ADDR
|
#ifndef PCI_CONFIG_ADDR
|
||||||
@@ -388,7 +389,7 @@ void FixupPCI( struct _int_map *bspmap, int (*swizzler)(int,int) )
|
|||||||
}
|
}
|
||||||
if( int_name == -1 )
|
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
|
else
|
||||||
{
|
{
|
||||||
@@ -458,7 +459,7 @@ void FixupPCI( struct _int_map *bspmap, int (*swizzler)(int,int) )
|
|||||||
}
|
}
|
||||||
if( int_name == -1 )
|
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
|
else
|
||||||
{
|
{
|
||||||
@@ -499,7 +500,7 @@ void FixupPCI( struct _int_map *bspmap, int (*swizzler)(int,int) )
|
|||||||
}
|
}
|
||||||
else
|
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;
|
goto donesearch;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user