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/+/9045
-- gerrit commit 279dfefb9aca33899dedfdb5a0cafc604a2ddba2 Author: Antonio Borneo <[email protected]> Date: Sat Jul 26 10:39:28 2025 +0200 contrib: loader: prepare for aligning switch and case statements To prepare for aligning switch and case statements, fix in advance some checkpatch error due to existing code: - uniform braces around if/else statements; - don't end line with an open parenthesis. While there: - move the default case as last in the list. Change-Id: Idb9603e9a59c7f2e1a7346d5bdd3bde384d2f75f Signed-off-by: Antonio Borneo <[email protected]> diff --git a/contrib/loaders/flash/cc26xx/main.c b/contrib/loaders/flash/cc26xx/main.c index 6b626a3b84..4fa34dc3fa 100644 --- a/contrib/loaders/flash/cc26xx/main.c +++ b/contrib/loaders/flash/cc26xx/main.c @@ -103,20 +103,17 @@ int main(void) break; case CMD_PROGRAM: status = - flashloader_program( - (uint8_t *)g_cfg[g_curr_buf].buf_addr, + 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, + 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, + 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: diff --git a/contrib/loaders/flash/msp432/driverlib.c b/contrib/loaders/flash/msp432/driverlib.c index 6f483b83da..f04d80a278 100644 --- a/contrib/loaders/flash/msp432/driverlib.c +++ b/contrib/loaders/flash/msp432/driverlib.c @@ -117,12 +117,6 @@ uint8_t pcm_get_power_mode(void) current_power_state = pcm_get_power_state(); switch (current_power_state) { - 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: @@ -133,6 +127,12 @@ uint8_t pcm_get_power_mode(void) 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,14 +141,6 @@ 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_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: @@ -158,6 +150,14 @@ uint8_t pcm_get_core_voltage_level(void) 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; } } @@ -196,7 +196,7 @@ static bool __pcm_set_power_mode_advanced(uint_fast8_t power_mode, PCM->CTL0 = (PCM_KEY | PCM_AM_LDO_VCORE1 | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); break; - case PCM_AM_LDO_VCORE1: { + 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 @@ -205,11 +205,11 @@ static bool __pcm_set_power_mode_advanced(uint_fast8_t power_mode, PCM->CTL0 = (PCM_KEY | PCM_AM_LF_VCORE1 | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); - } else + } else { return false; + } break; - } - case PCM_AM_LDO_VCORE0: { + 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 @@ -218,10 +218,10 @@ static bool __pcm_set_power_mode_advanced(uint_fast8_t power_mode, PCM->CTL0 = (PCM_KEY | PCM_AM_LF_VCORE0 | (reg_value & ~(PCM_CTL0_KEY_MASK | PCM_CTL0_AMR_MASK))); - } else + } else { return false; + } break; - } default: break; } @@ -231,8 +231,9 @@ static bool __pcm_set_power_mode_advanced(uint_fast8_t power_mode, if (bool_timeout && !(--time_out)) return false; } - } else + } else { return true; + } current_power_mode = pcm_get_power_mode(); current_power_state = pcm_get_power_state(); --
