Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- Replace 'while(' with 'while ('.
[openocd.git] / src / flash / str9xpec.c
diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index fdfc9c7fe70108ea834afa590187a15ddcf0b463..fc1bfbcdde756bb239bf9416461a9ff65764d409 100644 (file)
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -24,47 +24,35 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str9xpec.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "armv4_5.h"
 #include "arm7_9_common.h"
-#include "jtag.h"
-#include "binarybuffer.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-
-int str9xpec_register_commands(struct command_context_s *cmd_ctx);
-int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-int str9xpec_erase(struct flash_bank_s *bank, int first, int last);
-int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last);
-int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
-int str9xpec_probe(struct flash_bank_s *bank);
-int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_protect_check(struct flash_bank_s *bank);
-int str9xpec_erase_check(struct flash_bank_s *bank);
-int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size);
-
-int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last);
-int str9xpec_set_address(struct flash_bank_s *bank, u8 sector);
-int str9xpec_write_options(struct flash_bank_s *bank);
-
-int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+
+
+static int str9xpec_register_commands(struct command_context_s *cmd_ctx);
+static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
+static int str9xpec_erase(struct flash_bank_s *bank, int first, int last);
+static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last);
+static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
+static int str9xpec_probe(struct flash_bank_s *bank);
+static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_protect_check(struct flash_bank_s *bank);
+static int str9xpec_erase_check(struct flash_bank_s *bank);
+static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size);
+
+static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last);
+static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector);
+static int str9xpec_write_options(struct flash_bank_s *bank);
+
+static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 flash_driver_t str9xpec_flash =
 {
@@ -81,7 +69,7 @@ flash_driver_t str9xpec_flash =
        .info = str9xpec_info
 };
 
-int str9xpec_register_commands(struct command_context_s *cmd_ctx)
+static int str9xpec_register_commands(struct command_context_s *cmd_ctx)
 {
        command_t *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec", NULL, COMMAND_ANY, "str9xpec flash specific commands");
 
@@ -111,9 +99,9 @@ int str9xpec_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
+int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state)
 {
-       if( tap == NULL ){
+       if ( tap == NULL ){
                return ERROR_TARGET_INVALID;
        }
 
@@ -125,12 +113,7 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
                field.num_bits = tap->ir_length;
                field.out_value = calloc(CEIL(field.num_bits, 8), 1);
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               field.out_mask = NULL;
                field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
 
                jtag_add_ir_scan(1, &field, end_state);
 
@@ -140,10 +123,10 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
        return ERROR_OK;
 }
 
-u8 str9xpec_isc_status(jtag_tap_t *tap)
+static uint8_t str9xpec_isc_status(jtag_tap_t *tap)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
 
        if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK)
                return ISC_STATUS_ERROR;
@@ -151,14 +134,10 @@ u8 str9xpec_isc_status(jtag_tap_t *tap)
        field.tap = tap;
        field.num_bits = 8;
        field.out_value = NULL;
-       field.out_mask = NULL;
        field.in_value = &status;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        LOG_DEBUG("status: 0x%2.2x", status);
@@ -169,9 +148,9 @@ u8 str9xpec_isc_status(jtag_tap_t *tap)
        return status;
 }
 
