projects / fw / openocd / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Transform 'u16' to 'uint16_t'
[fw/openocd] / src / flash / str9xpec.c
diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index 0888e3e9ed3d07b7382a9e1ab68a62b28f6f3226..71f58c25769bebd96b53e09df29d6939fe895808 100644 (file)
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -24,27 +24,15 @@
 #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>
 
 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_write(struct flash_bank_s *bank, uint8_t *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);
@@ -52,7 +40,7 @@ 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);
@@ -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;
 }
 
-static 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 @@ static 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);
@@ -171,7 +150,7 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap)
 
 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;
 
@@ -198,7 +177,7 @@ static int str9xpec_isc_enable(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;
 
@@ -228,7 +207,7 @@ 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;
+       uint8_t status;
        jtag_tap_t *tap;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
@@ -243,14 +222,10 @@ static 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);
@@ -350,7 +325,7 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
        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);
@@ -364,10 +339,10 @@ 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;
+       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 @@ static 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();
@@ -440,7 +405,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;
@@ -463,10 +428,10 @@ 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;
+       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 @@ static 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);
@@ -550,7 +510,7 @@ 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;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
@@ -577,14 +537,9 @@ static 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));
@@ -596,7 +551,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);
 
@@ -605,7 +560,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;
@@ -649,7 +604,7 @@ 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;
@@ -663,32 +618,27 @@ static 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;
 }
 
-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, u32 offset, u32 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;
+       uint8_t status;
        u32 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;
 
@@ -752,14 +702,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                        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,14 +715,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                                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);
@@ -797,7 +737,7 @@ 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)
@@ -812,14 +752,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                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,14 +765,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                        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);
@@ -867,7 +797,7 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch
 {
        flash_bank_t *bank;
        scan_field_t field;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
        jtag_tap_t *tap;
        u32 idcode;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
@@ -894,14 +824,9 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch
        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);
@@ -927,7 +852,7 @@ static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
 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)
@@ -986,7 +911,7 @@ 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;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
@@ -1019,14 +944,9 @@ static 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,14 +957,9 @@ static 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));
@@ -1057,7 +972,7 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
 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)
        {
@@ -1210,7 +1125,7 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_
 
 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)
@@ -1236,7 +1151,7 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx,
 
 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)
openocd with support for Altus Metrum targets