cortex_m3_dwt_comparator_t -> struct cortex_m3_dwt_comparator

Remove misleading typedef and redundant suffix from struct cortex_m3_dwt_comparator.

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index f4958038aef62a931069290548c19d0d5fcaa24b..bbdc85a24a83dd5df1c9ad2f3a80f8c8e47afb19 100644 (file)
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -178,7 +178,7 @@ static int cortex_m3_endreset_event(target_t *target)
        struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
        struct swjdp_common *swjdp = &cortex_m3->armv7m.swjdp_info;
        struct cortex_m3_fp_comparator *fp_list = cortex_m3->fp_comparator_list;
        struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
        struct swjdp_common *swjdp = &cortex_m3->armv7m.swjdp_info;
        struct cortex_m3_fp_comparator *fp_list = cortex_m3->fp_comparator_list;

-       cortex_m3_dwt_comparator_t *dwt_list = cortex_m3->dwt_comparator_list;
+       struct cortex_m3_dwt_comparator *dwt_list = cortex_m3->dwt_comparator_list;

 
        mem_ap_read_atomic_u32(swjdp, DCB_DEMCR, &dcb_demcr);
        LOG_DEBUG("DCB_DEMCR = 0x%8.8" PRIx32 "",dcb_demcr);
 
        mem_ap_read_atomic_u32(swjdp, DCB_DEMCR, &dcb_demcr);
        LOG_DEBUG("DCB_DEMCR = 0x%8.8" PRIx32 "",dcb_demcr);


@@ -1052,7 +1052,7 @@ cortex_m3_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
         * watchpoint using comparator #1; comparator #0 matching cycle
         * count; send data trace info through ITM and TPIU; etc
         */
         * watchpoint using comparator #1; comparator #0 matching cycle
         * count; send data trace info through ITM and TPIU; etc
         */

-       cortex_m3_dwt_comparator_t *comparator;
+       struct cortex_m3_dwt_comparator *comparator;

 
        for (comparator = cortex_m3->dwt_comparator_list;
                        comparator->used && dwt_num < cortex_m3->dwt_num_comp;
 
        for (comparator = cortex_m3->dwt_comparator_list;
                        comparator->used && dwt_num < cortex_m3->dwt_num_comp;


@@ -1100,7 +1100,7 @@ static int
 cortex_m3_unset_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
        struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
 cortex_m3_unset_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
        struct cortex_m3_common *cortex_m3 = target_to_cm3(target);

-       cortex_m3_dwt_comparator_t *comparator;
+       struct cortex_m3_dwt_comparator *comparator;

        int dwt_num;
 
        if (!watchpoint->set)
        int dwt_num;
 
        if (!watchpoint->set)


@@ -1517,7 +1517,7 @@ cortex_m3_dwt_setup(struct cortex_m3_common *cm3, struct target_s *target)
 {
        uint32_t dwtcr;
        struct reg_cache *cache;
 {
        uint32_t dwtcr;
        struct reg_cache *cache;

-       cortex_m3_dwt_comparator_t *comparator;
+       struct cortex_m3_dwt_comparator *comparator;

        int reg, i;
 
        target_read_u32(target, DWT_CTRL, &dwtcr);
        int reg, i;
 
        target_read_u32(target, DWT_CTRL, &dwtcr);


@@ -1533,7 +1533,7 @@ cortex_m3_dwt_setup(struct cortex_m3_common *cm3, struct target_s *target)
        cm3->dwt_num_comp = (dwtcr >> 28) & 0xF;
        cm3->dwt_comp_available = cm3->dwt_num_comp;
        cm3->dwt_comparator_list = calloc(cm3->dwt_num_comp,
        cm3->dwt_num_comp = (dwtcr >> 28) & 0xF;
        cm3->dwt_comp_available = cm3->dwt_num_comp;
        cm3->dwt_comparator_list = calloc(cm3->dwt_num_comp,

-                       sizeof(cortex_m3_dwt_comparator_t));
+                       sizeof(struct cortex_m3_dwt_comparator));

        if (!cm3->dwt_comparator_list) {
 fail0:
                cm3->dwt_num_comp = 0;
        if (!cm3->dwt_comparator_list) {
 fail0:
                cm3->dwt_num_comp = 0;

diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index 82a7d4139ffb485b73b748886a2c0ba65779fd6f..f5dde5b1d61e440c584b0d3317f60547b3028189 100644 (file)
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -127,14 +127,14 @@ struct cortex_m3_fp_comparator
        uint32_t fpcr_address;
 };
 
        uint32_t fpcr_address;
 };
 

-typedef struct  cortex_m3_dwt_comparator_s
+struct cortex_m3_dwt_comparator

 {
        int used;
        uint32_t comp;
        uint32_t mask;
        uint32_t function;
        uint32_t dwt_comparator_address;
 {
        int used;
        uint32_t comp;
        uint32_t mask;
        uint32_t function;
        uint32_t dwt_comparator_address;

-} cortex_m3_dwt_comparator_t;
+};

 
 struct cortex_m3_common
 {
 
 struct cortex_m3_common
 {


@@ -157,7 +157,7 @@ struct cortex_m3_common
        /* Data Watchpoint and Trace (DWT) */
        int dwt_num_comp;
        int dwt_comp_available;
        /* Data Watchpoint and Trace (DWT) */
        int dwt_num_comp;
        int dwt_comp_available;

-       cortex_m3_dwt_comparator_t *dwt_comparator_list;
+       struct cortex_m3_dwt_comparator *dwt_comparator_list;

        struct reg_cache *dwt_cache;
 
        struct armv7m_common armv7m;
        struct reg_cache *dwt_cache;
 
        struct armv7m_common armv7m;