summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucian Copeland <hierophect@gmail.com>2020-05-05 12:46:30 -0400
committerLucian Copeland <hierophect@gmail.com>2020-05-05 12:46:30 -0400
commita1330747e8160064237f79be9b679c1042ffc881 (patch)
treebb38899fa8cbdebbd56c83cbd9930df895f67178
parentbc581fbdfb10f9cf89f2e7572cd67e1dc10b8451 (diff)
text fixes, postpone warning disable
-rw-r--r--ports/mimxrt10xx/Makefile3
-rw-r--r--ports/mimxrt10xx/common-hal/busio/SPI.c29
2 files changed, 3 insertions, 29 deletions
diff --git a/ports/mimxrt10xx/Makefile b/ports/mimxrt10xx/Makefile
index cc2ec8f2b..2efb4d6cb 100644
--- a/ports/mimxrt10xx/Makefile
+++ b/ports/mimxrt10xx/Makefile
@@ -93,8 +93,9 @@ endif
CFLAGS += $(INC) -Wall -Wno-cast-align -std=gnu11 -nostdlib $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT)
+# TODO: add these when -Werror is applied
# Disable some warnings, as do most ports. NXP SDK causes undef, tinyusb causes cast-align
-CFLAGS += -Wno-undef -Wno-cast-align
+# CFLAGS += -Wno-undef -Wno-cast-align
CFLAGS += \
-mthumb \
diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c
index be5f1a6fc..cc19ba354 100644
--- a/ports/mimxrt10xx/common-hal/busio/SPI.c
+++ b/ports/mimxrt10xx/common-hal/busio/SPI.c
@@ -39,7 +39,7 @@
STATIC bool reserved_spi[MAX_SPI];
STATIC bool never_reset_spi[MAX_SPI];
-static void config_periph_pin(const mcu_periph_obj_t *periph) {
+STATIC void config_periph_pin(const mcu_periph_obj_t *periph) {
IOMUXC_SetPinMux(
periph->pin->mux_reg, periph->mux_mode,
periph->input_reg, periph->input_idx,
@@ -153,33 +153,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
}
}
- // for (uint32_t i = 0; i < sck_count; ++i) {
- // if (mcu_spi_sck_list[i].pin != clock)
- // continue;
-
- // for (uint32_t j = 0; j < miso_count; ++j) {
- // if (mcu_spi_miso_list[j].pin != miso)
- // continue;
-
- // if (mcu_spi_miso_list[j].bank_idx != mcu_spi_sck_list[i].bank_idx)
- // continue;
-
- // for (uint32_t k = 0; k < mosi_count; ++k) {
- // if (mcu_spi_mosi_list[k].pin != mosi)
- // continue;
-
- // if (mcu_spi_mosi_list[k].bank_idx != mcu_spi_miso_list[j].bank_idx)
- // continue;
-
- // self->clock = &mcu_spi_sck_list[i];
- // self->miso_pin = &mcu_spi_miso_list[j];
- // self->mosi_pin = &mcu_spi_mosi_list[k];
-
- // break;
- // }
- // }
- // }
-
if (self->clock != NULL && (self->mosi != NULL || self->miso != NULL)) {
self->spi = mcu_spi_banks[self->clock->bank_idx - 1];
} else {