From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 16:41:07 +0000 (-0800)
Subject: armv4_5_algorithm_t -> struct armv4_5_algorithm
X-Git-Tag: v0.4.0-rc1~685
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15e8e4530866454c18c5d91ad9e867f339c2e82b;p=openocd

armv4_5_algorithm_t -> struct armv4_5_algorithm

Remove misleading typedef and redundant suffix from struct armv4_5_algorithm.
---

diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c
index 931db5a7..ebda702a 100644
--- a/src/flash/aduc702x.c
+++ b/src/flash/aduc702x.c
@@ -164,7 +164,7 @@ static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint
 	working_area_t *source;
 	uint32_t address = bank->base + offset;
 	struct reg_param reg_params[6];
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	int retval = ERROR_OK;
 
 	if (((count%2)!=0)||((offset%2)!=0))
diff --git a/src/flash/arm_nandio.c b/src/flash/arm_nandio.c
index 0453656e..63dcaebb 100644
--- a/src/flash/arm_nandio.c
+++ b/src/flash/arm_nandio.c
@@ -42,7 +42,7 @@
 int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
 {
 	target_t		*target = nand->target;
-	armv4_5_algorithm_t	algo;
+	struct armv4_5_algorithm	algo;
 	armv4_5_common_t	*armv4_5 = target->arch_info;
 	struct reg_param		reg_params[3];
 	uint32_t		target_buf;
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index fd9c2a74..c0c2cb79 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -1021,7 +1021,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 	target_t *target = bank->target;
 	struct reg_param reg_params[7];
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	working_area_t *source;
 	uint32_t buffer_size = 32768;
 	uint32_t write_command_val, busy_pattern_val, error_pattern_val;
@@ -1266,7 +1266,7 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer,
 	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 	target_t *target = bank->target;
 	struct reg_param reg_params[10];
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	working_area_t *source;
 	uint32_t buffer_size = 32768;
 	uint32_t status;
diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index 97566d4a..0a97bda1 100644
--- a/src/flash/ecos.c
+++ b/src/flash/ecos.c
@@ -207,7 +207,7 @@ static int runCode(struct ecosflash_flash_bank *info,
 	target_t *target = info->target;
 
 	struct reg_param reg_params[3];
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
 	armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
 	armv4_5_info.core_state = ARMV4_5_STATE_ARM;
diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index 05c08dd6..a2c09d20 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -241,7 +241,7 @@ static int lpc2000_iap_call(flash_bank_t *bank, int code, uint32_t param_table[5
 	target_t *target = bank->target;
 	struct mem_param mem_params[2];
 	struct reg_param reg_params[5];
-	armv4_5_algorithm_t armv4_5_info; /* for LPC2000 */
+	struct armv4_5_algorithm armv4_5_info; /* for LPC2000 */
 	armv7m_algorithm_t armv7m_info;   /* for LPC1700 */
  	uint32_t status_code;
 	uint32_t iap_entry_point = 0; /* to make compiler happier */
diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c
index 8d1eeb8f..f6b3bf6f 100644
--- a/src/flash/lpc2900.c
+++ b/src/flash/lpc2900.c
@@ -1314,7 +1314,7 @@ static int lpc2900_write(struct flash_bank_s *bank, uint8_t *buffer,
 	if( warea )
 	{
 		struct reg_param reg_params[5];
-		armv4_5_algorithm_t armv4_5_info;
+		struct armv4_5_algorithm armv4_5_info;
 
 		/* We can use target mode. Download the algorithm. */
 		retval = target_write_buffer( target,
diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index c594c966..68ba26eb 100644
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -316,7 +316,7 @@ static int str7x_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[6];
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	int retval = ERROR_OK;
 
 	uint32_t str7x_flash_write_code[] = {
diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index c3649085..bae895d2 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -354,7 +354,7 @@ static int str9x_write_block(struct flash_bank_s *bank,
 	working_area_t *source;
 	uint32_t address = bank->base + offset;
 	struct reg_param reg_params[4];
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	int retval = ERROR_OK;
 
 	uint32_t str9x_flash_write_code[] = {
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 65f26875..75998fe9 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2690,7 +2690,7 @@ int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count,
 		}
 	}
 
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	struct reg_param reg_params[1];
 
 	armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
@@ -2724,7 +2724,7 @@ int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count,
 int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* checksum)
 {
 	working_area_t *crc_algorithm;
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	struct reg_param reg_params[2];
 	int retval;
 
@@ -2809,7 +2809,7 @@ int arm7_9_blank_check_memory(struct target_s *target, uint32_t address, uint32_
 {
 	working_area_t *erase_check_algorithm;
 	struct reg_param reg_params[3];
-	armv4_5_algorithm_t armv4_5_info;
+	struct armv4_5_algorithm armv4_5_info;
 	int retval;
 	uint32_t i;
 
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 0dd047dd..a89b98b8 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -546,7 +546,7 @@ static int armv4_5_run_algorithm_completion(struct target_s *target, uint32_t ex
 int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info))
 {
 	struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
-	armv4_5_algorithm_t *armv4_5_algorithm_info = arch_info;
+	struct armv4_5_algorithm *armv4_5_algorithm_info = arch_info;
 	enum armv4_5_state core_state = armv4_5->core_state;
 	enum armv4_5_mode core_mode = armv4_5->core_mode;
 	uint32_t context[17];
diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index c6686f1e..22069d1b 100644
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -119,13 +119,13 @@ static inline bool is_arm(struct arm *arm)
 	return arm && arm->common_magic == ARMV4_5_COMMON_MAGIC;
 }
 
-typedef struct armv4_5_algorithm_s
+struct armv4_5_algorithm
 {
 	int common_magic;
 
 	enum armv4_5_mode core_mode;
 	enum armv4_5_state core_state;
-} armv4_5_algorithm_t;
+};
 
 typedef struct armv4_5_core_reg_s
 {