Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-04 19:20:22 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

all: Reformat C and Python source code with tools/codeformat.py.

Browse Source 
This is run with uncrustify 0.70.1, and black 19.10b0.
This commit is contained in:
Damien George
2020-02-27 15:36:53 +11:00
parent 3f39d18c2b
commit 69661f3343
539 changed files with 10496 additions and 8254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ports/stm32/sdcard.c
View File

@@ -244,14 +244,14 @@ bool sdcard_is_present(void) {
STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
// SD device interface configuration
sdmmc_handle.sd.Instance = SDIO;
sdmmc_handle.sd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
sdmmc_handle.sd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
#ifndef STM32H7
sdmmc_handle.sd.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
sdmmc_handle.sd.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
#endif
sdmmc_handle.sd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
sdmmc_handle.sd.Init.BusWide = SDIO_BUS_WIDE_1B;
sdmmc_handle.sd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
sdmmc_handle.sd.Init.BusWide = SDIO_BUS_WIDE_1B;
sdmmc_handle.sd.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
sdmmc_handle.sd.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
sdmmc_handle.sd.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
// init the SD interface, with retry if it's not ready yet
HAL_StatusTypeDef status;
@@ -279,14 +279,14 @@ STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
STATIC HAL_StatusTypeDef sdmmc_init_mmc(void) {
// MMC device interface configuration
sdmmc_handle.mmc.Instance = SDIO;
sdmmc_handle.mmc.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
sdmmc_handle.mmc.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
#ifndef STM32H7
sdmmc_handle.mmc.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
sdmmc_handle.mmc.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
#endif
sdmmc_handle.mmc.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
sdmmc_handle.mmc.Init.BusWide = SDIO_BUS_WIDE_1B;
sdmmc_handle.mmc.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
sdmmc_handle.mmc.Init.BusWide = SDIO_BUS_WIDE_1B;
sdmmc_handle.mmc.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
sdmmc_handle.mmc.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
sdmmc_handle.mmc.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
// Init the SDIO interface
HAL_StatusTypeDef status = HAL_MMC_Init(&sdmmc_handle.mmc);
@@ -503,8 +503,8 @@ mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blo
// bytes at the aligned location should be able to be changed for the
// duration of this function call.
orig_dest = dest;
dest = (uint8_t*)((uint32_t)dest & ~3);
saved_word = *(uint32_t*)dest;
dest = (uint8_t *)((uint32_t)dest & ~3);
saved_word = *(uint32_t *)dest;
}
if (query_irq() == IRQ_STATE_ENABLED) {
@@ -626,11 +626,11 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
sdcard_reset_periph();
#if MICROPY_HW_ENABLE_MMCARD
if (pyb_sdmmc_flags & PYB_SDMMC_FLAG_MMC) {
err = HAL_MMC_WriteBlocks_DMA(&sdmmc_handle.mmc, (uint8_t*)src, block_num, num_blocks);
err = HAL_MMC_WriteBlocks_DMA(&sdmmc_handle.mmc, (uint8_t *)src, block_num, num_blocks);
} else
#endif
{
err = HAL_SD_WriteBlocks_DMA(&sdmmc_handle.sd, (uint8_t*)src, block_num, num_blocks);
err = HAL_SD_WriteBlocks_DMA(&sdmmc_handle.sd, (uint8_t *)src, block_num, num_blocks);
}
if (err == HAL_OK) {
err = sdcard_wait_finished(60000);
@@ -652,11 +652,11 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
} else {
#if MICROPY_HW_ENABLE_MMCARD
if (pyb_sdmmc_flags & PYB_SDMMC_FLAG_MMC) {
err = HAL_MMC_WriteBlocks(&sdmmc_handle.mmc, (uint8_t*)src, block_num, num_blocks, 60000);
err = HAL_MMC_WriteBlocks(&sdmmc_handle.mmc, (uint8_t *)src, block_num, num_blocks, 60000);
} else
#endif
{
err = HAL_SD_WriteBlocks(&sdmmc_handle.sd, (uint8_t*)src, block_num, num_blocks, 60000);
err = HAL_SD_WriteBlocks(&sdmmc_handle.sd, (uint8_t *)src, block_num, num_blocks, 60000);
}
if (err == HAL_OK) {
err = sdcard_wait_finished(60000);
@@ -857,7 +857,7 @@ const mp_obj_type_t pyb_sdcard_type = {
{ &mp_type_type },
.name = MP_QSTR_SDCard,
.make_new = pyb_sdcard_make_new,
.locals_dict = (mp_obj_dict_t*)&pyb_sdcard_locals_dict,
.locals_dict = (mp_obj_dict_t *)&pyb_sdcard_locals_dict,
};
#endif
@@ -866,7 +866,7 @@ const mp_obj_type_t pyb_mmcard_type = {
{ &mp_type_type },
.name = MP_QSTR_MMCard,
.make_new = pyb_mmcard_make_new,
.locals_dict = (mp_obj_dict_t*)&pyb_sdcard_locals_dict,
.locals_dict = (mp_obj_dict_t *)&pyb_sdcard_locals_dict,
};
#endif