summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-14 20:58:28 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-14 20:58:28 +0000
commitd58229e73bf0fcb0da00c85985dd665fe4593fd4 (patch)
tree7177614dfaea42acf9c943dd5a98b9ac1f7e31a6 /src/target
parent347db1b7364d8246bd8827f29efd0a829f1ffa16 (diff)
downloadopenocd_libswd-d58229e73bf0fcb0da00c85985dd665fe4593fd4.tar.gz
openocd_libswd-d58229e73bf0fcb0da00c85985dd665fe4593fd4.tar.bz2
openocd_libswd-d58229e73bf0fcb0da00c85985dd665fe4593fd4.tar.xz
openocd_libswd-d58229e73bf0fcb0da00c85985dd665fe4593fd4.zip
- remove build warnings
- add missing svn props git-svn-id: svn://svn.berlios.de/openocd/trunk@1062 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target')
-rw-r--r--src/target/arm9tdmi.c2
-rw-r--r--src/target/armv7m.c12
-rw-r--r--src/target/mips_m4k.c16
-rw-r--r--src/target/target.h1
-rw-r--r--src/target/target/test_reset_syntax_error.cfg30
-rw-r--r--src/target/target/test_syntax_error.cfg6
6 files changed, 34 insertions, 33 deletions
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 5691bb76..69e9b797 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -470,7 +470,7 @@ void arm9tdmi_change_to_arm(target_t *target, u32 *r0, u32 *pc)
if((retval = jtag_execute_queue()) != ERROR_OK)
{
- return retval;
+ return;
}
/* fix program counter:
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 6dc224f9..ec9aad0c 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -632,12 +632,12 @@ int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u
u16 erase_check_code[] =
{
/* loop: */
- 0xF810, 0x3B01, /* ldrb r3, [r0], #1 */
- 0xEA02, 0x0203, /* and r2, r2, r3 */
- 0x3901, /* subs r1, r1, #1 */
- 0xD1F9, /* bne loop */
- /* end: */
- 0xE7FE, /* b end */
+ 0xF810, 0x3B01, /* ldrb r3, [r0], #1 */
+ 0xEA02, 0x0203, /* and r2, r2, r3 */
+ 0x3901, /* subs r1, r1, #1 */
+ 0xD1F9, /* bne loop */
+ /* end: */
+ 0xE7FE, /* b end */
};
/* make sure we have a working area */
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 04c9a1ef..0e544df7 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -236,7 +236,7 @@ int mips_m4k_assert_reset(target_t *target)
mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
if (!(jtag_reset_config & RESET_HAS_SRST))
{
@@ -278,12 +278,12 @@ int mips_m4k_assert_reset(target_t *target)
mips32_invalidate_core_regs(target);
- if (target->reset_halt)
- {
- int retval;
+ if (target->reset_halt)
+ {
+ int retval;
if ((retval = target_halt(target))!=ERROR_OK)
return retval;
- }
+ }
return ERROR_OK;
@@ -292,7 +292,7 @@ int mips_m4k_assert_reset(target_t *target)
int mips_m4k_deassert_reset(target_t *target)
{
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
/* deassert reset lines */
jtag_add_reset(0, 0);
@@ -327,7 +327,7 @@ int mips_m4k_resume(struct target_s *target, int current, u32 address, int handl
}
/* current = 1: continue on current pc, otherwise continue at <address> */
- if (!current)
+ if (!current)
{
buf_set_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32, address);
mips32->core_cache->reg_list[MIPS32_PC].dirty = 1;
@@ -613,7 +613,7 @@ int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int c
/* initialize mips4k specific info */
mips32_init_arch_info(target, mips32, chain_pos, variant);
mips32->arch_info = mips_m4k;
-
+
return ERROR_OK;
}
diff --git a/src/target/target.h b/src/target/target.h
index e425a22e..baae2562 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -350,6 +350,7 @@ extern int target_register_user_commands(struct command_context_s *cmd_ctx);
extern int target_init(struct command_context_s *cmd_ctx);
extern int target_examine(void);
extern int handle_target(void *priv);
+extern int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mode reset_mode);
extern int target_register_event_callback(int (*callback)(struct target_s *target, enum target_event event, void *priv), void *priv);
extern int target_unregister_event_callback(int (*callback)(struct target_s *target, enum target_event event, void *priv), void *priv);
diff --git a/src/target/target/test_reset_syntax_error.cfg b/src/target/target/test_reset_syntax_error.cfg
index d2ae9109..1f6b0e92 100644
--- a/src/target/target/test_reset_syntax_error.cfg
+++ b/src/target/target/test_reset_syntax_error.cfg
@@ -1,15 +1,15 @@
-# Test script to check that syntax error in reset
-# script is reported properly.
-
-# at91eb40a target
-
-#jtag scan chain
-jtag_device 4 0x1 0xf 0xe
-
-#target configuration
-target arm7tdmi little 0 arm7tdmi-s_r4
-
-[new_target_name] configure -event reset-init {
-
- syntax error
-}
+# Test script to check that syntax error in reset
+# script is reported properly.
+
+# at91eb40a target
+
+#jtag scan chain
+jtag_device 4 0x1 0xf 0xe
+
+#target configuration
+target arm7tdmi little 0 arm7tdmi-s_r4
+
+[new_target_name] configure -event reset-init {
+
+ syntax error
+}
diff --git a/src/target/target/test_syntax_error.cfg b/src/target/target/test_syntax_error.cfg
index 9a87912c..63713d1c 100644
--- a/src/target/target/test_syntax_error.cfg
+++ b/src/target/target/test_syntax_error.cfg
@@ -1,4 +1,4 @@
-# This script tests a syntax error in the startup
-# config script
-
+# This script tests a syntax error in the startup
+# config script
+
syntax error here \ No newline at end of file