Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash_sector_t -> struct flash_sector
[openocd.git] / src / flash / str9xpec.c
diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index 2ab92d983d88ce1870fa6286c55f901021bffb18..6b85e6a14a593924948f75a7d1fb07a95046dce7 100644 (file)
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -28,86 +28,19 @@
 #include "arm7_9_common.h"
 
 
-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_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 =
-{
-       .name = "str9xpec",
-       .register_commands = str9xpec_register_commands,
-       .flash_bank_command = str9xpec_flash_bank_command,
-       .erase = str9xpec_erase,
-       .protect = str9xpec_protect,
-       .write = str9xpec_write,
-       .probe = str9xpec_probe,
-       .auto_probe = str9xpec_probe,
-       .erase_check = str9xpec_erase_check,
-       .protect_check = str9xpec_protect_check,
-       .info = str9xpec_info
-};
-
-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");
-
-       register_command(cmd_ctx, str9xpec_cmd, "enable_turbo", str9xpec_handle_flash_enable_turbo_command, COMMAND_EXEC,
-                                        "enable str9xpec turbo mode");
-       register_command(cmd_ctx, str9xpec_cmd, "disable_turbo", str9xpec_handle_flash_disable_turbo_command, COMMAND_EXEC,
-                                        "disable str9xpec turbo mode");
-       register_command(cmd_ctx, str9xpec_cmd, "options_cmap", str9xpec_handle_flash_options_cmap_command, COMMAND_EXEC,
-                                        "configure str9xpec boot sector");
-       register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd", str9xpec_handle_flash_options_lvdthd_command, COMMAND_EXEC,
-                                        "configure str9xpec lvd threshold");
-       register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel", str9xpec_handle_flash_options_lvdsel_command, COMMAND_EXEC,
-                                        "configure str9xpec lvd selection");
-       register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn", str9xpec_handle_flash_options_lvdwarn_command, COMMAND_EXEC,
-                                        "configure str9xpec lvd warning");
-       register_command(cmd_ctx, str9xpec_cmd, "options_read", str9xpec_handle_flash_options_read_command, COMMAND_EXEC,
-                                        "read str9xpec options");
-       register_command(cmd_ctx, str9xpec_cmd, "options_write", str9xpec_handle_flash_options_write_command, COMMAND_EXEC,
-                                        "write str9xpec options");
-       register_command(cmd_ctx, str9xpec_cmd, "lock", str9xpec_handle_flash_lock_command, COMMAND_EXEC,
-                                        "lock str9xpec device");
-       register_command(cmd_ctx, str9xpec_cmd, "unlock", str9xpec_handle_flash_unlock_command, COMMAND_EXEC,
-                                        "unlock str9xpec device");
-       register_command(cmd_ctx, str9xpec_cmd, "part_id", str9xpec_handle_part_id_command, COMMAND_EXEC,
-                                        "print part id of str9xpec flash bank <num>");
-
-       return ERROR_OK;
-}
-
-int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
+int str9xpec_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end_state)
 {
-       if( tap == NULL ){
+       if (tap == NULL) {
                return ERROR_TARGET_INVALID;
        }
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
        {
-               scan_field_t field;
+               struct scan_field field;
 
                field.tap = tap;
                field.num_bits = tap->ir_length;
@@ -123,10 +56,10 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
        return ERROR_OK;
 }
 
-static u8 str9xpec_isc_status(jtag_tap_t *tap)
+static uint8_t str9xpec_isc_status(struct jtag_tap *tap)
 {
-       scan_field_t field;
-       u8 status;
+       struct scan_field field;
+       uint8_t status;
 
        if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK)
                return ISC_STATUS_ERROR;
@@ -150,8 +83,8 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap)
 
 static int str9xpec_isc_enable(struct flash_bank_s *bank)
 {
-       u8 status;
-       jtag_tap_t *tap;
+       uint8_t status;
+       struct jtag_tap *tap;
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        tap = str9xpec_info->tap;
@@ -177,8 +110,8 @@ static int str9xpec_isc_enable(struct flash_bank_s *bank)
 
 static int str9xpec_isc_disable(struct flash_bank_s *bank)
 {
-       u8 status;
-       jtag_tap_t *tap;
+       uint8_t status;
+       struct jtag_tap *tap;
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        tap = str9xpec_info->tap;
@@ -206,9 +139,9 @@ static int str9xpec_isc_disable(struct flash_bank_s *bank)
 
 static int str9xpec_read_config(struct flash_bank_s *bank)
 {
-       scan_field_t field;
-       u8 status;
-       jtag_tap_t *tap;
+       struct scan_field field;
+       uint8_t status;
+       struct jtag_tap *tap;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
@@ -240,7 +173,7 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank)
        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)
@@ -272,8 +205,8 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank)
        num_sectors = b0_sectors + b1_sectors;
 
        bank->num_sectors = num_sectors;
-       bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
-       str9xpec_info->sector_bits = malloc(sizeof(u32) * num_sectors);
+       bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors);
+       str9xpec_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
 
        num_sectors = 0;
 
