flash: fix bug with multiple back-to-back flash chips

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

diff --git a/src/flash/nor/str9xpec.c b/src/flash/nor/str9xpec.c
index a93b6a279ab3a772e49004101559ec214536996f..f8b705e080c6c5aa057102e2cb9107a953be106b 100644 (file)
--- a/src/flash/nor/str9xpec.c
+++ b/src/flash/nor/str9xpec.c
@@ -33,7 +33,7 @@ static int str9xpec_erase_area(struct flash_bank *bank, int first, int last);
 static int str9xpec_set_address(struct flash_bank *bank, uint8_t sector);
 static int str9xpec_write_options(struct flash_bank *bank);
 
-int str9xpec_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end_state)
+static int str9xpec_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end_state)
 {
        if (tap == NULL) {
                return ERROR_TARGET_INVALID;
@@ -665,7 +665,7 @@ static int str9xpec_write(struct flash_bank *bank, uint8_t *buffer,
        if (bytes_remaining)
        {
                uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-               int i = 0;
+               i = 0;
 
                while (bytes_remaining > 0)
                {
@@ -762,7 +762,7 @@ static int str9xpec_erase_check(struct flash_bank *bank)
        return str9xpec_blank_check(bank, 0, bank->num_sectors - 1);
 }
 
-static int str9xpec_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_str9xpec_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "str9xpec flash driver info");
        return ERROR_OK;
@@ -1247,9 +1247,10 @@ struct flash_driver str9xpec_flash = {
        .erase = str9xpec_erase,
        .protect = str9xpec_protect,
        .write = str9xpec_write,
+       .read = default_flash_read,
        .probe = str9xpec_probe,
        .auto_probe = str9xpec_probe,
        .erase_check = str9xpec_erase_check,
        .protect_check = str9xpec_protect_check,
-       .info = str9xpec_info,
+       .info = get_str9xpec_info,
 };