- Fixes '=' whitespace

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

diff --git a/src/target/etb.c b/src/target/etb.c
index 5d0d06be76f2e7f444edcb19df4907791d64c334..979d7a70db87bc824e159628d0d5ae74531faa40 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -44,12 +44,12 @@ static int etb_get_reg(reg_t *reg);
 
 static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
-static int etb_set_instr(etb_t *etb, u32 new_instr)
+static int etb_set_instr(etb_t *etb, uint32_t new_instr)
 {
        jtag_tap_t *tap;
 
        tap = etb->tap;
-       if (tap==NULL)
+       if (tap == NULL)
                return ERROR_FAIL;
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
@@ -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);
        }
@@ -71,7 +71,7 @@ static int etb_set_instr(etb_t *etb, u32 new_instr)
        return ERROR_OK;
 }
 
-static int etb_scann(etb_t *etb, u32 new_scan_chain)
+static int etb_scann(etb_t *etb, uint32_t new_scan_chain)
 {
        if (etb->cur_scan_chain != new_scan_chain)
        {
@@ -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;
 
@@ -158,18 +158,19 @@ static int etb_get_reg(reg_t *reg)
 }
 
 
-static void etb_getbuf(u8 *in)
+static void etb_getbuf(jtag_callback_data_t arg)
 {
-       *((u32 *)in)=buf_get_u32(in, 0, 32);
+  uint8_t *in = (uint8_t *)arg;
+       *((uint32_t *)in) = buf_get_u32(in, 0, 32);
 }
 
 
-static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
+static int etb_read_ram(etb_t *etb, uint32_t *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 +191,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++)
        {
@@ -203,10 +204,10 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
                else
                        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));
+               fields[0].in_value = (uint8_t *)(data+i);
+               jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
-               jtag_add_callback(etb_getbuf, (u8 *)(data+i));
+               jtag_add_callback(etb_getbuf, (jtag_callback_data_t)(data+i));
        }
 
        jtag_execute_queue();
@@ -217,15 +218,15 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
        return ERROR_OK;
 }
 
-int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
+int etb_read_reg_w_check(reg_t *reg, uint8_t* check_value, uint8_t* check_mask)
 {
        etb_reg_t *etb_reg = reg->arch_info;
-       u8 reg_addr = etb_reg->addr & 0x7f;
+       uint8_t reg_addr = etb_reg->addr & 0x7f;
        scan_field_t fields[3];
 
-       LOG_DEBUG("%i", etb_reg->addr);
+       LOG_DEBUG("%i", (int)(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 +253,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 +263,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);
@@ -275,7 +276,7 @@ int etb_read_reg(reg_t *reg)
        return etb_read_reg_w_check(reg, NULL, NULL);
 }
 
-int etb_set_reg(reg_t *reg, u32 value)
+int etb_set_reg(reg_t *reg, uint32_t value)
 {
        int retval;
 
@@ -292,7 +293,7 @@ int etb_set_reg(reg_t *reg, u32 value)
        return ERROR_OK;
 }
 
-int etb_set_reg_w_exec(reg_t *reg, u8 *buf)
+int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf)
 {
        int retval;
 
@@ -306,15 +307,15 @@ int etb_set_reg_w_exec(reg_t *reg, u8 *buf)
        return ERROR_OK;
 }
 
-int etb_write_reg(reg_t *reg, u32 value)
+int etb_write_reg(reg_t *reg, uint32_t value)
 {
        etb_reg_t *etb_reg = reg->arch_info;
-       u8 reg_addr = etb_reg->addr & 0x7f;
+       uint8_t reg_addr = etb_reg->addr & 0x7f;
        scan_field_t fields[3];
 
-       LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value);
+       LOG_DEBUG("%i: 0x%8.8" PRIx32 "", (int)(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 +387,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] );
@@ -469,7 +470,7 @@ static trace_status_t etb_status(etm_context_t *etm_ctx)
 
                        if (etb_timeout == 0)
                        {
-                               LOG_ERROR("AcqComp set but DFEmpty won't go high, ETB status: 0x%x",
+                               LOG_ERROR("AcqComp set but DFEmpty won't go high, ETB status: 0x%" PRIx32 "",
                                        buf_get_u32(etb_status_reg->value, 0, etb_status_reg->size));
                        }
 
@@ -491,7 +492,7 @@ static int etb_read_trace(etm_context_t *etm_ctx)
        etb_t *etb = etm_ctx->capture_driver_priv;
        int first_frame = 0;
        int num_frames = etb->ram_depth;
-       u32 *trace_data = NULL;
+       uint32_t *trace_data = NULL;
        int i, j;
 
        etb_read_reg(&etb->reg_cache->reg_list[ETB_STATUS]);
@@ -514,7 +515,7 @@ static int etb_read_trace(etm_context_t *etm_ctx)
        etb_write_reg(&etb->reg_cache->reg_list[ETB_RAM_READ_POINTER], first_frame);
 
        /* read data into temporary array for unpacking */
-       trace_data = malloc(sizeof(u32) * num_frames);
+       trace_data = malloc(sizeof(uint32_t) * num_frames);
        etb_read_ram(etb, trace_data, num_frames);
 
        if (etm_ctx->trace_depth > 0)
@@ -639,8 +640,8 @@ static int etb_read_trace(etm_context_t *etm_ctx)
 static int etb_start_capture(etm_context_t *etm_ctx)
 {
        etb_t *etb = etm_ctx->capture_driver_priv;
-       u32 etb_ctrl_value = 0x1;
-       u32 trigger_count;
+       uint32_t etb_ctrl_value = 0x1;
+       uint32_t trigger_count;
 
        if ((etm_ctx->portmode & ETM_PORT_MODE_MASK) == ETM_PORT_DEMUXED)
        {