-int str9xpec_isc_enable(struct flash_bank_s *bank)
+static int str9xpec_isc_enable(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
@@ -196,9 +175,9 @@ int str9xpec_isc_enable(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-int str9xpec_isc_disable(struct flash_bank_s *bank)
+static int str9xpec_isc_disable(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
@@ -225,10 +204,10 @@ int str9xpec_isc_disable(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-int str9xpec_read_config(struct flash_bank_s *bank)
+static int str9xpec_read_config(struct flash_bank_s *bank)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
@@ -243,14 +222,10 @@ int str9xpec_read_config(struct flash_bank_s *bank)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = NULL;
-       field.out_mask = NULL;
        field.in_value = str9xpec_info->options;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        status = str9xpec_isc_status(tap);
@@ -258,14 +233,14 @@ int str9xpec_read_config(struct flash_bank_s *bank)
        return status;
 }
 
-int str9xpec_build_block_list(struct flash_bank_s *bank)
+static int str9xpec_build_block_list(struct flash_bank_s *bank)
 {
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        int i;
        int num_sectors;
        int b0_sectors = 0, b1_sectors = 0;
-       u32 offset = 0;
+       uint32_t offset = 0;
        int b1_size = 0x2000;
 
        switch (bank->size)
@@ -298,7 +273,7 @@ int str9xpec_build_block_list(struct flash_bank_s *bank)
 
        bank->num_sectors = num_sectors;
        bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
-       str9xpec_info->sector_bits = malloc(sizeof(u32) * num_sectors);
+       str9xpec_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
 
        num_sectors = 0;
 
@@ -327,7 +302,7 @@ int str9xpec_build_block_list(struct flash_bank_s *bank)
 
 /* flash bank str9x <base> <size> 0 0 <target#>
  */
-int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
 {
        str9xpec_flash_controller_t *str9xpec_info;
        armv4_5_common_t *armv4_5 = NULL;
@@ -350,7 +325,7 @@ int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, ch
        arm7_9 = armv4_5->arch_info;
        jtag_info = &arm7_9->jtag_info;
 
-       str9xpec_info->tap = jtag_TapByAbsPosition( jtag_info->tap->abs_chain_position - 1);
+       str9xpec_info->tap = jtag_tap_by_position( jtag_info->tap->abs_chain_position - 1);
        str9xpec_info->isc_enable = 0;
 
        str9xpec_build_block_list(bank);
@@ -361,13 +336,13 @@ int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, ch
        return ERROR_OK;
 }
 
-int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
+static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        int i;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
@@ -395,26 +370,16 @@ int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = buffer;
-       field.out_mask = NULL;
        field.in_value = NULL;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_add_sleep(40000);
 
        /* read blank check result */
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = NULL;
-       field.out_mask = NULL;
        field.in_value = buffer;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
        jtag_add_dr_scan(1, &field, TAP_IRPAUSE);
        jtag_execute_queue();
@@ -438,9 +403,9 @@ int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
        return ERROR_OK;
 }
 
-int str9xpec_protect_check(struct flash_bank_s *bank)
+static int str9xpec_protect_check(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
        int i;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
@@ -460,13 +425,13 @@ int str9xpec_protect_check(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
+static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        int i;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
@@ -511,14 +476,9 @@ int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = buffer;
-       field.out_mask = NULL;
        field.in_value = NULL;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        jtag_add_sleep(10);
@@ -535,7 +495,7 @@ int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
        return status;
 }
 
-int str9xpec_erase(struct flash_bank_s *bank, int first, int last)
+static int str9xpec_erase(struct flash_bank_s *bank, int first, int last)
 {
        int status;
 
@@ -547,10 +507,10 @@ int str9xpec_erase(struct flash_bank_s *bank, int first, int last)
        return ERROR_OK;
 }
 
-int str9xpec_lock_device(struct flash_bank_s *bank)
+static int str9xpec_lock_device(struct flash_bank_s *bank)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
@@ -577,35 +537,30 @@ int str9xpec_lock_device(struct flash_bank_s *bank)
                field.tap = tap;
                field.num_bits = 8;
                field.out_value = NULL;
-               field.out_mask = NULL;
                field.in_value = &status;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
 
-               jtag_add_dr_scan(1, &field, -1);
+               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                jtag_execute_queue();
 
-       } while(!(status & ISC_STATUS_BUSY));
+       } while (!(status & ISC_STATUS_BUSY));
 
        str9xpec_isc_disable(bank);
 
        return status;
 }
 
-int str9xpec_unlock_device(struct flash_bank_s *bank)
+static int str9xpec_unlock_device(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
 
        status = str9xpec_erase_area(bank, 0, 255);
 
        return status;
 }
 
-int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       u8 status;
+       uint8_t status;
        int i;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
@@ -620,7 +575,7 @@ int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last)
        /* last bank: 0xFF signals a full device protect */
        if (last == 0xFF)
        {
-               if( set )
+               if ( set )
                {
                        status = str9xpec_lock_device(bank);
                }
@@ -634,7 +589,7 @@ int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last)
        {
                for (i = first; i <= last; i++)
                {
-                       if( set )
+                       if ( set )
                                buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 1);
                        else
                                buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 0);
