command_t -> struct command

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

diff --git a/src/target/etb.c b/src/target/etb.c
index c0c485fe2c15e5461e130ceabe79e88c51859245..2e8e7ca4bb6027cd6b972b6a69824de43f441976 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -40,11 +40,11 @@ static char* etb_reg_list[] =
 
 static int etb_reg_arch_type = -1;
 
-static int etb_get_reg(reg_t *reg);
+static int etb_get_reg(struct reg *reg);
 
-static int etb_set_instr(etb_t *etb, uint32_t new_instr)
+static int etb_set_instr(struct etb *etb, uint32_t new_instr)
 {
-       jtag_tap_t *tap;
+       struct jtag_tap *tap;
 
        tap = etb->tap;
        if (tap == NULL)
@@ -52,7 +52,7 @@ static int etb_set_instr(etb_t *etb, uint32_t new_instr)
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
        {
-               scan_field_t field;
+               struct scan_field field;
 
                field.tap = tap;
                field.num_bits = tap->ir_length;
@@ -69,11 +69,11 @@ static int etb_set_instr(etb_t *etb, uint32_t new_instr)
        return ERROR_OK;
 }
 
-static int etb_scann(etb_t *etb, uint32_t new_scan_chain)
+static int etb_scann(struct etb *etb, uint32_t new_scan_chain)
 {
        if (etb->cur_scan_chain != new_scan_chain)
        {
-               scan_field_t field;
+               struct scan_field field;
 
                field.tap = etb->tap;
                field.num_bits = 5;
@@ -94,15 +94,15 @@ static int etb_scann(etb_t *etb, uint32_t new_scan_chain)
        return ERROR_OK;
 }
 
-static int etb_read_reg_w_check(reg_t *, uint8_t *, uint8_t *);
-static int etb_set_reg_w_exec(reg_t *, uint8_t *);
+static int etb_read_reg_w_check(struct reg *, uint8_t *, uint8_t *);
+static int etb_set_reg_w_exec(struct reg *, uint8_t *);
 
-static int etb_read_reg(reg_t *reg)
+static int etb_read_reg(struct reg *reg)
 {
        return etb_read_reg_w_check(reg, NULL, NULL);
 }
 
-static int etb_get_reg(reg_t *reg)
+static int etb_get_reg(struct reg *reg)
 {
        int retval;
 
@@ -121,11 +121,11 @@ static int etb_get_reg(reg_t *reg)
        return ERROR_OK;
 }
 
-reg_cache_t* etb_build_reg_cache(etb_t *etb)
+struct reg_cache* etb_build_reg_cache(struct etb *etb)
 {
-       reg_cache_t *reg_cache = malloc(sizeof(reg_cache_t));
-       reg_t *reg_list = NULL;
-       etb_reg_t *arch_info = NULL;
+       struct reg_cache *reg_cache = malloc(sizeof(struct reg_cache));
+       struct reg *reg_list = NULL;
+       struct etb_reg *arch_info = NULL;
        int num_regs = 9;
        int i;
 
@@ -134,8 +134,8 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb)
                etb_reg_arch_type = register_reg_arch_type(etb_get_reg, etb_set_reg_w_exec);
 
        /* the actual registers are kept in two arrays */
-       reg_list = calloc(num_regs, sizeof(reg_t));
-       arch_info = calloc(num_regs, sizeof(etb_reg_t));
+       reg_list = calloc(num_regs, sizeof(struct reg));
+       arch_info = calloc(num_regs, sizeof(struct etb_reg));
 
        /* fill in values for the reg cache */
        reg_cache->name = "etb registers";
@@ -171,9 +171,9 @@ static void etb_getbuf(jtag_callback_data_t arg)
 }
 
 
-static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames)
+static int etb_read_ram(struct etb *etb, uint32_t *data, int num_frames)
 {
-       scan_field_t fields[3];
+       struct scan_field fields[3];
        int i;
 
        jtag_set_end_state(TAP_IDLE);
@@ -224,12 +224,12 @@ static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames)
        return ERROR_OK;
 }
 
-static int etb_read_reg_w_check(reg_t *reg,
+static int etb_read_reg_w_check(struct reg *reg,
                uint8_t* check_value, uint8_t* check_mask)
 {
-       etb_reg_t *etb_reg = reg->arch_info;
+       struct etb_reg *etb_reg = reg->arch_info;
        uint8_t reg_addr = etb_reg->addr & 0x7f;
-       scan_field_t fields[3];
+       struct scan_field fields[3];
 
        LOG_DEBUG("%i", (int)(etb_reg->addr));
 
@@ -278,9 +278,9 @@ static int etb_read_reg_w_check(reg_t *reg,
        return ERROR_OK;
 }
 
-static int etb_write_reg(reg_t *, uint32_t);
+static int etb_write_reg(struct reg *, uint32_t);
 
-static int etb_set_reg(reg_t *reg, uint32_t value)
+static int etb_set_reg(struct reg *reg, uint32_t value)
 {
        int retval;
 
@@ -297,7 +297,7 @@ static int etb_set_reg(reg_t *reg, uint32_t value)
        return ERROR_OK;
 }
 
-static int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf)
+static int etb_set_reg_w_exec(struct reg *reg, uint8_t *buf)
 {
        int retval;
 
@@ -311,11 +311,11 @@ static int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf)
        return ERROR_OK;
 }
 
