From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 16:41:43 +0000 (-0800)
Subject: armv7m_algorithm_t -> struct armv7m_algorithm
X-Git-Tag: v0.4.0-rc1~676
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=5e43565ab543b1ceff4cc8030434a54ac28dd875

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 a2c09d2071..31e81b3bb6 100644
--- 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 32481273a8..01252bbf67 100644
--- 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 bc5d10a8e4..cdeccbe102 100644
--- 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 e69fb564af..a63ff60b4a 100644
--- 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 7fb73946c9..3ce6d7a8fb 100644
--- 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 602bf314f6..6e857ee431 100644
--- 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
 {