@@ -649,7 +604,7 @@ int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last)
        return ERROR_OK;
 }
 
-int str9xpec_set_address(struct flash_bank_s *bank, u8 sector)
+static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector)
 {
        jtag_tap_t *tap;
        scan_field_t field;
@@ -663,32 +618,27 @@ int str9xpec_set_address(struct flash_bank_s *bank, u8 sector)
        field.tap = tap;
        field.num_bits = 8;
        field.out_value = &sector;
-       field.out_mask = NULL;
        field.in_value = NULL;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
-       jtag_add_dr_scan(1, &field, -1);
+       jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        return ERROR_OK;
 }
 
-int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
-       u32 dwords_remaining = (count / 8);
-       u32 bytes_remaining = (count & 0x00000007);
-       u32 bytes_written = 0;
-       u8 status;
-       u32 check_address = offset;
+       uint32_t dwords_remaining = (count / 8);
+       uint32_t bytes_remaining = (count & 0x00000007);
+       uint32_t bytes_written = 0;
+       uint8_t status;
+       uint32_t check_address = offset;
        jtag_tap_t *tap;
        scan_field_t field;
-       u8 *scanbuf;
+       uint8_t *scanbuf;
        int i;
-       u32 first_sector = 0;
-       u32 last_sector = 0;
+       int first_sector = 0;
+       int last_sector = 0;
 
        tap = str9xpec_info->tap;
 
@@ -702,14 +652,14 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 
        if (offset & 0x7)
        {
-               LOG_WARNING("offset 0x%x breaks required 8-byte alignment", offset);
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required 8-byte alignment", offset);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
 
        for (i = 0; i < bank->num_sectors; i++)
        {
-               u32 sec_start = bank->sectors[i].offset;
-               u32 sec_end = sec_start + bank->sectors[i].size;
+               uint32_t sec_start = bank->sectors[i].offset;
+               uint32_t sec_end = sec_start + bank->sectors[i].size;
 
                /* check if destination falls within the current sector */
                if ((check_address >= sec_start) && (check_address < sec_end))
@@ -752,14 +702,9 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                        field.tap = tap;
                        field.num_bits = 64;
                        field.out_value = (buffer + bytes_written);
-                       field.out_mask = NULL;
                        field.in_value = NULL;
-                       field.in_check_value = NULL;
-                       field.in_check_mask = NULL;
-                       field.in_handler = NULL;
-                       field.in_handler_priv = NULL;
 
-                       jtag_add_dr_scan(1, &field, TAP_IDLE);
+                       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
                        /* small delay before polling */
                        jtag_add_sleep(50);
@@ -770,19 +715,14 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                                field.tap = tap;
                                field.num_bits = 8;
                                field.out_value = NULL;
-                               field.out_mask = NULL;
                                field.in_value = scanbuf;
-                               field.in_check_value = NULL;
-                               field.in_check_mask = NULL;
-                               field.in_handler = NULL;
-                               field.in_handler_priv = NULL;
 
-                               jtag_add_dr_scan(1, &field, -1);
+                               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                                jtag_execute_queue();
 
                                status = buf_get_u32(scanbuf, 0, 8);
 
-                       } while(!(status & ISC_STATUS_BUSY));
+                       } while (!(status & ISC_STATUS_BUSY));
 
                        if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
                                return ERROR_FLASH_OPERATION_FAILED;
