arm11_sc7_action_t -> struct arm11_sc7_action

Remove misleading typedef and redundant suffix from struct arm11_sc7_action.

3 files changed, 10 insertions, 10 deletions

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 47786b81..e5794b8a 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -851,7 +851,7 @@ static int arm11_resume(struct target_s *target, int current,
 
 		for (bp = target->breakpoints; bp; bp = bp->next)
 		{
-			arm11_sc7_action_t	brp[2];
+			struct arm11_sc7_action	brp[2];
 
 			brp[0].write	= 1;
 			brp[0].address	= ARM11_SC7_BVR0 + brp_num;
@@ -1074,7 +1074,7 @@ static int arm11_step(struct target_s *target, int current,
 
 		/* Set up breakpoint for stepping */
 
-		arm11_sc7_action_t	brp[2];
+		struct arm11_sc7_action	brp[2];
 
 		brp[0].write	= 1;
 		brp[0].address	= ARM11_SC7_BVR0;
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index f9582381..65d4f821 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -782,14 +782,14 @@ int arm11_run_instr_data_to_core_via_r0(struct arm11_common * arm11, uint32_t op
 
 /** Apply reads and writes to scan chain 7
  *
- * \see arm11_sc7_action_t
+ * \see struct arm11_sc7_action
  *
  * \param arm11		Target state variable.
  * \param actions	A list of read and/or write instructions
  * \param count		Number of instructions in the list.
  *
  */
-int arm11_sc7_run(struct arm11_common * arm11, arm11_sc7_action_t * actions, size_t count)
+int arm11_sc7_run(struct arm11_common * arm11, struct arm11_sc7_action * actions, size_t count)
 {
 	int retval;
 
@@ -875,8 +875,8 @@ int arm11_sc7_run(struct arm11_common * arm11, arm11_sc7_action_t * actions, siz
  */
 void arm11_sc7_clear_vbw(struct arm11_common * arm11)
 {
-	arm11_sc7_action_t		clear_bw[arm11->brp + arm11->wrp + 1];
-	arm11_sc7_action_t *	pos = clear_bw;
+	struct arm11_sc7_action		clear_bw[arm11->brp + arm11->wrp + 1];
+	struct arm11_sc7_action *	pos = clear_bw;
 
 	for (size_t i = 0; i < asizeof(clear_bw); i++)
 	{
@@ -904,7 +904,7 @@ void arm11_sc7_clear_vbw(struct arm11_common * arm11)
  */
 void arm11_sc7_set_vcr(struct arm11_common * arm11, uint32_t value)
 {
-	arm11_sc7_action_t		set_vcr;
+	struct arm11_sc7_action		set_vcr;
 
 	set_vcr.write		= true;
 	set_vcr.address		= ARM11_SC7_VCR;
diff --git a/src/target/arm11_dbgtap.h b/src/target/arm11_dbgtap.h
index 33ab3ddb..87b66a50 100644
--- a/src/target/arm11_dbgtap.h
+++ b/src/target/arm11_dbgtap.h
@@ -45,7 +45,7 @@ int arm11_add_ir_scan_vc(int num_fields, struct scan_field *fields,
  * Used with arm11_sc7_run to make a list of read/write commands for
  * scan chain 7
  */
-typedef struct arm11_sc7_action_s
+struct arm11_sc7_action
 {
 	bool write; /**< Access mode: true for write, false for read. */
 	uint8_t	address; /**< Register address mode. Use enum #arm11_sc7 */
@@ -54,10 +54,10 @@ typedef struct arm11_sc7_action_s
 	 * this receives the read value when the function returns.
 	 */
 	uint32_t value;
-} arm11_sc7_action_t;
+};
 
 int arm11_sc7_run(struct arm11_common *arm11,
-		arm11_sc7_action_t *actions, size_t count);
+		struct arm11_sc7_action *actions, size_t count);
 
 /* Mid-level helper functions */
 void arm11_sc7_clear_vbw(struct arm11_common *arm11);