target/xtensa: avoid IHI for writes to non-executable memory

[openocd.git] / src / flash / nor / xcf.c

diff --git a/src/flash/nor/xcf.c b/src/flash/nor/xcf.c
index eb1e842237a82b0e27fc76b4466d5add5b1fec4c..1d67b09430b2e2ac2e6f0534b3a461837e338b3e 100644 (file)
--- a/src/flash/nor/xcf.c
+++ b/src/flash/nor/xcf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /***************************************************************************
  *   Copyright (C) 2016 by Uladzimir Pylinski aka barthess                 *
@@ -130,8 +130,8 @@ static struct xcf_status read_status(struct flash_bank *bank)
        jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
        jtag_execute_queue();
 
-       ret.isc_error   = ((irdata[0] >> 7) & 3) == 0b01;
-       ret.prog_error  = ((irdata[0] >> 5) & 3) == 0b01;
+       ret.isc_error   = ((irdata[0] >> 7) & 3) == 1;
+       ret.prog_error  = ((irdata[0] >> 5) & 3) == 1;
        ret.prog_busy   = ((irdata[0] >> 4) & 1) == 0;
        ret.isc_mode    = ((irdata[0] >> 3) & 1) == 1;
 
@@ -528,7 +528,7 @@ static int isc_program_single_revision_btc(struct flash_bank *bank)
 {
        uint8_t buf[4];
        uint32_t btc = 0xFFFFFFFF;
-       btc &= ~0b1111;
+       btc &= ~0xF;
        btc |= ((bank->num_sectors - 1) << 2);
        btc &= ~(1 << 4);
        h_u32_to_le(buf, btc);
@@ -597,7 +597,7 @@ static int xcf_probe(struct flash_bank *bank)
        }
 
        /* check idcode and alloc memory for sector table */
-       if (!bank->target->tap->hasidcode)
+       if (!bank->target->tap->has_idcode)
                return ERROR_FLASH_OPERATION_FAILED;
 
        /* guess number of blocks using chip ID */