djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf/uart: Remove unused UART.char_width field. 

Also, clean up some code.
Code size change:
nrf51: -24
nrf52: -28
This commit is contained in:
Ayke van Laethem 2018-08-02 14:35:15 +02:00
parent 2cf2ad943e
commit 60a05485cb
No known key found for this signature in database
GPG Key ID: E97FF5335DFDFDED
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ports/nrf/modules/machine/uart.c
View File

@ -50,7 +50,6 @@
typedef struct _machine_hard_uart_obj_t { typedef struct _machine_hard_uart_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
const nrfx_uart_t * p_uart; // Driver instance const nrfx_uart_t * p_uart; // Driver instance
byte char_width; // 0 for 7,8 bit chars, 1 for 9 bit chars
} machine_hard_uart_obj_t; } machine_hard_uart_obj_t;
static const nrfx_uart_t instance0 = NRFX_UART_INSTANCE(0); static const nrfx_uart_t instance0 = NRFX_UART_INSTANCE(0);
@ -302,44 +301,18 @@ STATIC mp_uint_t machine_hard_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_
const machine_hard_uart_obj_t *self = self_in; const machine_hard_uart_obj_t *self = self_in;
byte *buf = buf_in; byte *buf = buf_in;
// check that size is a multiple of character width
if (size & self->char_width) {
*errcode = MP_EIO;
return MP_STREAM_ERROR;
}
// convert byte size to char size
size >>= self->char_width;
// make sure we want at least 1 char
if (size == 0) {
return 0;
}
// read the data // read the data
byte * orig_buf = buf; for (size_t i = 0; i < size; i++) {
for (;;) { buf[i] = uart_rx_char(self);
int data = uart_rx_char(self);
*buf++ = data;
if (--size == 0) {
// return number of bytes read
return buf - orig_buf;
}
} }
return size;
} }
STATIC mp_uint_t machine_hard_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { STATIC mp_uint_t machine_hard_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
machine_hard_uart_obj_t *self = self_in; machine_hard_uart_obj_t *self = self_in;
const byte *buf = buf_in; const byte *buf = buf_in;
// check that size is a multiple of character width
if (size & self->char_width) {
*errcode = MP_EIO;
return MP_STREAM_ERROR;
}
nrfx_err_t err = NRFX_SUCCESS; nrfx_err_t err = NRFX_SUCCESS;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
err = uart_tx_char(self, (int)((uint8_t *)buf)[i]); err = uart_tx_char(self, (int)((uint8_t *)buf)[i]);