armv7m_algorithm_t -> struct armv7m_algorithm

Remove misleading typedef and redundant suffix from struct armv7m_algorithm.

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index a2c09d20710a1792430875600c3c9c6a9e8cb7b4..31e81b3bb651c5adec0419a2d7e0b00b493e18bb 100644 (file)
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -242,7 +242,7 @@ static int lpc2000_iap_call(flash_bank_t *bank, int code, uint32_t param_table[5
        struct mem_param mem_params[2];
        struct reg_param reg_params[5];
        struct armv4_5_algorithm armv4_5_info; /* for LPC2000 */
-       armv7m_algorithm_t armv7m_info;   /* for LPC1700 */
+       struct armv7m_algorithm armv7m_info;   /* for LPC1700 */
        uint32_t status_code;
        uint32_t iap_entry_point = 0; /* to make compiler happier */
 

diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index 32481273a8705fd184c7c73731a6bbe524f64250..01252bbf67a79387bd85f10b2822c9d41d68b7c7 100644 (file)
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -307,7 +307,7 @@ static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint3
        int retval = ERROR_OK;
 #if 0
        struct pic32mx_flash_bank *pic32mx_info = bank->driver_priv;
-       armv7m_algorithm_t armv7m_info;
+       struct armv7m_algorithm armv7m_info;
 
        uint8_t pic32mx_flash_write_code[] = {
                                                                        /* write: */

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index bc5d10a8e404f02eda39fab18f0ac60a860785a0..cdeccbe102bf7d70afd02ddaeda467752c2d7b8d 100644 (file)
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -836,7 +836,7 @@ static int stellaris_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
        working_area_t *write_algorithm;
        uint32_t address = bank->base + offset;
        struct reg_param reg_params[3];
-       armv7m_algorithm_t armv7m_info;
+       struct armv7m_algorithm armv7m_info;
        int retval = ERROR_OK;
 
        LOG_DEBUG("(bank=%p buffer=%p offset=%08" PRIx32 " wcount=%08" PRIx32 "",

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index e69fb564af82f279d2368a219f15a34c1be9d2e1..a63ff60b4ad426ca074bc0e3faf82599c92e1a05 100644 (file)
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -438,7 +438,7 @@ static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32
        working_area_t *source;
        uint32_t address = bank->base + offset;
        struct reg_param reg_params[4];
-       armv7m_algorithm_t armv7m_info;
+       struct armv7m_algorithm armv7m_info;
        int retval = ERROR_OK;
 
        uint8_t stm32x_flash_write_code[] = {

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 7fb73946c9ef113c5d0e62744adb7630700adbb3..3ce6d7a8fb9fa5fc4f99ef3a0e086b564beed11d 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -363,7 +363,7 @@ int armv7m_run_algorithm(struct target_s *target,
        int timeout_ms, void *arch_info)
 {
        struct armv7m_common *armv7m = target_to_armv7m(target);
-       armv7m_algorithm_t *armv7m_algorithm_info = arch_info;
+       struct armv7m_algorithm *armv7m_algorithm_info = arch_info;
        enum armv7m_mode core_mode = armv7m->core_mode;
        int retval = ERROR_OK;
        int i;
@@ -589,7 +589,7 @@ int armv7m_checksum_memory(struct target_s *target,
                uint32_t address, uint32_t count, uint32_t* checksum)
 {
        working_area_t *crc_algorithm;
-       armv7m_algorithm_t armv7m_info;
+       struct armv7m_algorithm armv7m_info;
        struct reg_param reg_params[2];
        int retval;
 
@@ -673,7 +673,7 @@ int armv7m_blank_check_memory(struct target_s *target,
 {
        working_area_t *erase_check_algorithm;
        struct reg_param reg_params[3];
-       armv7m_algorithm_t armv7m_info;
+       struct armv7m_algorithm armv7m_info;
        int retval;
        uint32_t i;
 

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 602bf314f6955ef8b1c31d76e8cf1e9dc6090e89..6e857ee4316c8f685c0d9b3ac6b91ec39a7e8633 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -119,12 +119,12 @@ target_to_armv7m(struct target_s *target)
        return target->arch_info;
 }
 
-typedef struct armv7m_algorithm_s
+struct armv7m_algorithm
 {
        int common_magic;
 
        enum armv7m_mode core_mode;
-} armv7m_algorithm_t;
+};
 
 typedef struct armv7m_core_reg_s
 {