This is an automated email from Gerrit. "Antonio Borneo <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9046
-- gerrit commit 8f6b680978f4b201bedd6d2a069e6fdff8eca672 Author: Antonio Borneo <[email protected]> Date: Sat Jul 26 10:36:26 2025 +0200 contrib: loaders: align switch and case statements The coding style requires the 'case' to be at the same indentation level of its 'switch' statement. Align the code accordingly. While there: - add space around operators; - remove space after cast. Skip the file contrib/firmware/angie/c/src/usb.c as it's going to be modified by a patch already pending in gerrit. No changes are reported by git log -p -w --ignore-blank-lines --patience Change-Id: I0bebd6d0cc95ddecd5794cc4c12c8412b38691e9 Signed-off-by: Antonio Borneo <[email protected]> diff --git a/contrib/loaders/flash/at91sam7x/main.c b/contrib/loaders/flash/at91sam7x/main.c index a29c6e605b..e988e1848b 100644 --- a/contrib/loaders/flash/at91sam7x/main.c +++ b/contrib/loaders/flash/at91sam7x/main.c @@ -70,23 +70,23 @@ int main (void) for (;;) { cmd = dcc_rd(); switch (cmd&OCL_CMD_MASK) { - case OCL_PROBE: - dcc_wr(OCL_CMD_DONE | flash_init()); - dcc_wr(0x100000); /* base */ - dcc_wr(flash_page_count*flash_page_size); /* size */ - dcc_wr(1); /* num_sectors */ - dcc_wr(4096 | ((unsigned long) flash_page_size << 16)); /* buflen and bufalign */ - break; - case OCL_ERASE_ALL: - dcc_wr(OCL_CMD_DONE | flash_erase_all()); - break; - case OCL_FLASH_BLOCK: - cmd_flash(cmd); - break; - default: - /* unknown command */ - dcc_wr(OCL_CMD_ERR); - break; + case OCL_PROBE: + dcc_wr(OCL_CMD_DONE | flash_init()); + dcc_wr(0x100000); /* base */ + dcc_wr(flash_page_count * flash_page_size); /* size */ + dcc_wr(1); /* num_sectors */ + dcc_wr(4096 | ((unsigned long)flash_page_size << 16)); /* buflen and bufalign */ + break; + case OCL_ERASE_ALL: + dcc_wr(OCL_CMD_DONE | flash_erase_all()); + break; + case OCL_FLASH_BLOCK: + cmd_flash(cmd); + break; + default: + /* unknown command */ + dcc_wr(OCL_CMD_ERR); + break; } } diff --git a/contrib/loaders/flash/at91sam7x/samflash.c b/contrib/loaders/flash/at91sam7x/samflash.c index fcb76fbf98..8be0bdbb84 100644 --- a/contrib/loaders/flash/at91sam7x/samflash.c +++ b/contrib/loaders/flash/at91sam7x/samflash.c @@ -22,38 +22,38 @@ int flash_init(void) nvpsiz = (inr(DBGU_CIDR) >> 8)&0xf; switch (nvpsiz) { - case 3: - /* AT91SAM7x32 */ - flash_page_count = 256; - flash_page_size = 128; - flash_lock_pages = 256/8; - break; - case 5: - /* AT91SAM7x64 */ - flash_page_count = 512; - flash_page_size = 128; - flash_lock_pages = 512/16; - break; - case 7: - /* AT91SAM7x128*/ - flash_page_count = 512; - flash_page_size = 256; - flash_lock_pages = 512/8; - break; - case 9: - /* AT91SAM7x256 */ - flash_page_count = 1024; - flash_page_size = 256; - flash_lock_pages = 1024/16; - break; - case 10: - /* AT91SAM7x512 */ - flash_page_count = 2048; - flash_page_size = 256; - flash_lock_pages = 2048/32; - break; - default: - return FLASH_STAT_INITE; + case 3: + /* AT91SAM7x32 */ + flash_page_count = 256; + flash_page_size = 128; + flash_lock_pages = 256 / 8; + break; + case 5: + /* AT91SAM7x64 */ + flash_page_count = 512; + flash_page_size = 128; + flash_lock_pages = 512 / 16; + break; + case 7: + /* AT91SAM7x128*/ + flash_page_count = 512; + flash_page_size = 256; + flash_lock_pages = 512 / 8; + break; + case 9: + /* AT91SAM7x256 */ + flash_page_count = 1024; + flash_page_size = 256; + flash_lock_pages = 1024 / 16; + break; + case 10: + /* AT91SAM7x512 */ + flash_page_count = 2048; + flash_page_size = 256; + flash_lock_pages = 2048 / 32; + break; + default: + return FLASH_STAT_INITE; } return FLASH_STAT_OK; } diff --git a/contrib/loaders/flash/cc26xx/main.c b/contrib/loaders/flash/cc26xx/main.c index 4fa34dc3fa..bd5eaf3354 100644 --- a/contrib/loaders/flash/cc26xx/main.c +++ b/contrib/loaders/flash/cc26xx/main.c @@ -98,32 +98,32 @@ int main(void) /* Perform requested task */ switch (g_cfg[g_curr_buf].cmd) { - case CMD_ERASE_ALL: - status = flashloader_erase_all(); - break; - case CMD_PROGRAM: - status = - flashloader_program((uint8_t *)g_cfg[g_curr_buf].buf_addr, - g_cfg[g_curr_buf].dest, g_cfg[g_curr_buf].len); - break; - case CMD_ERASE_AND_PROGRAM: - status = - flashloader_erase_and_program((uint8_t *)g_cfg[g_curr_buf].buf_addr, - g_cfg[g_curr_buf].dest, g_cfg[g_curr_buf].len); - break; - case CMD_ERASE_AND_PROGRAM_WITH_RETAIN: - status = - flashloader_program_with_retain((uint8_t *)g_cfg[g_curr_buf].buf_addr, - g_cfg[g_curr_buf].dest, g_cfg[g_curr_buf].len); - break; - case CMD_ERASE_SECTORS: - status = - flashloader_erase_sectors(g_cfg[g_curr_buf].dest, - g_cfg[g_curr_buf].len); - break; - default: - status = STATUS_FAILED_UNKNOWN_COMMAND; - break; + case CMD_ERASE_ALL: + status = flashloader_erase_all(); + break; + case CMD_PROGRAM: + status = + flashloader_program((uint8_t *)g_cfg[g_curr_buf].buf_addr, + g_cfg[g_curr_buf].dest, g_cfg[g_curr_buf].len); + break; + case CMD_ERASE_AND_PROGRAM: + status = + flashloader_erase_and_program((uint8_t *)g_cfg[g_curr_buf].buf_addr, + g_cfg[g_curr_buf].dest, g_cfg[g_curr_buf].len); + break; + case CMD_ERASE_AND_PROGRAM_WITH_RETAIN: + status = + flashloader_program_with_retain((uint8_t *)g_cfg[g_curr_buf].buf_addr, + g_cfg[g_curr_buf].dest, g_cfg[g_curr_buf].len); + break; + case CMD_ERASE_SECTORS: + status = + flashloader_erase_sectors(g_cfg[g_curr_buf].dest, + g_cfg[g_curr_buf].len); + break; + default: + status = STATUS_FAILED_UNKNOWN_COMMAND; + break; } restore_cache_state(); diff --git a/contrib/loaders/flash/msp432/driverlib.c b/contrib/loaders/flash/msp432/driverlib.c index f04d80a278..b897755d16 100644 --- a/contrib/loaders/flash/msp432/driverlib.c +++ b/contrib/loaders/flash/msp432/driverlib.c @@ -67,20 +67,20 @@ static bool __pcm_set_core_voltage_level_advanced(uint_fast8_t voltage_level, reg_value = PCM->CTL0; switch (pcm_get_power_state()) { - case PCM_AM_LF_VCORE1: - case PCM_AM_DCDC_VCORE1: - case PCM_AM_LDO_VCORE0: - PCM->CTL0 = (PCM_KEY | (PCM_AM_LDO_VCORE1) - | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); - break; - case PCM_AM_LF_VCORE0: - case PCM_AM_DCDC_VCORE0: - case PCM_AM_LDO_VCORE1: - PCM->CTL0 = (PCM_KEY | (PCM_AM_LDO_VCORE0) - | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); - break; - default: - break; + case PCM_AM_LF_VCORE1: + case PCM_AM_DCDC_VCORE1: + case PCM_AM_LDO_VCORE0: + PCM->CTL0 = (PCM_KEY | (PCM_AM_LDO_VCORE1) + | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); + break; + case PCM_AM_LF_VCORE0: + case PCM_AM_DCDC_VCORE0: + case PCM_AM_LDO_VCORE1: + PCM->CTL0 = (PCM_KEY | (PCM_AM_LDO_VCORE0) + | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); + break; + default: + break; } if (blocking) { @@ -117,22 +117,22 @@ uint8_t pcm_get_power_mode(void) current_power_state = pcm_get_power_state(); switch (current_power_state) { - case PCM_AM_DCDC_VCORE0: - case PCM_AM_DCDC_VCORE1: - case PCM_LPM0_DCDC_VCORE0: - case PCM_LPM0_DCDC_VCORE1: - return PCM_DCDC_MODE; - case PCM_LPM0_LF_VCORE0: - case PCM_LPM0_LF_VCORE1: - case PCM_AM_LF_VCORE1: - case PCM_AM_LF_VCORE0: - return PCM_LF_MODE; - case PCM_AM_LDO_VCORE0: - case PCM_AM_LDO_VCORE1: - case PCM_LPM0_LDO_VCORE0: - case PCM_LPM0_LDO_VCORE1: - default: - return PCM_LDO_MODE; + case PCM_AM_DCDC_VCORE0: + case PCM_AM_DCDC_VCORE1: + case PCM_LPM0_DCDC_VCORE0: + case PCM_LPM0_DCDC_VCORE1: + return PCM_DCDC_MODE; + case PCM_LPM0_LF_VCORE0: + case PCM_LPM0_LF_VCORE1: + case PCM_AM_LF_VCORE1: + case PCM_AM_LF_VCORE0: + return PCM_LF_MODE; + case PCM_AM_LDO_VCORE0: + case PCM_AM_LDO_VCORE1: + case PCM_LPM0_LDO_VCORE0: + case PCM_LPM0_LDO_VCORE1: + default: + return PCM_LDO_MODE; } } @@ -141,23 +141,23 @@ uint8_t pcm_get_core_voltage_level(void) uint8_t current_power_state = pcm_get_power_state(); switch (current_power_state) { - case PCM_AM_LDO_VCORE1: - case PCM_AM_DCDC_VCORE1: - case PCM_AM_LF_VCORE1: - case PCM_LPM0_LDO_VCORE1: - case PCM_LPM0_DCDC_VCORE1: - case PCM_LPM0_LF_VCORE1: - return PCM_VCORE1; - case PCM_LPM3: - return PCM_VCORELPM3; - case PCM_AM_LDO_VCORE0: - case PCM_AM_DCDC_VCORE0: - case PCM_AM_LF_VCORE0: - case PCM_LPM0_LDO_VCORE0: - case PCM_LPM0_DCDC_VCORE0: - case PCM_LPM0_LF_VCORE0: - default: - return PCM_VCORE0; + case PCM_AM_LDO_VCORE1: + case PCM_AM_DCDC_VCORE1: + case PCM_AM_LF_VCORE1: + case PCM_LPM0_LDO_VCORE1: + case PCM_LPM0_DCDC_VCORE1: + case PCM_LPM0_LF_VCORE1: + return PCM_VCORE1; + case PCM_LPM3: + return PCM_VCORELPM3; + case PCM_AM_LDO_VCORE0: + case PCM_AM_DCDC_VCORE0: + case PCM_AM_LF_VCORE0: + case PCM_LPM0_LDO_VCORE0: + case PCM_LPM0_DCDC_VCORE0: + case PCM_LPM0_LF_VCORE0: + default: + return PCM_VCORE0; } } @@ -186,44 +186,44 @@ static bool __pcm_set_power_mode_advanced(uint_fast8_t power_mode, reg_value = PCM->CTL0; switch (current_power_state) { - case PCM_AM_DCDC_VCORE0: - case PCM_AM_LF_VCORE0: - PCM->CTL0 = (PCM_KEY | PCM_AM_LDO_VCORE0 - | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); - break; - case PCM_AM_LF_VCORE1: - case PCM_AM_DCDC_VCORE1: - PCM->CTL0 = (PCM_KEY | PCM_AM_LDO_VCORE1 - | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); - break; - case PCM_AM_LDO_VCORE1: - if (power_mode == PCM_DCDC_MODE) { - PCM->CTL0 = (PCM_KEY | PCM_AM_DCDC_VCORE1 - | (reg_value & ~(PCM_CTL0_KEY_MASK - | PCM_CTL0_AMR_MASK))); - } else if (power_mode == PCM_LF_MODE) { - PCM->CTL0 = (PCM_KEY | PCM_AM_LF_VCORE1 - | (reg_value & ~(PCM_CTL0_KEY_MASK - | PCM_CTL0_AMR_MASK))); - } else { - return false; - } - break; - case PCM_AM_LDO_VCORE0: - if (power_mode == PCM_DCDC_MODE) { - PCM->CTL0 = (PCM_KEY | PCM_AM_DCDC_VCORE0 - | (reg_value & ~(PCM_CTL0_KEY_MASK - | PCM_CTL0_AMR_MASK))); - } else if (power_mode == PCM_LF_MODE) { - PCM->CTL0 = (PCM_KEY | PCM_AM_LF_VCORE0 - | (reg_value & ~(PCM_CTL0_KEY_MASK - | PCM_CTL0_AMR_MASK))); - } else { - return false; - } - break; - default: - break; + case PCM_AM_DCDC_VCORE0: + case PCM_AM_LF_VCORE0: + PCM->CTL0 = (PCM_KEY | PCM_AM_LDO_VCORE0 + | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); + break; + case PCM_AM_LF_VCORE1: + case PCM_AM_DCDC_VCORE1: + PCM->CTL0 = (PCM_KEY | PCM_AM_LDO_VCORE1 + | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); + break; + case PCM_AM_LDO_VCORE1: + if (power_mode == PCM_DCDC_MODE) { + PCM->CTL0 = (PCM_KEY | PCM_AM_DCDC_VCORE1 + | (reg_value & ~(PCM_CTL0_KEY_MASK + | PCM_CTL0_AMR_MASK))); + } else if (power_mode == PCM_LF_MODE) { + PCM->CTL0 = (PCM_KEY | PCM_AM_LF_VCORE1 + | (reg_value & ~(PCM_CTL0_KEY_MASK + | PCM_CTL0_AMR_MASK))); + } else { + return false; + } + break; + case PCM_AM_LDO_VCORE0: + if (power_mode == PCM_DCDC_MODE) { + PCM->CTL0 = (PCM_KEY | PCM_AM_DCDC_VCORE0 + | (reg_value & ~(PCM_CTL0_KEY_MASK + | PCM_CTL0_AMR_MASK))); + } else if (power_mode == PCM_LF_MODE) { + PCM->CTL0 = (PCM_KEY | PCM_AM_LF_VCORE0 + | (reg_value & ~(PCM_CTL0_KEY_MASK + | PCM_CTL0_AMR_MASK))); + } else { + return false; + } + break; + default: + break; } if (blocking) { @@ -257,76 +257,76 @@ static bool __pcm_set_power_state_advanced(uint_fast8_t power_state, return true; switch (power_state) { - case PCM_AM_LDO_VCORE0: - return __pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, - blocking) && __pcm_set_power_mode_advanced(PCM_LDO_MODE, - timeout, blocking); - case PCM_AM_LDO_VCORE1: - return __pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, - blocking) && __pcm_set_power_mode_advanced(PCM_LDO_MODE, - timeout, blocking); - case PCM_AM_DCDC_VCORE0: - return __pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, - blocking) && __pcm_set_power_mode_advanced(PCM_DCDC_MODE, - timeout, blocking); - case PCM_AM_DCDC_VCORE1: - return __pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, - blocking) && __pcm_set_power_mode_advanced(PCM_DCDC_MODE, - timeout, blocking); - case PCM_AM_LF_VCORE0: - return __pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, - blocking) && __pcm_set_power_mode_advanced(PCM_LF_MODE, - timeout, blocking); - case PCM_AM_LF_VCORE1: - return __pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, - blocking) && __pcm_set_power_mode_advanced(PCM_LF_MODE, - timeout, blocking); - case PCM_LPM0_LDO_VCORE0: - if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, - blocking) || !__pcm_set_power_mode_advanced(PCM_LDO_MODE, - timeout, blocking)) - break; - return pcm_goto_lpm0(); - case PCM_LPM0_LDO_VCORE1: - if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, - blocking) || !__pcm_set_power_mode_advanced(PCM_LDO_MODE, - timeout, blocking)) - break; - return pcm_goto_lpm0(); - case PCM_LPM0_DCDC_VCORE0: - if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, - blocking) || !__pcm_set_power_mode_advanced(PCM_DCDC_MODE, - timeout, blocking)) - break; - return pcm_goto_lpm0(); - case PCM_LPM0_DCDC_VCORE1: - if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, - blocking) || !__pcm_set_power_mode_advanced(PCM_DCDC_MODE, - timeout, blocking)) - break; - return pcm_goto_lpm0(); - case PCM_LPM0_LF_VCORE0: - if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, - blocking) || !__pcm_set_power_mode_advanced(PCM_LF_MODE, - timeout, blocking)) - break; - return pcm_goto_lpm0(); - case PCM_LPM0_LF_VCORE1: - if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, - blocking) || !__pcm_set_power_mode_advanced(PCM_LF_MODE, - timeout, blocking)) - break; - return pcm_goto_lpm0(); - case PCM_LPM3: - return pcm_goto_lpm3(); - case PCM_LPM4: - return pcm_goto_lpm4(); - case PCM_LPM45: - return pcm_shutdown_device(PCM_LPM45); - case PCM_LPM35_VCORE0: - return pcm_shutdown_device(PCM_LPM35_VCORE0); - default: - return false; + case PCM_AM_LDO_VCORE0: + return __pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, + blocking) && __pcm_set_power_mode_advanced(PCM_LDO_MODE, + timeout, blocking); + case PCM_AM_LDO_VCORE1: + return __pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, + blocking) && __pcm_set_power_mode_advanced(PCM_LDO_MODE, + timeout, blocking); + case PCM_AM_DCDC_VCORE0: + return __pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, + blocking) && __pcm_set_power_mode_advanced(PCM_DCDC_MODE, + timeout, blocking); + case PCM_AM_DCDC_VCORE1: + return __pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, + blocking) && __pcm_set_power_mode_advanced(PCM_DCDC_MODE, + timeout, blocking); + case PCM_AM_LF_VCORE0: + return __pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, + blocking) && __pcm_set_power_mode_advanced(PCM_LF_MODE, + timeout, blocking); + case PCM_AM_LF_VCORE1: + return __pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, + blocking) && __pcm_set_power_mode_advanced(PCM_LF_MODE, + timeout, blocking); + case PCM_LPM0_LDO_VCORE0: + if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, + blocking) || !__pcm_set_power_mode_advanced(PCM_LDO_MODE, + timeout, blocking)) + break; + return pcm_goto_lpm0(); + case PCM_LPM0_LDO_VCORE1: + if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, + blocking) || !__pcm_set_power_mode_advanced(PCM_LDO_MODE, + timeout, blocking)) + break; + return pcm_goto_lpm0(); + case PCM_LPM0_DCDC_VCORE0: + if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, + blocking) || !__pcm_set_power_mode_advanced(PCM_DCDC_MODE, + timeout, blocking)) + break; + return pcm_goto_lpm0(); + case PCM_LPM0_DCDC_VCORE1: + if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, + blocking) || !__pcm_set_power_mode_advanced(PCM_DCDC_MODE, + timeout, blocking)) + break; + return pcm_goto_lpm0(); + case PCM_LPM0_LF_VCORE0: + if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE0, timeout, + blocking) || !__pcm_set_power_mode_advanced(PCM_LF_MODE, + timeout, blocking)) + break; + return pcm_goto_lpm0(); + case PCM_LPM0_LF_VCORE1: + if (!__pcm_set_core_voltage_level_advanced(PCM_VCORE1, timeout, + blocking) || !__pcm_set_power_mode_advanced(PCM_LF_MODE, + timeout, blocking)) + break; + return pcm_goto_lpm0(); + case PCM_LPM3: + return pcm_goto_lpm3(); + case PCM_LPM4: + return pcm_goto_lpm4(); + case PCM_LPM45: + return pcm_shutdown_device(PCM_LPM45); + case PCM_LPM35_VCORE0: + return pcm_shutdown_device(PCM_LPM35_VCORE0); + default: + return false; } return false; diff --git a/contrib/loaders/flash/msp432/main_msp432e4x.c b/contrib/loaders/flash/msp432/main_msp432e4x.c index 7974f48c77..7c9cf468df 100644 --- a/contrib/loaders/flash/msp432/main_msp432e4x.c +++ b/contrib/loaders/flash/msp432/main_msp432e4x.c @@ -30,37 +30,37 @@ int main(void) while (1) { switch (FLASH_LOADER->FLASH_FUNCTION) { - case FLASH_INIT: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_init(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_MASS_ERASE: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_mass_erase(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_SECTOR_ERASE: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_sector_erase(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_PROGRAM: - case FLASH_CONTINUOUS_PROGRAM: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_continous_write(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_EXIT: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_exit(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_NO_COMMAND: - break; - default: - FLASH_LOADER->RETURN_CODE = FLASH_WRONG_COMMAND; - break; + case FLASH_INIT: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_init(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_MASS_ERASE: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_mass_erase(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_SECTOR_ERASE: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_sector_erase(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_PROGRAM: + case FLASH_CONTINUOUS_PROGRAM: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_continous_write(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_EXIT: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_exit(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_NO_COMMAND: + break; + default: + FLASH_LOADER->RETURN_CODE = FLASH_WRONG_COMMAND; + break; } } } diff --git a/contrib/loaders/flash/msp432/main_msp432p401x.c b/contrib/loaders/flash/msp432/main_msp432p401x.c index 47fb7fa476..024d047224 100644 --- a/contrib/loaders/flash/msp432/main_msp432p401x.c +++ b/contrib/loaders/flash/msp432/main_msp432p401x.c @@ -49,41 +49,41 @@ int main(void) while (1) { switch (FLASH_LOADER->FLASH_FUNCTION) { - case FLASH_INIT: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_init(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_MASS_ERASE: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_mass_erase(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_SECTOR_ERASE: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_sector_erase(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_PROGRAM: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_write(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_CONTINUOUS_PROGRAM: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_continous_write(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_EXIT: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_exit(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_NO_COMMAND: - break; - default: - FLASH_LOADER->RETURN_CODE = FLASH_WRONG_COMMAND; - break; + case FLASH_INIT: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_init(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_MASS_ERASE: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_mass_erase(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_SECTOR_ERASE: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_sector_erase(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_PROGRAM: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_write(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_CONTINUOUS_PROGRAM: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_continous_write(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_EXIT: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_exit(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_NO_COMMAND: + break; + default: + FLASH_LOADER->RETURN_CODE = FLASH_WRONG_COMMAND; + break; } } } diff --git a/contrib/loaders/flash/msp432/main_msp432p411x.c b/contrib/loaders/flash/msp432/main_msp432p411x.c index efc05a3b78..391057f2e5 100644 --- a/contrib/loaders/flash/msp432/main_msp432p411x.c +++ b/contrib/loaders/flash/msp432/main_msp432p411x.c @@ -52,41 +52,41 @@ int main(void) while (1) { switch (FLASH_LOADER->FLASH_FUNCTION) { - case FLASH_INIT: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_init(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_MASS_ERASE: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_mass_erase(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_SECTOR_ERASE: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_sector_erase(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_PROGRAM: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_write(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_CONTINUOUS_PROGRAM: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_continous_write(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_EXIT: - FLASH_LOADER->RETURN_CODE = FLASH_BUSY; - msp432_flash_exit(); - FLASH_LOADER->FLASH_FUNCTION = 0; - break; - case FLASH_NO_COMMAND: - break; - default: - FLASH_LOADER->RETURN_CODE = FLASH_WRONG_COMMAND; - break; + case FLASH_INIT: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_init(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_MASS_ERASE: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_mass_erase(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_SECTOR_ERASE: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_sector_erase(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_PROGRAM: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_write(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_CONTINUOUS_PROGRAM: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_continous_write(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_EXIT: + FLASH_LOADER->RETURN_CODE = FLASH_BUSY; + msp432_flash_exit(); + FLASH_LOADER->FLASH_FUNCTION = 0; + break; + case FLASH_NO_COMMAND: + break; + default: + FLASH_LOADER->RETURN_CODE = FLASH_WRONG_COMMAND; + break; } } } --
