patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: modem: receiver: switch to ring buffer from pipe api

Browse source 
Replaces used k_pipe with ring_buffer API which is safe for ISR.

Signed-off-by: Georgij Cernysiov <g.cernysiov@elco-automation.de>
This commit is contained in:
Georgij Cernysiov 2019-02-13 22:48:46 +01:00 committed by Anas Nashif
parent 23b64b0d35
commit 94ee0ddbde
3 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/modem/Kconfig
View file

@ -17,6 +17,7 @@ config MODEM_RECEIVER
bool "Enable modem receiver helper driver"
depends on SERIAL_SUPPORT_INTERRUPT
select UART_INTERRUPT_DRIVEN
select RING_BUFFER
help
This driver allows modem drivers to communicate over UART with custom
defined protocols. Driver doesn't inspect received data and all

26
drivers/modem/modem_receiver.c
View file

@ -75,16 +75,12 @@ static void mdm_receiver_flush(struct mdm_receiver_context *ctx)
while (uart_fifo_read(ctx->uart_dev, &c, 1) > 0) {
continue;
}
/* clear the UART pipe */
k_pipe_init(&ctx->uart_pipe, ctx->uart_pipe_buf, ctx->uart_pipe_size);
}
static void mdm_receiver_isr(struct device *uart_dev)
{
struct mdm_receiver_context *ctx;
int rx, ret;
size_t bytes_written;
static u8_t read_buf[MAX_READ_SIZE];
/* lookup the device */
@ -98,15 +94,15 @@ static void mdm_receiver_isr(struct device *uart_dev)
uart_irq_rx_ready(ctx->uart_dev)) {
rx = uart_fifo_read(ctx->uart_dev, read_buf, sizeof(read_buf));
if (rx > 0) {
ret = k_pipe_put(&ctx->uart_pipe, read_buf, rx,
&bytes_written, rx, K_NO_WAIT);
if (ret < 0) {
LOG_ERR("UART buffer write error (%d)! "
"Flushing UART!", ret);
ret = ring_buf_put(&ctx->rx_rb, read_buf, rx);
if (ret != rx) {
LOG_ERR("Rx buffer doesn't have enough space. "
"Bytes pending: %d, written: %d",
rx, ret);
mdm_receiver_flush(ctx);
return;
k_sem_give(&ctx->rx_sem);
break;
}
k_sem_give(&ctx->rx_sem);
}
}
@ -119,7 +115,9 @@ int mdm_receiver_recv(struct mdm_receiver_context *ctx,
return -EINVAL;
}
return k_pipe_get(&ctx->uart_pipe, buf, size, bytes_read, 1, K_NO_WAIT);
*bytes_read = ring_buf_get(&ctx->rx_rb, buf, size);
return 0;
}
int mdm_receiver_send(struct mdm_receiver_context *ctx,
@ -178,9 +176,7 @@ int mdm_receiver_register(struct mdm_receiver_context *ctx,
return -ENODEV;
}
/* k_pipe is setup later in mdm_receiver_flush() */
ctx->uart_pipe_buf = buf;
ctx->uart_pipe_size = size;
ring_buf_init(&ctx->rx_rb, size, buf);
k_sem_init(&ctx->rx_sem, 0, 1);
ret = mdm_receiver_get(ctx);

6
include/drivers/modem/modem_receiver.h
View file

@ -14,8 +14,8 @@
#ifndef ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_RECEIVER_H_
#define ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_RECEIVER_H_
#include <stdlib.h>
#include <kernel.h>
#include <ring_buffer.h>
#ifdef __cplusplus
extern "C" {
@ -25,9 +25,7 @@ struct mdm_receiver_context {
struct device *uart_dev;
/* rx data */
u8_t *uart_pipe_buf;
size_t uart_pipe_size;
struct k_pipe uart_pipe;
struct ring_buf rx_rb;
struct k_sem rx_sem;
/* modem data */