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 31517d7aed911b8870bbac4451724c0682a26786..5791e578720b795f24ae10283abb4bafc6b5bfe8 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -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);
 
@@ -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);
 
@@ -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] );