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

APBUART: fix GRMON -u support for older UARTs

Browse Source
This commit is contained in:
Daniel Hellstrom
2012-06-19 14:49:40 +02:00
parent 0f49c0e2f4
commit 18564f5317
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c
View File

@@ -197,18 +197,30 @@ int apbuart_init1(struct drvmgr_dev *dev)
/* Clear HW regs, leave baudrate register as it is */ /* Clear HW regs, leave baudrate register as it is */
priv->regs->status = 0; priv->regs->status = 0;
/* leave debug bit, and Transmitter/receiver if this is the debug UART */ /* leave debug bit, and Transmitter/receiver if this is the debug UART.
* With old APBUARTs debug is enabled by setting LB and FL, since LB is
* not reset we can not trust is, however since FL is reset we guess
* that we are debugging old UART if both FL and LB is already set.
*/
#ifdef LEON3 #ifdef LEON3
if (priv->regs == dbg_uart) { if (priv->regs == dbg_uart) {
db = priv->regs->ctrl & (LEON_REG_UART_CTRL_DB | db = priv->regs->ctrl & (LEON_REG_UART_CTRL_DB |
LEON_REG_UART_CTRL_RE | LEON_REG_UART_CTRL_RE |
LEON_REG_UART_CTRL_TE | LEON_REG_UART_CTRL_TE |
LEON_REG_UART_CTRL_FL | LEON_REG_UART_CTRL_FL |
LEON_REG_UART_CTRL_LB |
LEON_REG_UART_CTRL_PE | LEON_REG_UART_CTRL_PE |
LEON_REG_UART_CTRL_PS); LEON_REG_UART_CTRL_PS);
} else } else
#endif #endif
{
if (priv->regs->ctrl & (LEON_REG_UART_CTRL_FL |
LEON_REG_UART_CTRL_LB))
db = priv->regs->ctrl & (LEON_REG_UART_CTRL_FL |
LEON_REG_UART_CTRL_LB);
else
db = priv->regs->ctrl & LEON_REG_UART_CTRL_DB; db = priv->regs->ctrl & LEON_REG_UART_CTRL_DB;
}
priv->regs->ctrl = db; priv->regs->ctrl = db;