kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-23 05:23:50 +01:00
Code Releases Activity

cpus: adapted UART implementations to cb type change

Browse Source
This commit is contained in:
Hauke Petersen 2016-03-15 10:58:54 +01:00
parent 18ae50ad4e
commit b23cde98cf
15 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/ezr32wg/periph/uart.c
View File

@ -101,7 +101,7 @@ void uart_poweroff(uart_t dev)
static inline void rx_irq(int dev) static inline void rx_irq(int dev)
{ {
if (_uart(dev)->IF & USART_IF_RXDATAV) { if (_uart(dev)->IF & USART_IF_RXDATAV) {
char data = (char)_uart(dev)->RXDATA; uint8_t data = (uint8_t)_uart(dev)->RXDATA;
isr_ctx[dev].rx_cb(isr_ctx[dev].arg, data); isr_ctx[dev].rx_cb(isr_ctx[dev].arg, data);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {

7
cpu/lm4f120/periph/uart.c
View File

@ -135,11 +135,8 @@ void isr_uart0(void)
{ {
while(ROM_UARTCharsAvail(UART0_BASE)) while(ROM_UARTCharsAvail(UART0_BASE))
{ {
char cChar; long lchar = ROM_UARTCharGetNonBlocking(UART0_BASE);
long lChar; config[UART_0].rx_cb(config[UART_0].arg, (uint8_t)lchar);
lChar = ROM_UARTCharGetNonBlocking(UART0_BASE);
cChar = (unsigned char)(lChar & 0xFF);
config[UART_0].rx_cb(config[UART_0].arg, cChar);
} }
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {

2
cpu/lpc11u34/periph/uart.c
View File

@ -133,7 +133,7 @@ void uart_poweroff(uart_t uart)
void UART_0_ISR(void) void UART_0_ISR(void)
{ {
if (UART_0_DEV->LSR & (1 << 0)) { /* is RDR flag set? */ if (UART_0_DEV->LSR & (1 << 0)) { /* is RDR flag set? */
char data = (char)UART_0_DEV->RBR; uint8_t data = (uint8_t)UART_0_DEV->RBR;
config[UART_0].rx_cb(config[UART_0].arg, data); config[UART_0].rx_cb(config[UART_0].arg, data);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {

4
cpu/lpc1768/periph/uart.c
View File

@ -200,7 +200,7 @@ void uart_poweroff(uart_t uart)
void UART_0_ISR(void) void UART_0_ISR(void)
{ {
if (UART_0_DEV->LSR & (1 << 0)) { /* is RDR flag set? */ if (UART_0_DEV->LSR & (1 << 0)) { /* is RDR flag set? */
char data = (char)UART_0_DEV->RBR; uint8_t data = (uint8_t)UART_0_DEV->RBR;
config[UART_0].rx_cb(config[UART_0].arg, data); config[UART_0].rx_cb(config[UART_0].arg, data);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {
@ -213,7 +213,7 @@ void UART_0_ISR(void)
void UART_1_ISR(void) void UART_1_ISR(void)
{ {
if (UART_1_DEV->LSR & (1 << 0)) { /* is RDR flag set? */ if (UART_1_DEV->LSR & (1 << 0)) { /* is RDR flag set? */
char data = (char)UART_1_DEV->RBR; uint8_t data = (uint8_t)UART_1_DEV->RBR;
config[UART_1].rx_cb(config[UART_1].arg, data); config[UART_1].rx_cb(config[UART_1].arg, data);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {

2
cpu/lpc2387/periph/uart.c
View File

@ -84,7 +84,7 @@ void UART0_IRQHandler(void)
case UIIR_CTI_INT: /* Character Timeout Indicator */ case UIIR_CTI_INT: /* Character Timeout Indicator */
case UIIR_RDA_INT: /* Receive Data Available */ case UIIR_RDA_INT: /* Receive Data Available */
do { do {
char c = (char)U0RBR; uint8_t c = (uint8_t)U0RBR;
_rx_cb(_cb_arg, c); _rx_cb(_cb_arg, c);
} while (U0LSR & ULSR_RDR); } while (U0LSR & ULSR_RDR);
break; break;

2
cpu/msp430fxyz/periph/uart.c
View File

@ -204,7 +204,7 @@ ISR(UART_RX_ISR, isr_uart_0_rx)
__enter_isr(); __enter_isr();
uint8_t stat = UART_BASE->ASTAT; uint8_t stat = UART_BASE->ASTAT;
char data = (char)UART_BASE->ARXBUF; uint8_t data = (uint8_t)UART_BASE->ARXBUF;
if (stat & (USCI_ASTAT_FE | USCI_ASTAT_OE | USCI_ASTAT_PE | USCI_ASTAT_BRK)) { if (stat & (USCI_ASTAT_FE | USCI_ASTAT_OE | USCI_ASTAT_PE | USCI_ASTAT_BRK)) {
/* some error which we do not handle, just do a pseudo read to reset the /* some error which we do not handle, just do a pseudo read to reset the

2
cpu/nrf5x_common/periph/uart.c
View File

@ -167,7 +167,7 @@ void isr_uart0(void)
{ {
if (NRF_UART0->EVENTS_RXDRDY == 1) { if (NRF_UART0->EVENTS_RXDRDY == 1) {
NRF_UART0->EVENTS_RXDRDY = 0; NRF_UART0->EVENTS_RXDRDY = 0;
char byte = (char)(NRF_UART0->RXD & 0xff); uint8_t byte = (uint8_t)(NRF_UART0->RXD & 0xff);
uart_config.rx_cb(uart_config.arg, byte); uart_config.rx_cb(uart_config.arg, byte);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {

2
cpu/sam3/periph/uart.c
View File

@ -99,7 +99,7 @@ static inline void isr_handler(int num)
Uart *dev = uart_config[num].dev; Uart *dev = uart_config[num].dev;
if (dev->UART_SR & UART_SR_RXRDY) { if (dev->UART_SR & UART_SR_RXRDY) {
ctx[num].rx_cb(ctx[num].arg, (char)dev->UART_RHR); ctx[num].rx_cb(ctx[num].arg, (uint8_t)dev->UART_RHR);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {
thread_yield(); thread_yield();

2
cpu/samd21/periph/uart.c
View File

@ -135,7 +135,7 @@ static inline void irq_handler(int dev)
if (uart->INTFLAG.reg & SERCOM_USART_INTFLAG_RXC) { if (uart->INTFLAG.reg & SERCOM_USART_INTFLAG_RXC) {
/* interrupt flag is cleared by reading the data register */ /* interrupt flag is cleared by reading the data register */
uart_ctx[dev].rx_cb(uart_ctx[dev].arg, (char)(uart->DATA.reg)); uart_ctx[dev].rx_cb(uart_ctx[dev].arg, (uint8_t)(uart->DATA.reg));
} }
else if (uart->INTFLAG.reg & SERCOM_USART_INTFLAG_ERROR) { else if (uart->INTFLAG.reg & SERCOM_USART_INTFLAG_ERROR) {
/* clear error flag */ /* clear error flag */

2
cpu/saml21/periph/uart.c
View File

@ -136,7 +136,7 @@ static inline void irq_handler(uint8_t uartnum, SercomUsart *dev)
{ {
if (dev->INTFLAG.bit.RXC) { if (dev->INTFLAG.bit.RXC) {
/* cleared by reading DATA regiser */ /* cleared by reading DATA regiser */
char data = (char)dev->DATA.reg; uint8_t data = (uint8_t)dev->DATA.reg;
uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data); uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data);
} }
else if (dev->INTFLAG.bit.ERROR) { else if (dev->INTFLAG.bit.ERROR) {

2
cpu/stm32f0/periph/uart.c
View File

@ -191,7 +191,7 @@ void uart_poweroff(uart_t uart)
static inline void irq_handler(uint8_t uartnum, USART_TypeDef *dev) static inline void irq_handler(uint8_t uartnum, USART_TypeDef *dev)
{ {
if (dev->ISR & USART_ISR_RXNE) { if (dev->ISR & USART_ISR_RXNE) {
char data = (char)dev->RDR; uint8_t data = (uint8_t)dev->RDR;
uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data); uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data);
} }
else if (dev->ISR & USART_ISR_ORE) { else if (dev->ISR & USART_ISR_ORE) {

2
cpu/stm32f1/periph/uart.c
View File

@ -147,7 +147,7 @@ void uart_write(uart_t uart, const uint8_t *data, size_t len)
static inline void irq_handler(uart_t uartnum, USART_TypeDef *dev) static inline void irq_handler(uart_t uartnum, USART_TypeDef *dev)
{ {
if (dev->SR & USART_SR_RXNE) { if (dev->SR & USART_SR_RXNE) {
char data = (char)dev->DR; uint8_t data = (uint8_t)dev->DR;
config[uartnum].rx_cb(config[uartnum].arg, data); config[uartnum].rx_cb(config[uartnum].arg, data);
} }
else if (dev->SR & USART_SR_ORE) { else if (dev->SR & USART_SR_ORE) {

2
cpu/stm32f3/periph/uart.c
View File

@ -187,7 +187,7 @@ void uart_write(uart_t uart, const uint8_t *data, size_t len)
static inline void irq_handler(uint8_t uartnum, USART_TypeDef *dev) static inline void irq_handler(uint8_t uartnum, USART_TypeDef *dev)
{ {
if (dev->ISR & USART_ISR_RXNE) { if (dev->ISR & USART_ISR_RXNE) {
char data = (char)dev->RDR; uint8_t data = (uint8_t)dev->RDR;
uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data); uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data);
} }
else if (dev->ISR & USART_ISR_ORE) { else if (dev->ISR & USART_ISR_ORE) {

2
cpu/stm32f4/periph/uart.c
View File

@ -165,7 +165,7 @@ void uart_poweroff(uart_t uart)
static inline void irq_handler(int uart, USART_TypeDef *dev) static inline void irq_handler(int uart, USART_TypeDef *dev)
{ {
if (dev->SR & USART_SR_RXNE) { if (dev->SR & USART_SR_RXNE) {
char data = (char)dev->DR; uint8_t data = (uint8_t)dev->DR;
uart_ctx[uart].rx_cb(uart_ctx[uart].arg, data); uart_ctx[uart].rx_cb(uart_ctx[uart].arg, data);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {

2
cpu/stm32l1/periph/uart.c
View File

@ -166,7 +166,7 @@ void uart_write(uart_t uart, const uint8_t *data, size_t len)
static inline void irq_handler(uint8_t uartnum, USART_TypeDef *dev) static inline void irq_handler(uint8_t uartnum, USART_TypeDef *dev)
{ {
if (dev->SR & USART_SR_RXNE) { if (dev->SR & USART_SR_RXNE) {
char data = (char)dev->DR; uint8_t data = (uint8_t)dev->DR;
uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data); uart_config[uartnum].rx_cb(uart_config[uartnum].arg, data);
} }
if (sched_context_switch_request) { if (sched_context_switch_request) {