summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2010-04-18 08:36:07 -0600
committerBdale Garbee <bdale@gag.com>2010-04-18 08:36:07 -0600
commitf4383394b5d2b275b21e3ce8040d8cb9e48bb375 (patch)
tree6ba720ea9fb31fbec50ff2c01d0e8a322f47010c
parent5f93cf8c73555f43c14b1b0757f264bde69e9b8a (diff)
parentc879b178d83c9a9a521f42a960b10e19b11cee92 (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
-rw-r--r--src/ao_dbg.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/ao_dbg.c b/src/ao_dbg.c
index 2fc266e3..e7fbd7ad 100644
--- 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