diff options
| author | Diego Elio Pettenò <flameeyes@flameeyes.com> | 2020-05-30 10:44:13 +0100 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@flameeyes.com> | 2020-06-03 10:56:35 +0100 |
| commit | dd5d7c86d22807c021dd1711eb7dd3daebc5cfcf (patch) | |
| tree | dde417af2cae8cb1797582d6489eab9cb9caeddf /ports/mimxrt10xx/common-hal/busio | |
| parent | 60df6170cc5d0e495fde9613c05c55b64189b425 (diff) | |
Fix up end of file and trailing whitespace.
This can be enforced by pre-commit, but correct it separately to make it easier to review.
Diffstat (limited to 'ports/mimxrt10xx/common-hal/busio')
| -rw-r--r-- | ports/mimxrt10xx/common-hal/busio/SPI.c | 2 | ||||
| -rw-r--r-- | ports/mimxrt10xx/common-hal/busio/UART.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c index ef34e6172..c51aef4da 100644 --- a/ports/mimxrt10xx/common-hal/busio/SPI.c +++ b/ports/mimxrt10xx/common-hal/busio/SPI.c @@ -87,7 +87,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, //if both MOSI and MISO exist, loop search normally if ((mosi != NULL) && (miso != NULL)) { for (uint j = 0; j < mosi_count; j++) { - if ((mcu_spi_mosi_list[i].pin != mosi) + if ((mcu_spi_mosi_list[i].pin != mosi) || (mcu_spi_sck_list[i].bank_idx != mcu_spi_mosi_list[j].bank_idx)){ continue; } diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index a517dc7b5..5ef347e59 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -109,7 +109,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, // If TX is on, keep looking, else stop if (tx != NULL) { for (uint32_t j = 0; j < tx_count; ++j) { - if (mcu_uart_tx_list[j].pin != tx || + if (mcu_uart_tx_list[j].pin != tx || mcu_uart_tx_list[j].bank_idx != mcu_uart_rx_list[i].bank_idx) { continue; } @@ -291,7 +291,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) { } else { reserved_uart[self->tx->bank_idx - 1] = false; } - + LPUART_Deinit(self->uart); gc_free(self->ringbuf); |
