Factor load_image argument parsing to parse_load_image_command_args:

[openocd.git] / src / target / etb.c

diff --git a/src/target/etb.c b/src/target/etb.c
index 5d0d06be76f2e7f444edcb19df4907791d64c334..5791e578720b795f24ae10283abb4bafc6b5bfe8 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -63,7 +63,7 @@ static int etb_set_instr(etb_t *etb, u32 new_instr)
 
                field.in_value = NULL;
 
-               jtag_add_ir_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+               jtag_add_ir_scan(1, &field, jtag_get_end_state());
 
                free(field.out_value);
        }
@@ -86,7 +86,7 @@ static int etb_scann(etb_t *etb, u32 new_scan_chain)
 
                /* select INTEST instruction */
                etb_set_instr(etb, 0x2);
-               jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+               jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
                etb->cur_scan_chain = new_scan_chain;
 
@@ -169,7 +169,7 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
        scan_field_t fields[3];
        int i;
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
        etb_scann(etb, 0x0);
        etb_set_instr(etb, 0xc);
 
@@ -190,7 +190,7 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
        buf_set_u32(fields[2].out_value, 0, 1, 0);
        fields[2].in_value = NULL;
 
-       jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+       jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
        for (i = 0; i < num_frames; i++)
        {
@@ -204,7 +204,7 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
                        buf_set_u32(fields[1].out_value, 0, 7, 0);
 
                fields[0].in_value = (u8 *)(data+i);
-               jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+               jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
                jtag_add_callback(etb_getbuf, (u8 *)(data+i));
        }
@@ -225,7 +225,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
 
        LOG_DEBUG("%i", etb_reg->addr);
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
        etb_scann(etb_reg->etb, 0x0);
        etb_set_instr(etb_reg->etb, 0xc);
 
@@ -252,7 +252,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
        fields[2].check_value = NULL;
        fields[2].check_mask = NULL;
 
-       jtag_add_dr_scan(3, fields, jtag_add_end_state(TAP_INVALID));
+       jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
        /* read the identification register in the second run, to make sure we
         * don't read the ETB data register twice, skipping every second entry
@@ -262,7 +262,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
        fields[0].check_value = check_value;
        fields[0].check_mask = check_mask;
 
-       jtag_add_dr_scan_check(3, fields, jtag_add_end_state(TAP_INVALID));
+       jtag_add_dr_scan_check(3, fields, jtag_get_end_state());
 
        free(fields[1].out_value);
        free(fields[2].out_value);
@@ -314,7 +314,7 @@ int etb_write_reg(reg_t *reg, u32 value)
 
        LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value);
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
        etb_scann(etb_reg->etb, 0x0);
        etb_set_instr(etb_reg->etb, 0xc);
 
@@ -386,7 +386,7 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm
                return ERROR_FAIL;
        }
 
-       tap = jtag_TapByString( args[1] );
+       tap = jtag_tap_by_string( args[1] );
        if (tap == NULL)
        {
                command_print(cmd_ctx, "Tap: %s does not exist", args[1] );