Changeset 411c297 in rtems
- Timestamp:
- 01/18/19 10:24:18 (5 years ago)
- Branches:
- 5, master
- Children:
- 5981c8ca
- Parents:
- 7eb606d3
- git-author:
- Jiri Gaisler <jiri@…> (01/18/19 10:24:18)
- git-committer:
- Sebastian Huber <sebastian.huber@…> (01/22/19 11:48:19)
- Location:
- bsps
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
bsps/include/grlib/apbuart.h
r7eb606d3 r411c297 38 38 #define APBUART_CTRL_TF 0x200 39 39 #define APBUART_CTRL_RF 0x400 40 #define APBUART_CTRL_DB 0x800 40 41 #define APBUART_CTRL_BI 0x1000 41 42 #define APBUART_CTRL_DI 0x2000 -
bsps/shared/grlib/uart/apbuart_cons.c
r7eb606d3 r411c297 261 261 #ifdef LEON3 262 262 if (priv->regs == leon3_debug_uart) { 263 db = priv->regs->ctrl & ( LEON_REG_UART_CTRL_RE |264 LEON_REG_UART_CTRL_TE |265 LEON_REG_UART_CTRL_PE |266 LEON_REG_UART_CTRL_PS);263 db = priv->regs->ctrl & (APBUART_CTRL_RE | 264 APBUART_CTRL_TE | 265 APBUART_CTRL_PE | 266 APBUART_CTRL_PS); 267 267 } 268 268 #endif … … 274 274 * either LB or DB depending on UART capabilities. 275 275 */ 276 if (priv->regs->ctrl & LEON_REG_UART_CTRL_FL) {277 db |= priv->regs->ctrl & ( LEON_REG_UART_CTRL_DB |278 LEON_REG_UART_CTRL_LB | LEON_REG_UART_CTRL_FL);276 if (priv->regs->ctrl & APBUART_CTRL_FL) { 277 db |= priv->regs->ctrl & (APBUART_CTRL_DB | 278 APBUART_CTRL_LB | APBUART_CTRL_FL); 279 279 } 280 280 … … 562 562 case (PARENB|PARODD): 563 563 /* Odd parity */ 564 ctrl |= LEON_REG_UART_CTRL_PE|LEON_REG_UART_CTRL_PS;564 ctrl |= APBUART_CTRL_PE|APBUART_CTRL_PS; 565 565 break; 566 566 567 567 case PARENB: 568 568 /* Even parity */ 569 ctrl &= ~ LEON_REG_UART_CTRL_PS;570 ctrl |= LEON_REG_UART_CTRL_PE;569 ctrl &= ~APBUART_CTRL_PS; 570 ctrl |= APBUART_CTRL_PE; 571 571 break; 572 572 … … 575 575 case PARODD: 576 576 /* No Parity */ 577 ctrl &= ~( LEON_REG_UART_CTRL_PS|LEON_REG_UART_CTRL_PE);577 ctrl &= ~(APBUART_CTRL_PS|APBUART_CTRL_PE); 578 578 } 579 579 580 580 if (!(t->c_cflag & CLOCAL)) 581 ctrl |= LEON_REG_UART_CTRL_FL;581 ctrl |= APBUART_CTRL_FL; 582 582 else 583 ctrl &= ~ LEON_REG_UART_CTRL_FL;583 ctrl &= ~APBUART_CTRL_FL; 584 584 585 585 /* Update new settings */ … … 619 619 /* Read out current parity */ 620 620 ctrl = uart->regs->ctrl; 621 if (ctrl & LEON_REG_UART_CTRL_PE) {622 if (ctrl & LEON_REG_UART_CTRL_PS)621 if (ctrl & APBUART_CTRL_PE) { 622 if (ctrl & APBUART_CTRL_PS) 623 623 t->c_cflag |= PARENB|PARODD; /* Odd parity */ 624 624 else … … 626 626 } 627 627 628 if ((ctrl & LEON_REG_UART_CTRL_FL) == 0)628 if ((ctrl & APBUART_CTRL_FL) == 0) 629 629 t->c_cflag |= CLOCAL; 630 630 -
bsps/sparc/leon2/include/leon.h
r7eb606d3 r411c297 267 267 #define LEON_REG_UART_CTRL_FL 0x00000040 /* Flow control enable */ 268 268 #define LEON_REG_UART_CTRL_LB 0x00000080 /* Loop Back enable */ 269 #define LEON_REG_UART_CTRL_DB 0x00000800 /* Debug FIFO enable */270 269 271 270 #ifndef ASM
Note: See TracChangeset
for help on using the changeset viewer.