@@ -797,10 +737,10 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 
        if (bytes_remaining)
        {
-               u8 last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+               uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
                int i = 0;
 
-               while(bytes_remaining > 0)
+               while (bytes_remaining > 0)
                {
                        last_dword[i++] = *(buffer + bytes_written);
                        bytes_remaining--;
@@ -812,14 +752,9 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                field.tap = tap;
                field.num_bits = 64;
                field.out_value = last_dword;
-               field.out_mask = NULL;
                field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
 
-               jtag_add_dr_scan(1, &field, TAP_IDLE);
+               jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
                /* small delay before polling */
                jtag_add_sleep(50);
@@ -830,19 +765,14 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                        field.tap = tap;
                        field.num_bits = 8;
                        field.out_value = NULL;
-                       field.out_mask = NULL;
                        field.in_value = scanbuf;
-                       field.in_check_value = NULL;
-                       field.in_check_mask = NULL;
-                       field.in_handler = NULL;
-                       field.in_handler_priv = NULL;
 
-                       jtag_add_dr_scan(1, &field, -1);
+                       jtag_add_dr_scan(1, &field, jtag_get_end_state());
                        jtag_execute_queue();
 
                        status = buf_get_u32(scanbuf, 0, 8);
 
-               } while(!(status & ISC_STATUS_BUSY));
+               } while (!(status & ISC_STATUS_BUSY));
 
                if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
                        return ERROR_FLASH_OPERATION_FAILED;
@@ -858,18 +788,18 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        return ERROR_OK;
 }
 
-int str9xpec_probe(struct flash_bank_s *bank)
+static int str9xpec_probe(struct flash_bank_s *bank)
 {
        return ERROR_OK;
 }
 
-int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
        scan_field_t field;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
        jtag_tap_t *tap;
-       u32 idcode;
+       uint32_t idcode;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
@@ -894,40 +824,35 @@ int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd
        field.tap = tap;
        field.num_bits = 32;
        field.out_value = NULL;
-       field.out_mask = NULL;
        field.in_value = buffer;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        idcode = buf_get_u32(buffer, 0, 32);
 
-       command_print(cmd_ctx, "str9xpec part id: 0x%8.8x", idcode);
+       command_print(cmd_ctx, "str9xpec part id: 0x%8.8" PRIx32 "", idcode);
 
        free(buffer);
 
        return ERROR_OK;
 }
 
-int str9xpec_erase_check(struct flash_bank_s *bank)
+static int str9xpec_erase_check(struct flash_bank_s *bank)
 {
        return str9xpec_blank_check(bank, 0, bank->num_sectors - 1);
 }
 
-int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "str9xpec flash driver info" );
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
-       u8 status;
+       uint8_t status;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
@@ -983,10 +908,10 @@ int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx
        return ERROR_OK;
 }
 
-int str9xpec_write_options(struct flash_bank_s *bank)
+static int str9xpec_write_options(struct flash_bank_s *bank)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
@@ -1019,14 +944,9 @@ int str9xpec_write_options(struct flash_bank_s *bank)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = str9xpec_info->options;
-       field.out_mask = NULL;
        field.in_value = NULL;
-       field.in_check_value = NULL;
-       field.in_check_mask = NULL;
-       field.in_handler = NULL;
-       field.in_handler_priv = NULL;
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
        /* small delay before polling */
        jtag_add_sleep(50);
@@ -1037,27 +957,22 @@ int str9xpec_write_options(struct flash_bank_s *bank)
                field.tap = tap;
                field.num_bits = 8;
                field.out_value = NULL;
-               field.out_mask = NULL;
                field.in_value = &status;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
 
-               jtag_add_dr_scan(1, &field, -1);
+               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                jtag_execute_queue();
 
-       } while(!(status & ISC_STATUS_BUSY));
+       } while (!(status & ISC_STATUS_BUSY));
 
        str9xpec_isc_disable(bank);
 
        return status;
 }
 
-int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
-       u8 status;
+       uint8_t status;
 
        if (argc < 1)
        {
@@ -1080,7 +995,7 @@ int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ct
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
@@ -1112,7 +1027,7 @@ int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
@@ -1176,7 +1091,7 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
@@ -1208,9 +1123,9 @@ int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       u8 status;
+       uint8_t status;
        flash_bank_t *bank;
 
        if (argc < 1)
@@ -1234,9 +1149,9 @@ int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       u8 status;
+       uint8_t status;
        flash_bank_t *bank;
 
        if (argc < 1)
@@ -1260,7 +1175,7 @@ int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        int retval;
        flash_bank_t *bank;
@@ -1313,7 +1228,7 @@ int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
        jtag_tap_t *tap;
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)