xscale_trace_data_t -> struct xscale_trace_data

Remove misleading typedef and redundant suffix from struct xscale_trace_data.

diff --git a/src/target/xscale.c b/src/target/xscale.c
index d114fecdaad55f832840f7e907ee46f8b11795c7..a6b9fbe73e36365c42889d24c6f09d64561c2987 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -2475,7 +2475,7 @@ static int xscale_read_trace(target_t *target)
 {
        struct xscale_common_s *xscale = target_to_xscale(target);
        struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
 {
        struct xscale_common_s *xscale = target_to_xscale(target);
        struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;

-       xscale_trace_data_t **trace_data_p;
+       struct xscale_trace_data **trace_data_p;

 
        /* 258 words from debug handler
         * 256 trace buffer entries
 
        /* 258 words from debug handler
         * 256 trace buffer entries


@@ -2529,7 +2529,7 @@ static int xscale_read_trace(target_t *target)
        for (trace_data_p = &xscale->trace.data; *trace_data_p; trace_data_p = &(*trace_data_p)->next)
                ;
 
        for (trace_data_p = &xscale->trace.data; *trace_data_p; trace_data_p = &(*trace_data_p)->next)
                ;
 

-       *trace_data_p = malloc(sizeof(xscale_trace_data_t));
+       *trace_data_p = malloc(sizeof(struct xscale_trace_data));

        (*trace_data_p)->next = NULL;
        (*trace_data_p)->chkpt0 = trace_buffer[256];
        (*trace_data_p)->chkpt1 = trace_buffer[257];
        (*trace_data_p)->next = NULL;
        (*trace_data_p)->chkpt0 = trace_buffer[256];
        (*trace_data_p)->chkpt1 = trace_buffer[257];


@@ -2614,7 +2614,7 @@ static int xscale_read_instruction(target_t *target,
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-static int xscale_branch_address(xscale_trace_data_t *trace_data,
+static int xscale_branch_address(struct xscale_trace_data *trace_data,

                int i, uint32_t *target)
 {
        /* if there are less than four entries prior to the indirect branch message
                int i, uint32_t *target)
 {
        /* if there are less than four entries prior to the indirect branch message


@@ -2635,7 +2635,7 @@ static int xscale_analyze_trace(target_t *target, command_context_t *cmd_ctx)
        struct xscale_common_s *xscale = target_to_xscale(target);
        int next_pc_ok = 0;
        uint32_t next_pc = 0x0;
        struct xscale_common_s *xscale = target_to_xscale(target);
        int next_pc_ok = 0;
        uint32_t next_pc = 0x0;

-       xscale_trace_data_t *trace_data = xscale->trace.data;
+       struct xscale_trace_data *trace_data = xscale->trace.data;

        int retval;
 
        while (trace_data)
        int retval;
 
        while (trace_data)


@@ -3308,7 +3308,7 @@ COMMAND_HANDLER(xscale_handle_trace_buffer_command)
 
        if ((argc >= 1) && (strcmp("enable", args[0]) == 0))
        {
 
        if ((argc >= 1) && (strcmp("enable", args[0]) == 0))
        {

-               xscale_trace_data_t *td, *next_td;
+               struct xscale_trace_data *td, *next_td;

                xscale->trace.buffer_enabled = 1;
 
                /* free old trace data */
                xscale->trace.buffer_enabled = 1;
 
                /* free old trace data */


@@ -3419,7 +3419,7 @@ COMMAND_HANDLER(xscale_handle_dump_trace_command)
 {
        target_t *target = get_current_target(cmd_ctx);
        struct xscale_common_s *xscale = target_to_xscale(target);
 {
        target_t *target = get_current_target(cmd_ctx);
        struct xscale_common_s *xscale = target_to_xscale(target);

-       xscale_trace_data_t *trace_data;
+       struct xscale_trace_data *trace_data;

        struct fileio file;
        int retval;
 
        struct fileio file;
        int retval;
 

diff --git a/src/target/xscale.h b/src/target/xscale.h
index d5de8dc8d71f69ff56bb515c3efc711fad8b6177..a47bce72a85ccd048ed57c474ef33cb1f2c8fc46 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -56,21 +56,21 @@ typedef struct xscale_trace_entry_s
        enum xscale_trace_entry_type type;
 } xscale_trace_entry_t;
 
        enum xscale_trace_entry_type type;
 } xscale_trace_entry_t;
 

-typedef struct xscale_trace_data_s
+struct xscale_trace_data

 {
        xscale_trace_entry_t *entries;
        int depth;
        uint32_t chkpt0;
        uint32_t chkpt1;
        uint32_t last_instruction;
 {
        xscale_trace_entry_t *entries;
        int depth;
        uint32_t chkpt0;
        uint32_t chkpt1;
        uint32_t last_instruction;

-       struct xscale_trace_data_s *next;
-} xscale_trace_data_t;
+       struct xscale_trace_data *next;
+};

 
 typedef struct xscale_trace_s
 {
        trace_status_t capture_status;  /* current state of capture run */
        struct image_s *image;                                  /* source for target opcodes */
 
 typedef struct xscale_trace_s
 {
        trace_status_t capture_status;  /* current state of capture run */
        struct image_s *image;                                  /* source for target opcodes */

-       xscale_trace_data_t *data;              /* linked list of collected trace data */
+       struct xscale_trace_data *data;         /* linked list of collected trace data */

        int buffer_enabled;                             /* whether trace buffer is enabled */
        int buffer_fill;                                /* maximum number of trace runs to read (-1 for wrap-around) */
        int pc_ok;
        int buffer_enabled;                             /* whether trace buffer is enabled */
        int buffer_fill;                                /* maximum number of trace runs to read (-1 for wrap-around) */
        int pc_ok;