Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --git a/src/ao_dbg.c b/src/ao_dbg.c
index 2fc266e3f38c462083e746d1a38db9c4449cf2ee..e7fbd7ad8d207c709997d9b02c3dfac2311cc1dd 100644 (file)
--- a/src/ao_dbg.c
+++ b/src/ao_dbg.c
@@ -184,11 +184,8 @@ ao_dbg_long_delay(void)
                _asm nop _endasm;
 }
 
-static void
-ao_dbg_reset_delay(void)
-{
-       ao_delay(AO_MS_TO_TICKS(20));
-}
+#define AO_RESET_LOW_DELAY     AO_MS_TO_TICKS(100)
+#define AO_RESET_HIGH_DELAY    AO_MS_TO_TICKS(100)
 
 void
 ao_dbg_debug_mode(void)
@@ -198,7 +195,7 @@ ao_dbg_debug_mode(void)
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|DBG_RESET_N);
        ao_dbg_long_delay();
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N,     0    |DBG_DATA|    0    );
-       ao_dbg_reset_delay();
+       ao_delay(AO_RESET_LOW_DELAY);
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|    0    );
        ao_dbg_long_delay();
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N,     0    |DBG_DATA|    0    );
@@ -206,7 +203,7 @@ ao_dbg_debug_mode(void)
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|    0    );
        ao_dbg_long_delay();
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N,     0    |DBG_DATA|DBG_RESET_N);
-       ao_dbg_reset_delay();
+       ao_delay(AO_RESET_HIGH_DELAY);
 }
 
 void
@@ -217,7 +214,7 @@ ao_dbg_reset(void)
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|DBG_RESET_N);
        ao_dbg_long_delay();
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|    0    );
-       ao_dbg_reset_delay();
+       ao_delay(AO_RESET_LOW_DELAY);
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|    0    );
        ao_dbg_long_delay();
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|    0    );
@@ -225,7 +222,7 @@ ao_dbg_reset(void)
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|    0    );
        ao_dbg_long_delay();
        ao_dbg_send_bits(DBG_CLOCK|DBG_DATA|DBG_RESET_N, DBG_CLOCK|DBG_DATA|DBG_RESET_N);
-       ao_dbg_reset_delay();
+       ao_delay(AO_RESET_HIGH_DELAY);
 }
 
 static void