summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-13 08:40:18 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-13 11:58:09 -0800
commit1ad4ee2deb5a888cb9f9b825a0e4fbfa68aa1218 (patch)
tree760a15f4c0348092b16f699370545cbb3e606a3b
parent5f68f45186c1fe73e1c83bd5847edd6bfaf06b34 (diff)
downloadopenocd_libswd-1ad4ee2deb5a888cb9f9b825a0e4fbfa68aa1218.tar.gz
openocd_libswd-1ad4ee2deb5a888cb9f9b825a0e4fbfa68aa1218.tar.bz2
openocd_libswd-1ad4ee2deb5a888cb9f9b825a0e4fbfa68aa1218.tar.xz
openocd_libswd-1ad4ee2deb5a888cb9f9b825a0e4fbfa68aa1218.zip
arm966e_common_t -> struct arm966e_common
Remove misleading typedef and redundant suffix from struct arm966e_common.
-rw-r--r--src/target/arm966e.c8
-rw-r--r--src/target/arm966e.h10
-rw-r--r--src/target/feroceon.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index c752aea3..18e904e6 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -32,7 +32,7 @@
#define _DEBUG_INSTRUCTION_EXECUTION_
#endif
-int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, struct jtag_tap *tap)
+int arm966e_init_arch_info(target_t *target, struct arm966e_common *arm966e, struct jtag_tap *tap)
{
arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
@@ -52,13 +52,13 @@ int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, struct j
static int arm966e_target_create(struct target_s *target, Jim_Interp *interp)
{
- arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
+ struct arm966e_common *arm966e = calloc(1,sizeof(struct arm966e_common));
return arm966e_init_arch_info(target, arm966e, target->tap);
}
static int arm966e_verify_pointer(struct command_context_s *cmd_ctx,
- struct arm966e_common_s *arm966e)
+ struct arm966e_common *arm966e)
{
if (arm966e->common_magic != ARM966E_COMMON_MAGIC) {
command_print(cmd_ctx, "target is not an ARM966");
@@ -166,7 +166,7 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
{
int retval;
target_t *target = get_current_target(cmd_ctx);
- struct arm966e_common_s *arm966e = target_to_arm966(target);
+ struct arm966e_common *arm966e = target_to_arm966(target);
retval = arm966e_verify_pointer(cmd_ctx, arm966e);
if (retval != ERROR_OK)
diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index e311659f..d8f9cc42 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -27,22 +27,22 @@
#define ARM966E_COMMON_MAGIC 0x20f920f9
-typedef struct arm966e_common_s
+struct arm966e_common
{
arm9tdmi_common_t arm9tdmi_common;
int common_magic;
uint32_t cp15_control_reg;
-} arm966e_common_t;
+};
-static inline struct arm966e_common_s *
+static inline struct arm966e_common *
target_to_arm966(struct target_s *target)
{
- return container_of(target->arch_info, struct arm966e_common_s,
+ return container_of(target->arch_info, struct arm966e_common,
arm9tdmi_common.arm7_9_common.armv4_5_common);
}
int arm966e_init_arch_info(target_t *target,
- arm966e_common_t *arm966e, struct jtag_tap *tap);
+ struct arm966e_common *arm966e, struct jtag_tap *tap);
int arm966e_register_commands(struct command_context_s *cmd_ctx);
int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index 3026ed22..73c0e57c 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -632,7 +632,7 @@ int feroceon_target_create(struct target_s *target, Jim_Interp *interp)
int dragonite_target_create(struct target_s *target, Jim_Interp *interp)
{
- arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
+ struct arm966e_common *arm966e = calloc(1,sizeof(struct arm966e_common));
arm966e_init_arch_info(target, arm966e, target->tap);
feroceon_common_setup(target);