-static int etb_write_reg(reg_t *reg, uint32_t value)
+static int etb_write_reg(struct reg *reg, uint32_t value)
 {
-       etb_reg_t *etb_reg = reg->arch_info;
+       struct etb_reg *etb_reg = reg->arch_info;
        uint8_t reg_addr = etb_reg->addr & 0x7f;
-       scan_field_t fields[3];
+       struct scan_field fields[3];
 
        LOG_DEBUG("%i: 0x%8.8" PRIx32 "", (int)(etb_reg->addr), value);
 
@@ -351,8 +351,8 @@ static int etb_write_reg(reg_t *reg, uint32_t value)
 
 COMMAND_HANDLER(handle_etb_config_command)
 {
-       target_t *target;
-       jtag_tap_t *tap;
+       struct target *target;
+       struct jtag_tap *tap;
        struct arm *arm;
 
        if (argc != 2)
@@ -384,7 +384,7 @@ COMMAND_HANDLER(handle_etb_config_command)
 
        if (arm->etm)
        {
-               etb_t *etb = malloc(sizeof(etb_t));
+               struct etb *etb = malloc(sizeof(struct etb));
 
                arm->etm->capture_driver_priv = etb;
 
@@ -403,9 +403,9 @@ COMMAND_HANDLER(handle_etb_config_command)
        return ERROR_OK;
 }
 
-static int etb_register_commands(struct command_context_s *cmd_ctx)
+static int etb_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *etb_cmd = register_command(cmd_ctx, NULL, "etb",
+       struct command *etb_cmd = register_command(cmd_ctx, NULL, "etb",
                        NULL, COMMAND_ANY, "Embedded Trace Buffer");
 
        register_command(cmd_ctx, etb_cmd, "config",
@@ -415,9 +415,9 @@ static int etb_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-static int etb_init(etm_context_t *etm_ctx)
+static int etb_init(struct etm_context *etm_ctx)
 {
-       etb_t *etb = etm_ctx->capture_driver_priv;
+       struct etb *etb = etm_ctx->capture_driver_priv;
 
        etb->etm_ctx = etm_ctx;
 
@@ -432,11 +432,11 @@ static int etb_init(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-static trace_status_t etb_status(etm_context_t *etm_ctx)
+static trace_status_t etb_status(struct etm_context *etm_ctx)
 {
-       etb_t *etb = etm_ctx->capture_driver_priv;
-       reg_t *control = &etb->reg_cache->reg_list[ETB_CTRL];
-       reg_t *status = &etb->reg_cache->reg_list[ETB_STATUS];
+       struct etb *etb = etm_ctx->capture_driver_priv;
+       struct reg *control = &etb->reg_cache->reg_list[ETB_CTRL];
+       struct reg *status = &etb->reg_cache->reg_list[ETB_STATUS];
        trace_status_t retval = 0;
        int etb_timeout = 100;
 
@@ -484,9 +484,9 @@ static trace_status_t etb_status(etm_context_t *etm_ctx)
        return retval;
 }
 
-static int etb_read_trace(etm_context_t *etm_ctx)
+static int etb_read_trace(struct etm_context *etm_ctx)
 {
-       etb_t *etb = etm_ctx->capture_driver_priv;
+       struct etb *etb = etm_ctx->capture_driver_priv;
        int first_frame = 0;
        int num_frames = etb->ram_depth;
        uint32_t *trace_data = NULL;
@@ -527,7 +527,7 @@ static int etb_read_trace(etm_context_t *etm_ctx)
        else
                etm_ctx->trace_depth = num_frames;
 
-       etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth);
+       etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
 
        for (i = 0, j = 0; i < num_frames; i++)
        {
@@ -634,9 +634,9 @@ static int etb_read_trace(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-static int etb_start_capture(etm_context_t *etm_ctx)
+static int etb_start_capture(struct etm_context *etm_ctx)
 {
-       etb_t *etb = etm_ctx->capture_driver_priv;
+       struct etb *etb = etm_ctx->capture_driver_priv;
        uint32_t etb_ctrl_value = 0x1;
        uint32_t trigger_count;
 
@@ -668,10 +668,10 @@ static int etb_start_capture(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-static int etb_stop_capture(etm_context_t *etm_ctx)
+static int etb_stop_capture(struct etm_context *etm_ctx)
 {
-       etb_t *etb = etm_ctx->capture_driver_priv;
-       reg_t *etb_ctrl_reg = &etb->reg_cache->reg_list[ETB_CTRL];
+       struct etb *etb = etm_ctx->capture_driver_priv;
+       struct reg *etb_ctrl_reg = &etb->reg_cache->reg_list[ETB_CTRL];
 
        etb_write_reg(etb_ctrl_reg, 0x0);
        jtag_execute_queue();
@@ -682,7 +682,7 @@ static int etb_stop_capture(etm_context_t *etm_ctx)
        return ERROR_OK;
 }
 
-etm_capture_driver_t etb_capture_driver =
+struct etm_capture_driver etb_capture_driver =
 {
        .name = "etb",
        .register_commands = etb_register_commands,