interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flash/nor/xcf: Do not use 'Yoda conditions' 

Change-Id: I17308f5237338ce468e5b86289a0634429deaaa9
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6201
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink 2021-05-01 16:22:51 +02:00 committed by Tomas Vanek
parent e05cbb4e4f
commit aa952a1b77
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/flash/nor/xcf.c
View File

@ -169,7 +169,7 @@ static int isc_enter(struct flash_bank *bank)
jtag_execute_queue(); jtag_execute_queue();
status = read_status(bank); status = read_status(bank);
if (false == status.isc_mode) { if (!status.isc_mode) {
LOG_ERROR("*** XCF: FAILED to enter ISC mode"); LOG_ERROR("*** XCF: FAILED to enter ISC mode");
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
} }
@ -183,7 +183,7 @@ static int isc_leave(struct flash_bank *bank)
struct xcf_status status = read_status(bank); struct xcf_status status = read_status(bank);
if (false == status.isc_mode) if (!status.isc_mode)
return ERROR_OK; return ERROR_OK;
else { else {
struct scan_field scan; struct scan_field scan;
@ -199,7 +199,7 @@ static int isc_leave(struct flash_bank *bank)
alive_sleep(1); /* device needs 50 uS to leave ISC mode */ alive_sleep(1); /* device needs 50 uS to leave ISC mode */
status = read_status(bank); status = read_status(bank);
if (true == status.isc_mode) { if (status.isc_mode) {
LOG_ERROR("*** XCF: FAILED to leave ISC mode"); LOG_ERROR("*** XCF: FAILED to leave ISC mode");
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
} }
@ -280,7 +280,7 @@ static int isc_set_register(struct flash_bank *bank, const uint8_t *cmd,
scan.in_value = NULL; scan.in_value = NULL;
jtag_add_dr_scan(bank->target->tap, 1, &scan, TAP_IDLE); jtag_add_dr_scan(bank->target->tap, 1, &scan, TAP_IDLE);
if (0 == timeout_ms) if (timeout_ms == 0)
return jtag_execute_queue(); return jtag_execute_queue();
else else
return isc_wait_erase_program(bank, timeout_ms); return isc_wait_erase_program(bank, timeout_ms);
@ -311,7 +311,7 @@ static int isc_program_register(struct flash_bank *bank, const uint8_t *cmd,
scan.in_value = NULL; scan.in_value = NULL;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE); jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
if (0 == timeout_ms) if (timeout_ms == 0)
return jtag_execute_queue(); return jtag_execute_queue();
else else
return isc_wait_erase_program(bank, timeout_ms); return isc_wait_erase_program(bank, timeout_ms);
@ -409,7 +409,7 @@ static bool need_bit_reverse(const uint8_t *buffer)
reference[18] = 0xAA; reference[18] = 0xAA;
reference[19] = 0x66; reference[19] = 0x66;
if (0 == memcmp(reference, buffer, L)) if (memcmp(reference, buffer, L) == 0)
return false; return false;
else else
return true; return true;
@ -444,7 +444,7 @@ static int read_write_data(struct flash_bank *bank, const uint8_t *w_buffer,
goto EXIT; goto EXIT;
} }
if ((write_flag) && (0 == offset) && (count >= XCF_PAGE_SIZE)) if ((write_flag) && (offset == 0) && (count >= XCF_PAGE_SIZE))
revbit = need_bit_reverse(w_buffer); revbit = need_bit_reverse(w_buffer);
while (count > 0) { while (count > 0) {
@ -585,7 +585,7 @@ static int xcf_info(struct flash_bank *bank, char *buf, int buf_size)
{ {
const struct xcf_priv *priv = bank->driver_priv; const struct xcf_priv *priv = bank->driver_priv;
if (false == priv->probed) { if (!priv->probed) {
snprintf(buf, buf_size, "\nXCF flash bank not probed yet\n"); snprintf(buf, buf_size, "\nXCF flash bank not probed yet\n");
return ERROR_OK; return ERROR_OK;
} }
@ -598,7 +598,7 @@ static int xcf_probe(struct flash_bank *bank)
struct xcf_priv *priv = bank->driver_priv; struct xcf_priv *priv = bank->driver_priv;
uint32_t id; uint32_t id;
if (true == priv->probed) if (priv->probed)
free(bank->sectors); free(bank->sectors);
priv->probed = false; priv->probed = false;
@ -629,7 +629,7 @@ static int xcf_probe(struct flash_bank *bank)
} }
bank->sectors = malloc(bank->num_sectors * sizeof(struct flash_sector)); bank->sectors = malloc(bank->num_sectors * sizeof(struct flash_sector));
if (NULL == bank->sectors) { if (bank->sectors == NULL) {
LOG_ERROR("No memory for sector table"); LOG_ERROR("No memory for sector table");
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -652,7 +652,7 @@ static int xcf_auto_probe(struct flash_bank *bank)
{ {
struct xcf_priv *priv = bank->driver_priv; struct xcf_priv *priv = bank->driver_priv;
if (true == priv->probed) if (priv->probed)
return ERROR_OK; return ERROR_OK;
else else
return xcf_probe(bank); return xcf_probe(bank);