Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Audit and eliminate redundant #include directives in src/flash sources.
[openocd.git] / src / flash / str9xpec.c
diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index 9dad28720859b93be7712f9e11572d46654507f2..dc195c148fa1f5ef662a049a74f4ca0008e712b1 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, u8 *buffer, u32 offset, u32 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, u8 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,7 +99,7 @@ int str9xpec_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, enum tap_state end_state)
+int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
 {
        if( tap == NULL ){
                return ERROR_TARGET_INVALID;
@@ -125,12 +113,12 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, enum tap_state 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,25 +128,25 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, enum tap_state end_state)
        return ERROR_OK;
 }
 
-u8 str9xpec_isc_status(jtag_tap_t *tap)
+static u8 str9xpec_isc_status(jtag_tap_t *tap)
 {
        scan_field_t field;
        u8 status;
 
-       if (str9xpec_set_instr(tap, ISC_NOOP, TAP_PI) != ERROR_OK)
+       if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK)
                return ISC_STATUS_ERROR;
 
        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_RTI);
+       jtag_add_dr_scan(1, &field, TAP_IDLE);
        jtag_execute_queue();
 
        LOG_DEBUG("status: 0x%2.2x", status);
@@ -169,7 +157,7 @@ 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;
        jtag_tap_t *tap;
@@ -181,7 +169,7 @@ int str9xpec_isc_enable(struct flash_bank_s *bank)
                return ERROR_OK;
 
        /* enter isc mode */
-       if (str9xpec_set_instr(tap, ISC_ENABLE, TAP_RTI) != ERROR_OK)
+       if (str9xpec_set_instr(tap, ISC_ENABLE, TAP_IDLE) != ERROR_OK)
                return ERROR_TARGET_INVALID;
 
        /* check ISC status */
@@ -196,7 +184,7 @@ 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;
        jtag_tap_t *tap;
@@ -207,7 +195,7 @@ int str9xpec_isc_disable(struct flash_bank_s *bank)
        if (!str9xpec_info->isc_enable)
                return ERROR_OK;
 
-       if (str9xpec_set_instr(tap, ISC_DISABLE, TAP_RTI) != ERROR_OK)
+       if (str9xpec_set_instr(tap, ISC_DISABLE, TAP_IDLE) != ERROR_OK)
                return ERROR_TARGET_INVALID;
 
        /* delay to handle aborts */
@@ -225,7 +213,7 @@ 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;
@@ -238,19 +226,19 @@ int str9xpec_read_config(struct flash_bank_s *bank)
        LOG_DEBUG("ISC_CONFIGURATION");
 
        /* execute ISC_CONFIGURATION command */
-       str9xpec_set_instr(tap, ISC_CONFIGURATION, TAP_PI);
+       str9xpec_set_instr(tap, ISC_CONFIGURATION, TAP_IRPAUSE);
 
        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_RTI);
+       jtag_add_dr_scan(1, &field, TAP_IDLE);
        jtag_execute_queue();
 
        status = str9xpec_isc_status(tap);
@@ -258,7 +246,7 @@ 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;
 
@@ -327,7 +315,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;
@@ -349,10 +337,10 @@ int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, ch
        armv4_5 = bank->target->arch_info;
        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->isc_enable = 0;
-       
+
        str9xpec_build_block_list(bank);
 
        /* clear option byte register */
@@ -361,7 +349,7 @@ 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;
@@ -390,33 +378,33 @@ int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
        }
 
        /* execute ISC_BLANK_CHECK command */
-       str9xpec_set_instr(tap, ISC_BLANK_CHECK, TAP_PI);
+       str9xpec_set_instr(tap, ISC_BLANK_CHECK, TAP_IRPAUSE);
 
        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_RTI);
+       jtag_add_dr_scan(1, &field, 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_PI);
+       jtag_add_dr_scan(1, &field, TAP_IRPAUSE);
        jtag_execute_queue();
 
        status = str9xpec_isc_status(tap);
@@ -438,7 +426,7 @@ 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;
        int i;
@@ -460,7 +448,7 @@ 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;
@@ -506,19 +494,19 @@ int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
        LOG_DEBUG("ISC_ERASE");
 
        /* execute ISC_ERASE command */
-       str9xpec_set_instr(tap, ISC_ERASE, TAP_PI);
+       str9xpec_set_instr(tap, ISC_ERASE, TAP_IRPAUSE);
 
        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_RTI);
+       jtag_add_dr_scan(1, &field, TAP_IDLE);
        jtag_execute_queue();
 
        jtag_add_sleep(10);
@@ -535,7 +523,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,7 +535,7 @@ 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;
@@ -569,20 +557,20 @@ int str9xpec_lock_device(struct flash_bank_s *bank)
        str9xpec_set_address(bank, 0x80);
 
        /* execute ISC_PROGRAM command */
-       str9xpec_set_instr(tap, ISC_PROGRAM_SECURITY, TAP_RTI);
+       str9xpec_set_instr(tap, ISC_PROGRAM_SECURITY, TAP_IDLE);
 
-       str9xpec_set_instr(tap, ISC_NOOP, TAP_PI);
+       str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE);
 
        do {
                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_execute_queue();
@@ -594,7 +582,7 @@ int str9xpec_lock_device(struct flash_bank_s *bank)
        return status;
 }
 
