Skip to content

Bound rp2 uart read_blocking and avoid re-interning parity atoms #2362

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
bettio merged 1 commit into from
Jul 20, 2026
+11 −11
Merged

Bound rp2 uart read_blocking and avoid re-interning parity atoms #2362

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
22 changes: 11 additions & 11 deletions src/platforms/rp2/src/lib/uartdriver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@ static term nif_uart_set_baudrate(Context *ctx, int argc, term argv[])
return create_pair(ctx, OK_ATOM, term_from_int28((int32_t) actual));
}

static const AtomStringIntPair parity_table[] = {
{ ATOM_STR("\x4", "none"), UART_PARITY_NONE },
{ ATOM_STR("\x4", "even"), UART_PARITY_EVEN },
{ ATOM_STR("\x3", "odd"), UART_PARITY_ODD },
SELECT_INT_DEFAULT(-1)
};

static term nif_uart_set_format(Context *ctx, int argc, term argv[])
{
UNUSED(argc);
Expand All @@ -187,19 +194,12 @@ static term nif_uart_set_format(Context *ctx, int argc, term argv[])
RAISE_ERROR(BADARG_ATOM);
}

term parity_term = argv[3];
uart_parity_t parity;
if (parity_term == globalcontext_make_atom(ctx->global, ATOM_STR("\x4", "none"))) {
parity = UART_PARITY_NONE;
} else if (parity_term == globalcontext_make_atom(ctx->global, ATOM_STR("\x4", "even"))) {
parity = UART_PARITY_EVEN;
} else if (parity_term == globalcontext_make_atom(ctx->global, ATOM_STR("\x3", "odd"))) {
parity = UART_PARITY_ODD;
} else {
int parity = interop_atom_term_select_int(parity_table, argv[3], ctx->global);
if (UNLIKELY(parity < 0)) {
RAISE_ERROR(BADARG_ATOM);
}

uart_set_format(rsrc_obj->uart_inst, (uint) data_bits, (uint) stop_bits, parity);
uart_set_format(rsrc_obj->uart_inst, (uint) data_bits, (uint) stop_bits, (uart_parity_t) parity);

return OK_ATOM;
}
Expand Down Expand Up @@ -277,7 +277,7 @@ static term nif_uart_read_blocking(Context *ctx, int argc, term argv[])
VALIDATE_VALUE(argv[1], term_is_integer);

avm_int_t count = term_to_int(argv[1]);
if (UNLIKELY(count < 0)) {
if (UNLIKELY(count < 0 || count > UINT16_MAX)) {
RAISE_ERROR(BADARG_ATOM);
}

Expand Down
Loading