dsp5680xx - relocating code

moved reset_jtag to the top, since it will be needed in future changes.
also send a define to the .h

Change-Id: I53ef9c02ffa70e7d0416364525a6fbfef855e222
Signed-off-by: Rodrigo L. Rosa <rodrigorosa.lg@gmail.com>
Reviewed-on: http://openocd.zylin.com/216
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>

diff --git a/src/target/dsp5680xx.c b/src/target/dsp5680xx.c
index 69ae7aa4cba4b47ef72618825e33e0c589e12380..bbd7995e00ee8c8a6f6d43e91ef34df2dbdc0866 100644 (file)
--- a/src/target/dsp5680xx.c
+++ b/src/target/dsp5680xx.c
@@ -40,6 +40,23 @@ int dsp5680xx_execute_queue(void){
   return retval;
 }
 
+/**
+ * Reset state machine
+ */
+static int reset_jtag(void){
+       int retval;
+       tap_state_t states[2];
+       const char *cp = "RESET";
+       states[0] = tap_state_by_name(cp);
+       retval = jtag_add_statemove(states[0]);
+       err_check_propagate(retval);
+       retval = jtag_execute_queue();
+       err_check_propagate(retval);
+       jtag_add_pathmove(0, states + 1);
+       retval = jtag_execute_queue();
+       return retval;
+}
+
 static int dsp5680xx_drscan(struct target * target, uint8_t * data_to_shift_into_dr, uint8_t * data_shifted_out_of_dr, int len){
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 //
@@ -547,7 +564,6 @@ static int eonce_enter_debug_mode_without_reset(struct target * target, uint16_t
        return retval;
 }
 
-#define TIME_DIV_FREESCALE 0.3
 /**
  * Puts the core into debug mode, enabling the EOnCE module.
  *
@@ -1611,21 +1627,6 @@ int dsp5680xx_f_wr(struct target * target, uint8_t *buffer, uint32_t address, ui
   return retval;
 }
 
-// Reset state machine
-static int reset_jtag(void){
-  int retval;
-  tap_state_t states[2];
-  const char *cp = "RESET";
-  states[0] = tap_state_by_name(cp);
-  retval = jtag_add_statemove(states[0]);
-  err_check_propagate(retval);
-  retval = jtag_execute_queue();
-  err_check_propagate(retval);
-  jtag_add_pathmove(0, states + 1);
-  retval = jtag_execute_queue();
-  return retval;
-}
-
 int dsp5680xx_f_unlock(struct target * target){
   int retval = ERROR_OK;
   uint16_t eonce_status;

diff --git a/src/target/dsp5680xx.h b/src/target/dsp5680xx.h
index 9c8f435ce59caf2363c0338b459ae063eacd8237..ea5715c7d9efa3e563a271d10af36d5df3a4693a 100644 (file)
--- a/src/target/dsp5680xx.h
+++ b/src/target/dsp5680xx.h
@@ -39,6 +39,7 @@
 
 
 #define S_FILE_DATA_OFFSET 0x200000
+#define TIME_DIV_FREESCALE 0.3
 
 //----------------------------------------------------------------
 // JTAG