-int str9xpec_unlock_device(struct flash_bank_s *bank)
+static int str9xpec_unlock_device(struct flash_bank_s *bank)
 {
        u8 status;
 
@@ -603,7 +591,7 @@ int str9xpec_unlock_device(struct flash_bank_s *bank)
        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;
        int i;
@@ -649,7 +637,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, u8 sector)
 {
        jtag_tap_t *tap;
        scan_field_t field;
@@ -658,24 +646,24 @@ int str9xpec_set_address(struct flash_bank_s *bank, u8 sector)
        tap = str9xpec_info->tap;
 
        /* set flash controller address */
-       str9xpec_set_instr(tap, ISC_ADDRESS_SHIFT, TAP_PI);
+       str9xpec_set_instr(tap, ISC_ADDRESS_SHIFT, TAP_IRPAUSE);
 
        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);
 
        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, u8 *buffer, u32 offset, u32 count)
 {
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
        u32 dwords_remaining = (count / 8);
@@ -687,8 +675,8 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        scan_field_t field;
        u8 *scanbuf;
        int i;
-       u32 first_sector = 0;
-       u32 last_sector = 0;
+       int first_sector = 0;
+       int last_sector = 0;
 
        tap = str9xpec_info->tap;
 
@@ -747,35 +735,35 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 
                while (dwords_remaining > 0)
                {
-                       str9xpec_set_instr(tap, ISC_PROGRAM, TAP_PI);
+                       str9xpec_set_instr(tap, ISC_PROGRAM, TAP_IRPAUSE);
 
                        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_RTI);
+                       jtag_add_dr_scan(1, &field, TAP_IDLE);
 
                        /* small delay before polling */
                        jtag_add_sleep(50);
 
-                       str9xpec_set_instr(tap, ISC_NOOP, TAP_PI);
+                       str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE);
 
                        do {
                                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_execute_queue();
@@ -807,35 +795,35 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                        bytes_written++;
                }
 
-               str9xpec_set_instr(tap, ISC_PROGRAM, TAP_PI);
+               str9xpec_set_instr(tap, ISC_PROGRAM, TAP_IRPAUSE);
 
                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_RTI);
+               jtag_add_dr_scan(1, &field, TAP_IDLE);
 
                /* small delay before polling */
                jtag_add_sleep(50);
 
-               str9xpec_set_instr(tap, ISC_NOOP, TAP_PI);
+               str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE);
 
                do {
                        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_execute_queue();
@@ -858,12 +846,12 @@ 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;
@@ -889,19 +877,19 @@ int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd
 
        buffer = calloc(CEIL(32, 8), 1);
 
-       str9xpec_set_instr(tap, ISC_IDCODE, TAP_PI);
+       str9xpec_set_instr(tap, ISC_IDCODE, TAP_IRPAUSE);
 
        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_RTI);
+       jtag_add_dr_scan(1, &field, TAP_IDLE);
        jtag_execute_queue();
 
        idcode = buf_get_u32(buffer, 0, 32);
@@ -913,18 +901,18 @@ int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd
        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;
@@ -983,7 +971,7 @@ 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;
@@ -1014,35 +1002,35 @@ int str9xpec_write_options(struct flash_bank_s *bank)
        str9xpec_set_address(bank, 0x50);
 
        /* execute ISC_PROGRAM command */
-       str9xpec_set_instr(tap, ISC_PROGRAM, TAP_PI);
+       str9xpec_set_instr(tap, ISC_PROGRAM, TAP_IRPAUSE);
 
        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_RTI);
+       jtag_add_dr_scan(1, &field, TAP_IDLE);
 
        /* small delay before polling */
        jtag_add_sleep(50);
 
-       str9xpec_set_instr(tap, ISC_NOOP, TAP_PI);
+       str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE);
 
        do {
                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_execute_queue();
@@ -1054,7 +1042,7 @@ int str9xpec_write_options(struct flash_bank_s *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;
@@ -1080,7 +1068,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 +1100,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 +1164,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,7 +1196,7 @@ 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;
        flash_bank_t *bank;
@@ -1234,7 +1222,7 @@ 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;
        flash_bank_t *bank;
@@ -1260,7 +1248,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;
@@ -1303,17 +1291,17 @@ int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx
        }
 
        /* enable turbo mode - TURBO-PROG-ENABLE */
-       str9xpec_set_instr(tap2, 0xD, TAP_RTI);
+       str9xpec_set_instr(tap2, 0xD, TAP_IDLE);
        if ((retval = jtag_execute_queue()) != ERROR_OK)
                return retval;
 
        /* modify scan chain - str9 core has been removed */
        tap1->enabled = 0;
-       
+
        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;
@@ -1337,11 +1325,11 @@ int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ct
 
        if (tap == NULL)
                return ERROR_FAIL;
-       
-       /* exit turbo mode via TLR */
-       str9xpec_set_instr(tap, ISC_NOOP, TAP_TLR);
+
+       /* exit turbo mode via RESET */
+       str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET);
        jtag_execute_queue();
-       
+
        /* restore previous scan chain */
        if (tap->next_tap) {
                tap->next_tap->enabled = 1;
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)