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

2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>

Browse Source 
PR 1917/bsps
	* mongoosev/duart/mg5uart.c: Modifications to add dynamic tables for
	libchip serial drivers.
This commit is contained in:
Jennifer Averett
2011-10-18 18:39:05 +00:00
parent 7431fdc965
commit 11f7aab754
2 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libcpu/mips/ChangeLog
View File

@@ -1,3 +1,9 @@
2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>
PR 1917/bsps
* mongoosev/duart/mg5uart.c: Modifications to add dynamic tables for
libchip serial drivers.
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* au1x00/vectorisrs/vectorisrs.c: * au1x00/vectorisrs/vectorisrs.c:

70
c/src/lib/libcpu/mips/mongoosev/duart/mg5uart.c
View File

@@ -88,8 +88,8 @@ MG5UART_STATIC int mg5uart_set_attributes(
uint32_t shift; uint32_t shift;
rtems_interrupt_level Irql; rtems_interrupt_level Irql;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
/* /*
* Set the baud rate * Set the baud rate
@@ -161,7 +161,7 @@ MG5UART_STATIC int mg5uart_set_attributes(
* Now write the registers * Now write the registers
*/ */
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_CMD_SHIFT; shift = MONGOOSEV_UART0_CMD_SHIFT;
else else
shift = MONGOOSEV_UART1_CMD_SHIFT; shift = MONGOOSEV_UART1_CMD_SHIFT;
@@ -197,14 +197,14 @@ MG5UART_STATIC void mg5uart_initialize_context(
unsigned int pMG5UART; unsigned int pMG5UART;
unsigned int pMG5UART_port; unsigned int pMG5UART_port;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
pmg5uartContext->mate = -1; pmg5uartContext->mate = -1;
for (port=0 ; port<Console_Port_Count ; port++ ) { for (port=0 ; port<Console_Port_Count ; port++ ) {
if ( Console_Port_Tbl[port].ulCtrlPort1 == pMG5UART && if ( Console_Port_Tbl[port]->ulCtrlPort1 == pMG5UART &&
Console_Port_Tbl[port].ulCtrlPort2 != pMG5UART_port ) { Console_Port_Tbl[port]->ulCtrlPort2 != pMG5UART_port ) {
pmg5uartContext->mate = port; pmg5uartContext->mate = port;
break; break;
} }
@@ -233,10 +233,10 @@ MG5UART_STATIC void mg5uart_init(int minor)
mg5uart_initialize_context( minor, pmg5uartContext ); mg5uart_initialize_context( minor, pmg5uartContext );
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_CMD_SHIFT; shift = MONGOOSEV_UART0_CMD_SHIFT;
else else
shift = MONGOOSEV_UART1_CMD_SHIFT; shift = MONGOOSEV_UART1_CMD_SHIFT;
@@ -278,11 +278,11 @@ MG5UART_STATIC int mg5uart_open(
rtems_interrupt_level Irql; rtems_interrupt_level Irql;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
vector = Console_Port_Tbl[minor].ulIntVector; vector = Console_Port_Tbl[minor]->ulIntVector;
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_CMD_SHIFT; shift = MONGOOSEV_UART0_CMD_SHIFT;
else else
shift = MONGOOSEV_UART1_CMD_SHIFT; shift = MONGOOSEV_UART1_CMD_SHIFT;
@@ -332,8 +332,8 @@ MG5UART_STATIC int mg5uart_close(
uint32_t shift; uint32_t shift;
rtems_interrupt_level Irql; rtems_interrupt_level Irql;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
/* /*
* Disable interrupts from this channel and then disable it totally. * Disable interrupts from this channel and then disable it totally.
@@ -343,7 +343,7 @@ MG5UART_STATIC int mg5uart_close(
cmd = MONGOOSEV_UART_CMD_TX_DISABLE | MONGOOSEV_UART_CMD_RX_DISABLE; cmd = MONGOOSEV_UART_CMD_TX_DISABLE | MONGOOSEV_UART_CMD_RX_DISABLE;
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_CMD_SHIFT; shift = MONGOOSEV_UART0_CMD_SHIFT;
else else
shift = MONGOOSEV_UART1_CMD_SHIFT; shift = MONGOOSEV_UART1_CMD_SHIFT;
@@ -380,10 +380,10 @@ MG5UART_STATIC void mg5uart_write_polled(
int shift; int shift;
int timeout; int timeout;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_IRQ_SHIFT; shift = MONGOOSEV_UART0_IRQ_SHIFT;
else else
shift = MONGOOSEV_UART1_IRQ_SHIFT; shift = MONGOOSEV_UART1_IRQ_SHIFT;
@@ -454,8 +454,8 @@ extern void mips_default_isr(int vector);
int minor; \ int minor; \
\ \
for(minor=0 ; minor<Console_Port_Count ; minor++) { \ for(minor=0 ; minor<Console_Port_Count ; minor++) { \
if( Console_Port_Tbl[minor].deviceType == SERIAL_MG5UART && \ if( Console_Port_Tbl[minor]->deviceType == SERIAL_MG5UART && \
vector == Console_Port_Tbl[minor].ulIntVector + _OFFSET ) { \ vector == Console_Port_Tbl[minor]->ulIntVector + _OFFSET ) { \
mg5uart_process_isr_ ## _TYPE (minor); \ mg5uart_process_isr_ ## _TYPE (minor); \
return; \ return; \
} \ } \
@@ -478,9 +478,9 @@ MG5UART_STATIC void mg5uart_process_isr_rx_error(
uint32_t pMG5UART; uint32_t pMG5UART;
int shift; int shift;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_IRQ_SHIFT; shift = MONGOOSEV_UART0_IRQ_SHIFT;
else else
shift = MONGOOSEV_UART1_IRQ_SHIFT; shift = MONGOOSEV_UART1_IRQ_SHIFT;
@@ -523,11 +523,11 @@ MG5UART_STATIC void mg5uart_process_tx_isr(
uint32_t pMG5UART; uint32_t pMG5UART;
int shift; int shift;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
mg5uart_enable_interrupts(minor, MG5UART_ENABLE_ALL_EXCEPT_TX); mg5uart_enable_interrupts(minor, MG5UART_ENABLE_ALL_EXCEPT_TX);
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_IRQ_SHIFT; shift = MONGOOSEV_UART0_IRQ_SHIFT;
else else
shift = MONGOOSEV_UART1_IRQ_SHIFT; shift = MONGOOSEV_UART1_IRQ_SHIFT;
@@ -580,7 +580,7 @@ MG5UART_STATIC void mg5uart_process_isr_rx_ready(
uint32_t pMG5UART_port; uint32_t pMG5UART_port;
char c; char c;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
/* reading the RX buffer automatically resets the interrupt flag */ /* reading the RX buffer automatically resets the interrupt flag */
@@ -609,7 +609,7 @@ MG5UART_STATIC void mg5uart_initialize_interrupts(int minor)
mg5uart_init(minor); mg5uart_init(minor);
Console_Port_Data[minor].bActive = FALSE; Console_Port_Data[minor].bActive = FALSE;
v = Console_Port_Tbl[minor].ulIntVector; v = Console_Port_Tbl[minor]->ulIntVector;
set_vector(mg5uart_isr_rx_frame_error, v + MG5UART_IRQ_RX_FRAME_ERROR, 1); set_vector(mg5uart_isr_rx_frame_error, v + MG5UART_IRQ_RX_FRAME_ERROR, 1);
set_vector(mg5uart_isr_rx_overrun_error, v + MG5UART_IRQ_RX_OVERRUN_ERROR, 1); set_vector(mg5uart_isr_rx_overrun_error, v + MG5UART_IRQ_RX_OVERRUN_ERROR, 1);
@@ -639,7 +639,7 @@ MG5UART_STATIC int mg5uart_write_support_int(
uint32_t Irql; uint32_t Irql;
uint32_t pMG5UART_port; uint32_t pMG5UART_port;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
/* /*
* We are using interrupt driven output and termios only sends us * We are using interrupt driven output and termios only sends us
@@ -715,10 +715,10 @@ MG5UART_STATIC int mg5uart_inbyte_nonblocking_polled(
uint32_t status; uint32_t status;
uint32_t tmp,shift; uint32_t tmp,shift;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
pMG5UART_port = Console_Port_Tbl[minor].ulCtrlPort2; pMG5UART_port = Console_Port_Tbl[minor]->ulCtrlPort2;
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_IRQ_SHIFT; shift = MONGOOSEV_UART0_IRQ_SHIFT;
else else
shift = MONGOOSEV_UART1_IRQ_SHIFT; shift = MONGOOSEV_UART1_IRQ_SHIFT;
@@ -762,7 +762,7 @@ MG5UART_STATIC int mg5uart_baud_rate(
baud_requested = rtems_termios_baud_to_number( baud_requested ); baud_requested = rtems_termios_baud_to_number( baud_requested );
clock = (uint32_t) Console_Port_Tbl[minor].ulClock; clock = (uint32_t) Console_Port_Tbl[minor]->ulClock;
if (!clock) if (!clock)
rtems_fatal_error_occurred(RTEMS_INVALID_NUMBER); rtems_fatal_error_occurred(RTEMS_INVALID_NUMBER);
@@ -813,13 +813,13 @@ MG5UART_STATIC void mg5uart_enable_interrupts(
uint32_t shift; uint32_t shift;
rtems_interrupt_level Irql; rtems_interrupt_level Irql;
pMG5UART = Console_Port_Tbl[minor].ulCtrlPort1; pMG5UART = Console_Port_Tbl[minor]->ulCtrlPort1;
/* /*
* Enable interrupts on RX and TX -- not break * Enable interrupts on RX and TX -- not break
*/ */
if ( Console_Port_Tbl[minor].ulDataPort == MG5UART_UART0 ) if ( Console_Port_Tbl[minor]->ulDataPort == MG5UART_UART0 )
shift = MONGOOSEV_UART0_IRQ_SHIFT; shift = MONGOOSEV_UART0_IRQ_SHIFT;
else else
shift = MONGOOSEV_UART1_IRQ_SHIFT; shift = MONGOOSEV_UART1_IRQ_SHIFT;