@@ -302,7 +235,7 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank)
 
 /* flash bank str9x <base> <size> 0 0 <target#>
  */
-static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(str9xpec_flash_bank_command)
 {
        str9xpec_flash_controller_t *str9xpec_info;
        armv4_5_common_t *armv4_5 = NULL;
@@ -318,14 +251,14 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
        str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t));
        bank->driver_priv = str9xpec_info;
 
-       /* find out jtag position of flash controller
-        * it is always after the arm966 core */
-
+       /* REVISIT verify that the jtag position of flash controller is
+        * right after *THIS* core, which must be a STR9xx core ...
+        */
        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->tap = bank->target->tap;
        str9xpec_info->isc_enable = 0;
 
        str9xpec_build_block_list(bank);
@@ -338,18 +271,18 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
 
 static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
 {
-       scan_field_t field;
-       u8 status;
-       jtag_tap_t *tap;
+       struct scan_field field;
+       uint8_t status;
+       struct jtag_tap *tap;
        int i;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        tap = str9xpec_info->tap;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -405,7 +338,7 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
 
 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;
@@ -427,18 +360,18 @@ static int str9xpec_protect_check(struct flash_bank_s *bank)
 
 static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
 {
-       scan_field_t field;
-       u8 status;
-       jtag_tap_t *tap;
+       struct scan_field field;
+       uint8_t status;
+       struct jtag_tap *tap;
        int i;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        tap = str9xpec_info->tap;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -509,16 +442,16 @@ static int str9xpec_erase(struct flash_bank_s *bank, int first, int last)
 
 static int str9xpec_lock_device(struct flash_bank_s *bank)
 {
-       scan_field_t field;
-       u8 status;
-       jtag_tap_t *tap;
+       struct scan_field field;
+       uint8_t status;
+       struct jtag_tap *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        str9xpec_info = bank->driver_priv;
        tap = str9xpec_info->tap;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -542,7 +475,7 @@ static int str9xpec_lock_device(struct flash_bank_s *bank)
                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);
 
@@ -551,7 +484,7 @@ static int str9xpec_lock_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);
 
@@ -560,7 +493,7 @@ static int str9xpec_unlock_device(struct flash_bank_s *bank)
 
 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;
@@ -575,7 +508,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
        /* last bank: 0xFF signals a full device protect */
        if (last == 0xFF)
        {
-               if( set )
+               if (set)
                {
                        status = str9xpec_lock_device(bank);
                }
@@ -589,7 +522,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
        {
                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);
@@ -604,10 +537,10 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
        return ERROR_OK;
 }
 
-static 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;
+       struct jtag_tap *tap;
+       struct scan_field field;
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        tap = str9xpec_info->tap;
@@ -625,17 +558,17 @@ static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector)
        return ERROR_OK;
 }
 
-static 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;
-       jtag_tap_t *tap;
-       scan_field_t field;
-       u8 *scanbuf;
+       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;
+       struct jtag_tap *tap;
+       struct scan_field field;
+       uint8_t *scanbuf;
        int i;
        int first_sector = 0;
        int last_sector = 0;
@@ -652,14 +585,14 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 
        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))
@@ -671,11 +604,11 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                                check_address = sec_end;
                }
 
