diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-17 01:09:50 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-17 01:09:50 -0800 |
| commit | 0181296f61f11e4390e5a381906021db4ddd4bcd (patch) | |
| tree | 603fd56c8c2925ed3869a79309721c177f6eef8c /src/target/arm926ejs.c | |
| parent | 812ab89f58f43979a402ecf4bef7f09f84695cc6 (diff) | |
| download | openocd+libswd-0181296f61f11e4390e5a381906021db4ddd4bcd.tar.gz openocd+libswd-0181296f61f11e4390e5a381906021db4ddd4bcd.tar.bz2 openocd+libswd-0181296f61f11e4390e5a381906021db4ddd4bcd.tar.xz openocd+libswd-0181296f61f11e4390e5a381906021db4ddd4bcd.zip | |
ARM9TDMI: remove now-needless "struct arm9tdmi"
And move the rest of the vector_catch stuff into the C file;
it's not part of the module interface.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/arm926ejs.c')
| -rw-r--r-- | src/target/arm926ejs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index f305390b..e38e7df4 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -502,7 +502,7 @@ int arm926ejs_arch_state(struct target *target) return ERROR_TARGET_INVALID; } - armv4_5 = &arm926ejs->arm9tdmi_common.arm7_9_common.armv4_5_common; + armv4_5 = &arm926ejs->arm7_9_common.armv4_5_common; LOG_USER("target halted in %s state due to %s, current mode: %s\n" "cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n" @@ -670,12 +670,10 @@ static int arm926ejs_read_phys_memory(struct target *target, int arm926ejs_init_arch_info(struct target *target, struct arm926ejs_common *arm926ejs, struct jtag_tap *tap) { - struct arm9tdmi_common *arm9tdmi = &arm926ejs->arm9tdmi_common; - struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common; + struct arm7_9_common *arm7_9 = &arm926ejs->arm7_9_common; - /* initialize arm9tdmi specific info (including arm7_9 and armv4_5) - */ - arm9tdmi_init_arch_info(target, arm9tdmi, tap); + /* initialize arm7/arm9 specific info (including armv4_5) */ + arm9tdmi_init_arch_info(target, arm7_9, tap); arm926ejs->common_magic = ARM926EJS_COMMON_MAGIC; |