From 2a2f94df15d9b41eedf6940ec89c4c59334efd52 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 6 Jan 2022 08:52:33 -0800 Subject: [PATCH] Update tinyusb for zero support --- lib/tinyusb | 2 +- ports/broadcom/common-hal/neopixel_write/__init__.c | 2 +- ports/broadcom/common-hal/sdioio/SDCard.c | 9 ++++++++- ports/broadcom/peripherals | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/tinyusb b/lib/tinyusb index ae73873b5c..3b09b82123 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit ae73873b5cba0eb11c89165f4559964940430d44 +Subproject commit 3b09b82123a50bef6b18cf90c2734ae7581da4a3 diff --git a/ports/broadcom/common-hal/neopixel_write/__init__.c b/ports/broadcom/common-hal/neopixel_write/__init__.c index 5a82797909..0cd76ebca9 100644 --- a/ports/broadcom/common-hal/neopixel_write/__init__.c +++ b/ports/broadcom/common-hal/neopixel_write/__init__.c @@ -49,7 +49,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, } BP_Function_Enum alt_function = GPIO_FUNCTION_OUTPUT; - uint8_t index; + uint8_t index = 0; uint8_t channel = 0; bool found = false; for (size_t i = 0; i < NUM_ALT_FUNC; i++) { diff --git a/ports/broadcom/common-hal/sdioio/SDCard.c b/ports/broadcom/common-hal/sdioio/SDCard.c index cb65bb1b63..85a84ac213 100644 --- a/ports/broadcom/common-hal/sdioio/SDCard.c +++ b/ports/broadcom/common-hal/sdioio/SDCard.c @@ -37,6 +37,7 @@ #include "supervisor/port.h" #include "supervisor/shared/translate.h" +#include "peripherals/broadcom/cpu.h" #include "peripherals/broadcom/defines.h" #include "peripherals/broadcom/gpio.h" @@ -256,6 +257,8 @@ void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self, GPIO->EXTRA_MUX_b.SDIO = GPIO_EXTRA_MUX_SDIO_ARASAN; } + COMPLETE_MEMORY_READS; + self->host_info = (sdmmc_host_t) { .flags = SDMMC_HOST_FLAG_1BIT | SDMMC_HOST_FLAG_4BIT | SDMMC_HOST_FLAG_DEINIT_ARG, .slot = 0, @@ -301,6 +304,7 @@ void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self, self->init = err == SDMMC_OK; self->capacity = self->card_info.csd.capacity; + COMPLETE_MEMORY_READS; } uint32_t common_hal_sdioio_sdcard_get_count(sdioio_sdcard_obj_t *self) { @@ -328,9 +332,10 @@ int common_hal_sdioio_sdcard_writeblocks(sdioio_sdcard_obj_t *self, uint32_t sta check_whole_block(bufinfo); self->state_programming = true; + COMPLETE_MEMORY_READS; sdmmc_err_t error = sdmmc_write_sectors(&self->card_info, bufinfo->buf, start_block, bufinfo->len / 512); - + COMPLETE_MEMORY_READS; if (error != SDMMC_OK) { mp_printf(&mp_plat_print, "write sectors result %d\n", error); @@ -345,8 +350,10 @@ int common_hal_sdioio_sdcard_readblocks(sdioio_sdcard_obj_t *self, uint32_t star return -EIO; } check_whole_block(bufinfo); + COMPLETE_MEMORY_READS; sdmmc_err_t error = sdmmc_read_sectors(&self->card_info, bufinfo->buf, start_block, bufinfo->len / 512); + COMPLETE_MEMORY_READS; if (error != SDMMC_OK) { mp_printf(&mp_plat_print, "read sectors result %d when reading block %d for %d\n", error, start_block, bufinfo->len / 512); diff --git a/ports/broadcom/peripherals b/ports/broadcom/peripherals index 24578e029b..0837008608 160000 --- a/ports/broadcom/peripherals +++ b/ports/broadcom/peripherals @@ -1 +1 @@ -Subproject commit 24578e029babb1a01ef8641ca6019f1a86992ff4 +Subproject commit 08370086080759ed54ac1136d62d2ad24c6fa267