diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-04-25 14:22:55 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-04-25 14:22:55 +0000 |
| commit | cebad9689d87fec0d52f09bdeb478dafba282b40 (patch) | |
| tree | 609e49c5a13f0a18c7b7bb2e7502ecd226a0831b /c | |
| parent | Fix another typo in previous patch (diff) | |
| download | rtems-cebad9689d87fec0d52f09bdeb478dafba282b40.tar.bz2 | |
2005-04-25 Jennifer Averett <jennifer.averett@oarcorp.com>
* libchip/serial/ns16550.c:
Fixed warnings generated in various powerpc configurations
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/libchip/serial/ns16550.c | 18 |
2 files changed, 21 insertions, 2 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 6fd6b7600d..3c2676716c 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2005-04-25 Jennifer Averett <jennifer.averett@oarcorp.com> + + * libchip/serial/ns16550.c: + Fixed warnings generated in various powerpc configurations + 2005-04-18 Jennifer Averett <jennifer.averett@oarcorp.com> * libchip/serial/ns16550.c: Modified diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index 01110f394a..3090d0e96f 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -27,6 +27,7 @@ #include <libchip/serial.h> #include <libchip/sersupp.h> +#include <rtems/bspIo.h> #include "ns16550_p.h" /* @@ -601,6 +602,7 @@ static void null_fun(){} NS16550_STATIC void ns16550_initialize_interrupts(int minor) { +#ifdef BSP_SHARED_HANDLER_SUPPORT rtems_irq_connect_data IrqData = {0, ns16550_isr, &Console_Port_Data[minor], @@ -609,15 +611,27 @@ NS16550_STATIC void ns16550_initialize_interrupts(int minor) (rtems_irq_is_enabled)null_fun, NULL }; +#else + rtems_irq_connect_data IrqData = {0, + ns16550_isr, + &Console_Port_Data[minor], + (rtems_irq_enable)null_fun, + (rtems_irq_disable)null_fun, + (rtems_irq_is_enabled)null_fun + }; +#endif ns16550_init(minor); Console_Port_Data[minor].bActive = FALSE; - IrqData.name = (rtems_irq_symbolic_name)( - (unsigned int)BSP_PCI_IRQ0 + Console_Port_Tbl[minor].ulIntVector ); + IrqData.name = (rtems_irq_symbolic_name)(Console_Port_Tbl[minor].ulIntVector ); +#ifdef BSP_SHARED_HANDLER_SUPPORT if (!BSP_install_rtems_shared_irq_handler (&IrqData)) { +#else + if (!BSP_install_rtems_irq_handler(&IrqData)) { +#endif printk("Error installing interrupt handler!\n"); rtems_fatal_error_occurred(1); } |