mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/uart: Move config of char_width/char_mask to uart.c.

Browse Source
This commit is contained in:
Damien George 2018-12-10 13:02:11 +11:00
parent 6ea45277bf
commit 61ef031687
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/stm32/machine_uart.c
View File

@ -217,17 +217,6 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
// setup the read buffer // setup the read buffer
m_del(byte, self->read_buf, self->read_buf_len << self->char_width); m_del(byte, self->read_buf, self->read_buf_len << self->char_width);
if (bits == UART_WORDLENGTH_9B && parity == UART_PARITY_NONE) {
self->char_mask = 0x1ff;
self->char_width = CHAR_WIDTH_9BIT;
} else {
if (bits == UART_WORDLENGTH_9B || parity == UART_PARITY_NONE) {
self->char_mask = 0xff;
} else {
self->char_mask = 0x7f;
}
self->char_width = CHAR_WIDTH_8BIT;
}
if (args.rxbuf.u_int >= 0) { if (args.rxbuf.u_int >= 0) {
// rxbuf overrides legacy read_buf_len // rxbuf overrides legacy read_buf_len
args.read_buf_len.u_int = args.rxbuf.u_int; args.read_buf_len.u_int = args.rxbuf.u_int;

12
ports/stm32/uart.c
View File

@ -318,6 +318,18 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
uart_obj->is_enabled = true; uart_obj->is_enabled = true;
uart_obj->attached_to_repl = false; uart_obj->attached_to_repl = false;
if (bits == UART_WORDLENGTH_9B && parity == UART_PARITY_NONE) {
uart_obj->char_mask = 0x1ff;
uart_obj->char_width = CHAR_WIDTH_9BIT;
} else {
if (bits == UART_WORDLENGTH_9B || parity == UART_PARITY_NONE) {
uart_obj->char_mask = 0xff;
} else {
uart_obj->char_mask = 0x7f;
}
uart_obj->char_width = CHAR_WIDTH_8BIT;
}
return true; return true;
} }