Skip to content

pbdrv/uart: Use uint32_t for read/write length #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2025
Merged

pbdrv/uart: Use uint32_t for read/write length #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/pbio/drv/uart/uart_ev3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ struct _pbdrv_uart_dev_t {
/** The buffer passed to the read function. */
uint8_t *read_buf;
/** The length of read_buf in bytes. */
uint8_t read_length;
uint32_t read_length;
/** The current position in read_buf. */
uint8_t read_pos;
uint32_t read_pos;
/** The buffer passed to the write function. */
const uint8_t *write_buf;
/** The length of write_buf in bytes. */
uint8_t write_length;
uint32_t write_length;
/** The current position in write_buf. */
volatile uint8_t write_pos;
volatile uint32_t write_pos;
};

static pbdrv_uart_dev_t uart_devs[PBDRV_CONFIG_UART_EV3_NUM_UART];
Expand All @@ -89,7 +89,7 @@ int32_t pbdrv_uart_get_char(pbdrv_uart_dev_t *uart) {
return ringbuf_get(&uart->rx_buf);
}

pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand Down Expand Up @@ -131,7 +131,7 @@ pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uin
PBIO_OS_ASYNC_END(PBIO_SUCCESS);
}

static pbio_error_t pbdrv_uart_write_pru(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint8_t length, uint32_t timeout) {
static pbio_error_t pbdrv_uart_write_pru(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint32_t length, uint32_t timeout) {

const pbdrv_uart_ev3_platform_data_t *pdata = uart->pdata;

Expand Down Expand Up @@ -178,7 +178,7 @@ static pbio_error_t pbdrv_uart_write_pru(pbio_os_state_t *state, pbdrv_uart_dev_
PBIO_OS_ASYNC_END(PBIO_SUCCESS);
}

pbio_error_t pbdrv_uart_write_hw(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_write_hw(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint32_t length, uint32_t timeout) {

const pbdrv_uart_ev3_platform_data_t *pdata = uart->pdata;

Expand Down Expand Up @@ -240,7 +240,7 @@ pbio_error_t pbdrv_uart_write_hw(pbio_os_state_t *state, pbdrv_uart_dev_t *uart,
PBIO_OS_ASYNC_END(PBIO_SUCCESS);
}

pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint32_t length, uint32_t timeout) {
const pbdrv_uart_ev3_platform_data_t *pdata = uart->pdata;

if (pdata->uart_kind == EV3_UART_HW) {
Expand Down
12 changes: 6 additions & 6 deletions lib/pbio/drv/uart/uart_stm32f0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ struct _pbdrv_uart_dev_t {
volatile uint8_t rx_ring_buf_head;
uint8_t rx_ring_buf_tail;
uint8_t *rx_buf;
uint8_t rx_buf_size;
uint8_t rx_buf_index;
uint32_t rx_buf_size;
uint32_t rx_buf_index;
const uint8_t *tx_buf;
uint8_t tx_buf_size;
uint8_t tx_buf_index;
uint32_t tx_buf_size;
uint32_t tx_buf_index;
pbio_os_timer_t rx_timer;
pbio_os_timer_t tx_timer;
uint8_t irq;
Expand All @@ -59,7 +59,7 @@ pbio_error_t pbdrv_uart_get_instance(uint8_t id, pbdrv_uart_dev_t **uart_dev) {
return PBIO_SUCCESS;
}

pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand Down Expand Up @@ -102,7 +102,7 @@ pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uin
PBIO_OS_ASYNC_END(PBIO_SUCCESS);
}

pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand Down
12 changes: 6 additions & 6 deletions lib/pbio/drv/uart/uart_stm32f4_ll_irq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ struct _pbdrv_uart_dev_t {
/** The buffer of the ongoing async read function. */
uint8_t *read_buf;
/** The length of read_buf in bytes. */
uint8_t read_length;
uint32_t read_length;
/** The current position in read_buf. */
uint8_t read_pos;
uint32_t read_pos;
/** The buffer of the ongoing write function. */
const uint8_t *write_buf;
/** The length of write_buf in bytes. */
uint8_t write_length;
uint32_t write_length;
/** The current position in write_buf. */
volatile uint8_t write_pos;
volatile uint32_t write_pos;
};

static pbdrv_uart_dev_t uart_devs[PBDRV_CONFIG_UART_STM32F4_LL_IRQ_NUM_UART];
Expand All @@ -66,7 +66,7 @@ pbio_error_t pbdrv_uart_get_instance(uint8_t id, pbdrv_uart_dev_t **uart_dev) {
return PBIO_SUCCESS;
}

pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand Down Expand Up @@ -108,7 +108,7 @@ pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uin
PBIO_OS_ASYNC_END(PBIO_SUCCESS);
}

pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand Down
12 changes: 6 additions & 6 deletions lib/pbio/drv/uart/uart_stm32l4_ll_dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ struct _pbdrv_uart_dev_t {
pbio_os_timer_t rx_timer;
pbio_os_timer_t tx_timer;
volatile uint8_t *rx_data;
uint8_t rx_tail;
uint32_t rx_tail;
uint8_t *read_buf;
uint8_t read_length;
uint32_t read_length;
};

static pbdrv_uart_dev_t uart_devs[PBDRV_CONFIG_UART_STM32L4_LL_DMA_NUM_UART];
Expand All @@ -55,8 +55,8 @@ pbio_error_t pbdrv_uart_get_instance(uint8_t id, pbdrv_uart_dev_t **uart_dev) {
return PBIO_SUCCESS;
}

static void volatile_copy(volatile uint8_t *src, uint8_t *dst, uint8_t size) {
for (int i = 0; i < size; i++) {
static void volatile_copy(volatile uint8_t *src, uint8_t *dst, uint32_t size) {
for (uint32_t i = 0; i < size; i++) {
dst[i] = src[i];
}
}
Expand Down Expand Up @@ -187,7 +187,7 @@ static uint32_t pbdrv_uart_get_num_available(pbdrv_uart_dev_t *uart) {
return (rx_head - uart->rx_tail) & (RX_DATA_SIZE - 1);
}

pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand Down Expand Up @@ -227,7 +227,7 @@ pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, uin
PBIO_OS_ASYNC_END(PBIO_SUCCESS);
}

pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint32_t length, uint32_t timeout) {

const pbdrv_uart_stm32l4_ll_dma_platform_data_t *pdata = uart->pdata;

Expand Down
12 changes: 6 additions & 6 deletions lib/pbio/include/pbdrv/uart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ int32_t pbdrv_uart_get_char(pbdrv_uart_dev_t *uart_dev);
* @param [in] timeout The timeout in milliseconds or 0 for no timeout.
* @return The error code.
*/
pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout);
pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint32_t length, uint32_t timeout);

/**
* Asynchronously write to the UART.
Expand All @@ -58,7 +58,7 @@ pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev,
*
* @return The error code.
*/
pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint8_t length, uint32_t timeout);
pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart, const uint8_t *msg, uint32_t length, uint32_t timeout);

#else // PBDRV_CONFIG_UART

Expand All @@ -70,13 +70,13 @@ static inline void pbdrv_uart_set_baud_rate(pbdrv_uart_dev_t *uart_dev, uint32_t
}
static inline void pbdrv_uart_stop(pbdrv_uart_dev_t *uart_dev) {
}
static inline pbio_error_t pbdrv_uart_read_begin(pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout) {
static inline pbio_error_t pbdrv_uart_read_begin(pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint32_t length, uint32_t timeout) {
return PBIO_ERROR_NOT_SUPPORTED;
}
static inline pbio_error_t pbdrv_uart_read_end(pbdrv_uart_dev_t *uart_dev) {
return PBIO_ERROR_NOT_SUPPORTED;
}
static inline pbio_error_t pbdrv_uart_write_begin(pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout) {
static inline pbio_error_t pbdrv_uart_write_begin(pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint32_t length, uint32_t timeout) {
return PBIO_ERROR_NOT_SUPPORTED;
}
static inline pbio_error_t pbdrv_uart_write_end(pbdrv_uart_dev_t *uart_dev) {
Expand All @@ -97,11 +97,11 @@ static inline int32_t pbdrv_uart_get_char(pbdrv_uart_dev_t *uart_dev) {
return -1;
}

static inline pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout) {
static inline pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint32_t length, uint32_t timeout) {
return PBIO_ERROR_NOT_SUPPORTED;
}

static inline pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout) {
static inline pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint32_t length, uint32_t timeout) {
return PBIO_ERROR_NOT_SUPPORTED;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/pbio/src/port_lump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ struct _pbio_port_lump_dev_t {
/** New baud rate that will be set with ev3_uart_change_bitrate. */
uint32_t new_baud_rate;
/** Size of the current message being transmitted. */
uint8_t tx_msg_size;
uint32_t tx_msg_size;
/** Size of the current message being received. */
uint8_t rx_msg_size;
uint32_t rx_msg_size;
/** Total number of errors that have occurred. */
uint32_t err_count;
/** Flag that indicates that good DATA lump_dev->msg has been received since last watchdog timeout. */
Expand Down
4 changes: 2 additions & 2 deletions lib/pbio/test/src/test_lump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ void pbdrv_uart_init(void) {
void pbdrv_uart_stop(pbdrv_uart_dev_t *uart_dev) {
}

pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand All @@ -1134,7 +1134,7 @@ pbio_error_t pbdrv_uart_read(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev,
PBIO_OS_ASYNC_END(uart_dev->rx_msg_result);
}

pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, const uint8_t *msg, uint8_t length, uint32_t timeout) {
pbio_error_t pbdrv_uart_write(pbio_os_state_t *state, pbdrv_uart_dev_t *uart_dev, const uint8_t *msg, uint32_t length, uint32_t timeout) {

PBIO_OS_ASYNC_BEGIN(state);

Expand Down