X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetb.c;h=709bb008057ac8d686df6ec95533384184f244a0;hb=40580e2d71ac56131a5da7e5f67a0b63450e4f24;hp=af474e84a41cc3eff1df1f3719ffc07c55fa5972;hpb=cb434c21af5066899c5013a3a3490471f91d4b43;p=openocd.git diff --git a/src/target/etb.c b/src/target/etb.c index af474e84a4..709bb00805 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -62,14 +62,17 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char int etb_set_instr(etb_t *etb, u32 new_instr) { - jtag_device_t *device = jtag_get_device(etb->chain_pos); + jtag_tap_t *tap; + tap = etb->tap; + if (tap==NULL) + return ERROR_FAIL; - if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr) + if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) { scan_field_t field; - field.device = etb->chain_pos; - field.num_bits = device->ir_length; + field.tap = tap; + 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; @@ -79,7 +82,7 @@ int etb_set_instr(etb_t *etb, u32 new_instr) field.in_handler = NULL; field.in_handler_priv = NULL; - jtag_add_ir_scan(1, &field, -1); + jtag_add_ir_scan(1, &field, TAP_INVALID); free(field.out_value); } @@ -93,7 +96,7 @@ int etb_scann(etb_t *etb, u32 new_scan_chain) { scan_field_t field; - field.device = etb->chain_pos; + field.tap = etb->tap; field.num_bits = 5; field.out_value = calloc(CEIL(field.num_bits, 8), 1); buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain); @@ -106,7 +109,7 @@ int etb_scann(etb_t *etb, u32 new_scan_chain) /* select INTEST instruction */ etb_set_instr(etb, 0x2); - jtag_add_dr_scan(1, &field, -1); + jtag_add_dr_scan(1, &field, TAP_INVALID); etb->cur_scan_chain = new_scan_chain; @@ -181,11 +184,11 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames) scan_field_t fields[3]; int i; - jtag_add_end_state(TAP_RTI); + jtag_add_end_state(TAP_IDLE); etb_scann(etb, 0x0); etb_set_instr(etb, 0xc); - fields[0].device = etb->chain_pos; + fields[0].tap = etb->tap; fields[0].num_bits = 32; fields[0].out_value = NULL; fields[0].out_mask = NULL; @@ -195,7 +198,7 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames) fields[0].in_handler = NULL; fields[0].in_handler_priv = NULL; - fields[1].device = etb->chain_pos; + fields[1].tap = etb->tap; fields[1].num_bits = 7; fields[1].out_value = malloc(1); buf_set_u32(fields[1].out_value, 0, 7, 4); @@ -206,7 +209,7 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames) fields[1].in_handler = NULL; fields[1].in_handler_priv = NULL; - fields[2].device = etb->chain_pos; + fields[2].tap = etb->tap; fields[2].num_bits = 1; fields[2].out_value = malloc(1); buf_set_u32(fields[2].out_value, 0, 1, 0); @@ -217,7 +220,7 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames) fields[2].in_handler = NULL; fields[2].in_handler_priv = NULL; - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); fields[0].in_handler = buf_to_u32_handler; @@ -233,7 +236,7 @@ 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_handler_priv = &data[i]; - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); } jtag_execute_queue(); @@ -252,11 +255,11 @@ 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_RTI); + jtag_add_end_state(TAP_IDLE); etb_scann(etb_reg->etb, 0x0); etb_set_instr(etb_reg->etb, 0xc); - fields[0].device = etb_reg->etb->chain_pos; + fields[0].tap = etb_reg->etb->tap; fields[0].num_bits = 32; fields[0].out_value = reg->value; fields[0].out_mask = NULL; @@ -266,7 +269,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) fields[0].in_handler = NULL; fields[0].in_handler_priv = NULL; - fields[1].device = etb_reg->etb->chain_pos; + fields[1].tap = etb_reg->etb->tap; fields[1].num_bits = 7; fields[1].out_value = malloc(1); buf_set_u32(fields[1].out_value, 0, 7, reg_addr); @@ -277,7 +280,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) fields[1].in_handler = NULL; fields[1].in_handler_priv = NULL; - fields[2].device = etb_reg->etb->chain_pos; + fields[2].tap = etb_reg->etb->tap; fields[2].num_bits = 1; fields[2].out_value = malloc(1); buf_set_u32(fields[2].out_value, 0, 1, 0); @@ -288,7 +291,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) fields[2].in_handler = NULL; fields[2].in_handler_priv = NULL; - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); /* read the identification register in the second run, to make sure we * don't read the ETB data register twice, skipping every second entry @@ -298,7 +301,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) jtag_set_check_value(fields+0, check_value, check_mask, NULL); - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); free(fields[1].out_value); free(fields[2].out_value); @@ -348,11 +351,11 @@ int etb_write_reg(reg_t *reg, u32 value) LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value); - jtag_add_end_state(TAP_RTI); + jtag_add_end_state(TAP_IDLE); etb_scann(etb_reg->etb, 0x0); etb_set_instr(etb_reg->etb, 0xc); - fields[0].device = etb_reg->etb->chain_pos; + fields[0].tap = etb_reg->etb->tap; fields[0].num_bits = 32; fields[0].out_value = malloc(4); buf_set_u32(fields[0].out_value, 0, 32, value); @@ -363,7 +366,7 @@ int etb_write_reg(reg_t *reg, u32 value) fields[0].in_handler = NULL; fields[0].in_handler_priv = NULL; - fields[1].device = etb_reg->etb->chain_pos; + fields[1].tap = etb_reg->etb->tap; fields[1].num_bits = 7; fields[1].out_value = malloc(1); buf_set_u32(fields[1].out_value, 0, 7, reg_addr); @@ -374,7 +377,7 @@ int etb_write_reg(reg_t *reg, u32 value) fields[1].in_handler = NULL; fields[1].in_handler_priv = NULL; - fields[2].device = etb_reg->etb->chain_pos; + fields[2].tap = etb_reg->etb->tap; fields[2].num_bits = 1; fields[2].out_value = malloc(1); buf_set_u32(fields[2].out_value, 0, 1, 1); @@ -385,7 +388,7 @@ int etb_write_reg(reg_t *reg, u32 value) fields[2].in_handler = NULL; fields[2].in_handler_priv = NULL; - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); free(fields[0].out_value); free(fields[1].out_value); @@ -413,7 +416,7 @@ int etb_register_commands(struct command_context_s *cmd_ctx) int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target; - jtag_device_t *jtag_device; + jtag_tap_t *tap; armv4_5_common_t *armv4_5; arm7_9_common_t *arm7_9; @@ -436,22 +439,21 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_FAIL; } - jtag_device = jtag_get_device(strtoul(args[1], NULL, 0)); - - if (!jtag_device) - { - LOG_ERROR("jtag device number '%s' not defined", args[1]); + tap = jtag_TapByString( args[1] ); + if( tap == NULL ){ + command_print(cmd_ctx, "Tap: %s does not exist", args[1] ); return ERROR_FAIL; } + if (arm7_9->etm_ctx) { etb_t *etb = malloc(sizeof(etb_t)); arm7_9->etm_ctx->capture_driver_priv = etb; - etb->chain_pos = strtoul(args[1], NULL, 0); - etb->cur_scan_chain = -1; + etb->tap = tap; + etb->cur_scan_chain = ~0UL; etb->reg_cache = NULL; etb->ram_width = 0; etb->ram_depth = 0;