michaelh/zephyr
1
0
Fork 0
Code Releases Activity

serial: sam0: Conversion of k_work API

Browse source 
Replace all existing deprecated API with the recommended alternative.

Fixes #34102

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
This commit is contained in:
Peter Bigot 2021-03-31 10:31:30 -05:00 • committed by Anas Nashif
commit d364062b9b
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/serial/uart_sam0.c
View file

@ -58,11 +58,11 @@ struct uart_sam0_dev_data {
uart_callback_t async_cb; uart_callback_t async_cb;
void *async_cb_data; void *async_cb_data;
struct k_delayed_work tx_timeout_work; struct k_work_delayable tx_timeout_work;
const uint8_t *tx_buf; const uint8_t *tx_buf;
size_t tx_len; size_t tx_len;
struct k_delayed_work rx_timeout_work; struct k_work_delayable rx_timeout_work;
size_t rx_timeout_time; size_t rx_timeout_time;
size_t rx_timeout_chunk; size_t rx_timeout_chunk;
uint32_t rx_timeout_start; uint32_t rx_timeout_start;
@ -130,7 +130,7 @@ static void uart_sam0_dma_tx_done(const struct device *dma_dev, void *arg,
(struct uart_sam0_dev_data *const) arg; (struct uart_sam0_dev_data *const) arg;
const struct device *dev = dev_data->dev; const struct device *dev = dev_data->dev;
k_delayed_work_cancel(&dev_data->tx_timeout_work); k_work_cancel_delayable(&dev_data->tx_timeout_work);
int key = irq_lock(); int key = irq_lock();
@ -361,7 +361,7 @@ static void uart_sam0_rx_timeout(struct k_work *work)
*/ */
if (dev_data->rx_timeout_from_isr) { if (dev_data->rx_timeout_from_isr) {
dev_data->rx_timeout_from_isr = false; dev_data->rx_timeout_from_isr = false;
k_delayed_work_submit(&dev_data->rx_timeout_work, k_work_reschedule(&dev_data->rx_timeout_work,
K_MSEC(dev_data->rx_timeout_chunk)); K_MSEC(dev_data->rx_timeout_chunk));
irq_unlock(key); irq_unlock(key);
return; return;
@ -383,7 +383,7 @@ static void uart_sam0_rx_timeout(struct k_work *work)
uint32_t remaining = MIN(dev_data->rx_timeout_time - elapsed, uint32_t remaining = MIN(dev_data->rx_timeout_time - elapsed,
dev_data->rx_timeout_chunk); dev_data->rx_timeout_chunk);
k_delayed_work_submit(&dev_data->rx_timeout_work, k_work_reschedule(&dev_data->rx_timeout_work,
K_MSEC(remaining)); K_MSEC(remaining));
} }
@ -570,8 +570,8 @@ static int uart_sam0_init(const struct device *dev)
return -ENODEV; return -ENODEV;
} }
k_delayed_work_init(&dev_data->tx_timeout_work, uart_sam0_tx_timeout); k_work_init_delayable(&dev_data->tx_timeout_work, uart_sam0_tx_timeout);
k_delayed_work_init(&dev_data->rx_timeout_work, uart_sam0_rx_timeout); k_work_init_delayable(&dev_data->rx_timeout_work, uart_sam0_rx_timeout);
if (cfg->tx_dma_channel != 0xFFU) { if (cfg->tx_dma_channel != 0xFFU) {
struct dma_config dma_cfg = { 0 }; struct dma_config dma_cfg = { 0 };
@ -689,7 +689,7 @@ static void uart_sam0_isr(const struct device *dev)
if (dev_data->rx_timeout_time != SYS_FOREVER_MS) { if (dev_data->rx_timeout_time != SYS_FOREVER_MS) {
dev_data->rx_timeout_from_isr = true; dev_data->rx_timeout_from_isr = true;
dev_data->rx_timeout_start = k_uptime_get_32(); dev_data->rx_timeout_start = k_uptime_get_32();
k_delayed_work_submit(&dev_data->rx_timeout_work, k_work_reschedule(&dev_data->rx_timeout_work,
K_MSEC(dev_data->rx_timeout_chunk)); K_MSEC(dev_data->rx_timeout_chunk));
} }
@ -846,7 +846,7 @@ static int uart_sam0_tx(const struct device *dev, const uint8_t *buf,
} }
if (timeout != SYS_FOREVER_MS) { if (timeout != SYS_FOREVER_MS) {
k_delayed_work_submit(&dev_data->tx_timeout_work, k_work_reschedule(&dev_data->tx_timeout_work,
K_MSEC(timeout)); K_MSEC(timeout));
} }
@ -865,7 +865,7 @@ static int uart_sam0_tx_abort(const struct device *dev)
return -ENOTSUP; return -ENOTSUP;
} }
k_delayed_work_cancel(&dev_data->tx_timeout_work); k_work_cancel_delayable(&dev_data->tx_timeout_work);
return uart_sam0_tx_halt(dev_data); return uart_sam0_tx_halt(dev_data);
} }
@ -965,7 +965,7 @@ static int uart_sam0_rx_disable(const struct device *dev)
SercomUsart *const regs = cfg->regs; SercomUsart *const regs = cfg->regs;
struct dma_status st; struct dma_status st;
k_delayed_work_cancel(&dev_data->rx_timeout_work); k_work_cancel_delayable(&dev_data->rx_timeout_work);
int key = irq_lock(); int key = irq_lock();