X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget.h;h=5d1e5773ce7d961a8613222422a20f68a1943efe;hb=e2b6de3d66bae70cb08fea17f5b66ee875dbb636;hp=f1c61e3bf33ea0c628f58ed4528e6d197846d1be;hpb=dfbb9f3e89ae6a3769d0df2167208c7c07e22e3c;p=openocd.git

diff --git a/src/target/target.h b/src/target/target.h
index f1c61e3bf3..5d1e5773ce 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -59,8 +62,6 @@ enum target_reset_mode
 	RESET_RUN = 0,		/* reset and let target run */
 	RESET_HALT = 1,		/* reset and halt target out of reset */
 	RESET_INIT = 2,		/* reset and halt target out of reset, then run init script */
-	RESET_RUN_AND_HALT = 3, /* reset and let target run, halt after n milliseconds */
-	RESET_RUN_AND_INIT = 4, /* reset and let target run, halt after n milliseconds, then run init script */
 };
 
 enum target_debug_reason
@@ -199,7 +200,6 @@ typedef struct target_s
 {
 	target_type_t *type;				/* target type definition (name, access functions) */
 	int reset_halt;						/* attempt resetting the CPU into the halted mode? */
-	int run_and_halt_time;				/* how long the target should run after a run_and_halt reset */
 	u32 working_area;					/* working area (initialized RAM). Evaluated 
 										   upon first allocation from virtual/physical address. */
 	u32 working_area_virt;				/* virtual address */
@@ -280,6 +280,7 @@ extern int target_write_buffer(struct target_s *target, u32 address, u32 size, u
 extern int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer);
 extern int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32* crc);
 extern int target_blank_check_memory(struct target_s *target, u32 address, u32 size, u32* blank);
+extern int target_wait_state(target_t *target, enum target_state state, int ms);
 
 /* DANGER!!!!!
  *