RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2005-04-25 Jennifer Averett <jennifer.averett@oarcorp.com>

Browse Source 
* libchip/serial/ns16550.c:
	Fixed warnings generated in various powerpc configurations
This commit is contained in:
Jennifer Averett
2005-04-25 14:22:55 +00:00
parent a4d8296759
commit cebad9689d
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -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> 2005-04-18 Jennifer Averett <jennifer.averett@oarcorp.com>
* libchip/serial/ns16550.c: Modified * libchip/serial/ns16550.c: Modified

18
c/src/libchip/serial/ns16550.c
View File

@@ -27,6 +27,7 @@
#include <libchip/serial.h> #include <libchip/serial.h>
#include <libchip/sersupp.h> #include <libchip/sersupp.h>
#include <rtems/bspIo.h>
#include "ns16550_p.h" #include "ns16550_p.h"
/* /*
@@ -601,6 +602,7 @@ static void null_fun(){}
NS16550_STATIC void ns16550_initialize_interrupts(int minor) NS16550_STATIC void ns16550_initialize_interrupts(int minor)
{ {
#ifdef BSP_SHARED_HANDLER_SUPPORT
rtems_irq_connect_data IrqData = {0, rtems_irq_connect_data IrqData = {0,
ns16550_isr, ns16550_isr,
&Console_Port_Data[minor], &Console_Port_Data[minor],
@@ -609,15 +611,27 @@ NS16550_STATIC void ns16550_initialize_interrupts(int minor)
(rtems_irq_is_enabled)null_fun, (rtems_irq_is_enabled)null_fun,
NULL 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); ns16550_init(minor);
Console_Port_Data[minor].bActive = FALSE; Console_Port_Data[minor].bActive = FALSE;
IrqData.name = (rtems_irq_symbolic_name)( IrqData.name = (rtems_irq_symbolic_name)(Console_Port_Tbl[minor].ulIntVector );
(unsigned int)BSP_PCI_IRQ0 + Console_Port_Tbl[minor].ulIntVector );
#ifdef BSP_SHARED_HANDLER_SUPPORT
if (!BSP_install_rtems_shared_irq_handler (&IrqData)) { if (!BSP_install_rtems_shared_irq_handler (&IrqData)) {
#else
if (!BSP_install_rtems_irq_handler(&IrqData)) {
#endif
printk("Error installing interrupt handler!\n"); printk("Error installing interrupt handler!\n");
rtems_fatal_error_occurred(1); rtems_fatal_error_occurred(1);
} }