-               if ((offset >= sec_start) && (offset < sec_end)){
+               if ((offset >= sec_start) && (offset < sec_end)) {
                        first_sector = i;
                }
 
-               if ((offset + count >= sec_start) && (offset + count < sec_end)){
+               if ((offset + count >= sec_start) && (offset + count < sec_end)) {
                        last_sector = i;
                }
        }
@@ -722,7 +655,7 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 
                                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;
@@ -737,10 +670,10 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 
        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--;
@@ -772,7 +705,7 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 
                        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;
@@ -793,26 +726,21 @@ static int str9xpec_probe(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_part_id_command)
 {
-       flash_bank_t *bank;
-       scan_field_t field;
-       u8 *buffer = NULL;
-       jtag_tap_t *tap;
-       u32 idcode;
+       struct scan_field field;
+       uint8_t *buffer = NULL;
+       struct jtag_tap *tap;
+       uint32_t idcode;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
-       {
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
        tap = str9xpec_info->tap;
@@ -831,7 +759,7 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch
 
        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);
 
@@ -845,14 +773,13 @@ static int str9xpec_erase_check(struct flash_bank_s *bank)
 
 static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
-       snprintf(buf, buf_size, "str9xpec flash driver info" );
+       snprintf(buf, buf_size, "str9xpec flash driver info");
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_read_command)
 {
-       flash_bank_t *bank;
-       u8 status;
+       uint8_t status;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
@@ -861,12 +788,10 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s *
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
 
@@ -910,22 +835,22 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s *
 
 static int str9xpec_write_options(struct flash_bank_s *bank)
 {
-       scan_field_t field;
-       u8 status;
-       jtag_tap_t *tap;
+       struct scan_field field;
+       uint8_t status;
+       struct jtag_tap *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        str9xpec_info = bank->driver_priv;
        tap = str9xpec_info->tap;
 
        /* erase config options first */
-       status = str9xpec_erase_area( bank, 0xFE, 0xFE );
+       status = str9xpec_erase_area(bank, 0xFE, 0xFE);
 
        if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
                return status;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -962,17 +887,16 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
                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;
 }
 
-static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_write_command)
 {
-       flash_bank_t *bank;
-       u8 status;
+       uint8_t status;
 
        if (argc < 1)
        {
@@ -980,12 +904,10 @@ static int str9xpec_handle_flash_options_write_command(struct command_context_s
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        status = str9xpec_write_options(bank);
 
@@ -995,23 +917,20 @@ static int str9xpec_handle_flash_options_write_command(struct command_context_s
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_cmap_command)
 {
-       flash_bank_t *bank;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_cmap <bank> <bank0|bank1>");
+               command_print(cmd_ctx, "str9xpec options_cmap <bank> <bank0 | bank1>");
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
 
@@ -1027,23 +946,20 @@ static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_lvdthd_command)
 {
-       flash_bank_t *bank;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_lvdthd <bank> <2.4v|2.7v>");
+               command_print(cmd_ctx, "str9xpec options_lvdthd <bank> <2.4v | 2.7v>");
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
 
@@ -1059,23 +975,20 @@ static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s
        return ERROR_OK;
 }
 
-int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_lvdsel_command)
 {
-       flash_bank_t *bank;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_lvdsel <bank> <vdd|vdd_vddq>");
+               command_print(cmd_ctx, "str9xpec options_lvdsel <bank> <vdd | vdd_vddq>");
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
 
@@ -1091,23 +1004,20 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_lvdwarn_command)
 {
-       flash_bank_t *bank;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_lvdwarn <bank> <vdd|vdd_vddq>");
+               command_print(cmd_ctx, "str9xpec options_lvdwarn <bank> <vdd | vdd_vddq>");
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
 
@@ -1123,10 +1033,9 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_lock_command)
 {
-       u8 status;
-       flash_bank_t *bank;
+       uint8_t status;
 
        if (argc < 1)
        {
@@ -1134,12 +1043,10 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx,
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        status = str9xpec_lock_device(bank);
 
@@ -1149,10 +1056,9 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx,
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_unlock_command)
 {
-       u8 status;
-       flash_bank_t *bank;
+       uint8_t status;
 
        if (argc < 1)
        {
@@ -1160,12 +1066,10 @@ static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ct
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        status = str9xpec_unlock_device(bank);
 
@@ -1175,13 +1079,11 @@ static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ct
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_enable_turbo_command)
 {
-       int retval;
-       flash_bank_t *bank;
-       jtag_tap_t *tap0;
-       jtag_tap_t *tap1;
-       jtag_tap_t *tap2;
+       struct jtag_tap *tap0;
+       struct jtag_tap *tap1;
+       struct jtag_tap *tap2;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
@@ -1190,12 +1092,10 @@ static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
 
@@ -1228,10 +1128,9 @@ static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *
        return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_disable_turbo_command)
 {
-       flash_bank_t *bank;
-       jtag_tap_t *tap;
+       struct jtag_tap *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
@@ -1240,12 +1139,10 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        str9xpec_info = bank->driver_priv;
        tap = str9xpec_info->tap;
@@ -1254,7 +1151,8 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s
                return ERROR_FAIL;
 
        /* exit turbo mode via RESET */
-       str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET);
+       str9xpec_set_instr(tap, ISC_NOOP, TAP_IDLE);
+       jtag_add_tlr();
        jtag_execute_queue();
 
        /* restore previous scan chain */
@@ -1264,3 +1162,59 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s
 
        return ERROR_OK;
 }
+
+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");
+
+       register_command(cmd_ctx, str9xpec_cmd, "enable_turbo",
+                       str9xpec_handle_flash_enable_turbo_command,
+                       COMMAND_EXEC, "enable str9xpec turbo mode");
+       register_command(cmd_ctx, str9xpec_cmd, "disable_turbo",
+                       str9xpec_handle_flash_disable_turbo_command,
+                       COMMAND_EXEC, "disable str9xpec turbo mode");
+       register_command(cmd_ctx, str9xpec_cmd, "options_cmap",
+                       str9xpec_handle_flash_options_cmap_command,
+                       COMMAND_EXEC, "configure str9xpec boot sector");
+       register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd",
+                       str9xpec_handle_flash_options_lvdthd_command,
+                       COMMAND_EXEC, "configure str9xpec lvd threshold");
+       register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel",
+                       str9xpec_handle_flash_options_lvdsel_command,
+                       COMMAND_EXEC, "configure str9xpec lvd selection");
+       register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn",
+                       str9xpec_handle_flash_options_lvdwarn_command,
+                       COMMAND_EXEC, "configure str9xpec lvd warning");
+       register_command(cmd_ctx, str9xpec_cmd, "options_read",
+                       str9xpec_handle_flash_options_read_command,
+                       COMMAND_EXEC, "read str9xpec options");
+       register_command(cmd_ctx, str9xpec_cmd, "options_write",
+                       str9xpec_handle_flash_options_write_command,
+                       COMMAND_EXEC, "write str9xpec options");
+       register_command(cmd_ctx, str9xpec_cmd, "lock",
+                       str9xpec_handle_flash_lock_command,
+                       COMMAND_EXEC, "lock str9xpec device");
+       register_command(cmd_ctx, str9xpec_cmd, "unlock",
+                       str9xpec_handle_flash_unlock_command,
+                       COMMAND_EXEC, "unlock str9xpec device");
+       register_command(cmd_ctx, str9xpec_cmd, "part_id",
+                       str9xpec_handle_part_id_command,
+                       COMMAND_EXEC, "print part id of str9xpec flash bank <num>");
+
+       return ERROR_OK;
+}
+
+flash_driver_t str9xpec_flash = {
+               .name = "str9xpec",
+               .register_commands = &str9xpec_register_commands,
+               .flash_bank_command = &str9xpec_flash_bank_command,
+               .erase = &str9xpec_erase,
+               .protect = &str9xpec_protect,
+               .write = &str9xpec_write,
+               .probe = &str9xpec_probe,
+               .auto_probe = &str9xpec_probe,
+               .erase_check = &str9xpec_erase_check,
+               .protect_check = &str9xpec_protect_check,
+               .info = &str9xpec_info,
+       };
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)