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

2007-09-06 Daniel Hellstrom <daniel@gaisler.com>

Browse Source 
* console/debugputs.c: Now works on multi-CPU systems.
This commit is contained in:
Joel Sherrill
2007-09-06 13:11:45 +00:00
parent 921bb59a83
commit 28f3f511a7
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/sparc/leon3/ChangeLog
View File

@@ -1,3 +1,7 @@
2007-09-06 Daniel Hellstrom <daniel@gaisler.com>
* console/debugputs.c: Now works on multi-CPU systems.
2007-09-05 Daniel Hellstrom <daniel@gaisler.com>
* clock/ckinit.c, console/console.c, leon_greth/leon_greth.c,

13
c/src/lib/libbsp/sparc/leon3/console/debugputs.c
View File

@@ -35,8 +35,9 @@ void console_outbyte_polled(
{
if ((port >= 0) && (port <= CONFIGURE_NUMBER_OF_TERMIOS_PORTS))
{
while ( (LEON3_Console_Uart[port]->status & LEON_REG_UART_STATUS_THE) == 0 );
LEON3_Console_Uart[port]->data = (unsigned int) ch;
while ( (LEON3_Console_Uart[LEON3_Cpu_Index+port]->status &
LEON_REG_UART_STATUS_THE) == 0 );
LEON3_Console_Uart[LEON3_Cpu_Index+port]->data = (unsigned int) ch;
}
}
@@ -52,13 +53,13 @@ int console_inbyte_nonblocking( int port )
if ((port >=0) && (port < CONFIGURE_NUMBER_OF_TERMIOS_PORTS))
{
if (LEON3_Console_Uart[port]->status & LEON_REG_UART_STATUS_ERR) {
LEON3_Console_Uart[port]->status = ~LEON_REG_UART_STATUS_ERR;
if (LEON3_Console_Uart[LEON3_Cpu_Index+port]->status & LEON_REG_UART_STATUS_ERR) {
LEON3_Console_Uart[LEON3_Cpu_Index+port]->status = ~LEON_REG_UART_STATUS_ERR;
}
if ((LEON3_Console_Uart[port]->status & LEON_REG_UART_STATUS_DR) == 0)
if ((LEON3_Console_Uart[LEON3_Cpu_Index+port]->status & LEON_REG_UART_STATUS_DR) == 0)
return -1;
return (int) LEON3_Console_Uart[port]->data;
return (int) LEON3_Console_Uart[LEON3_Cpu_Index+port]->data;
}
else