Switch DBG pins to GPIO when using any debug commands. Reboot to restore.

[fw/altos] / src / ao_dbg.c

diff --git a/src/ao_dbg.c b/src/ao_dbg.c
index 2fc266e3f38c462083e746d1a38db9c4449cf2ee..0d9ec8c0db958a306b9b3b5bc95f1bdf0e14ac3e 100644 (file)
--- a/src/ao_dbg.c
+++ b/src/ao_dbg.c
@@ -164,6 +164,12 @@ ao_dbg_read_byte(void)
 static void
 ao_dbg_set_pins(void)
 {
+       /* Make the DBG pins GPIOs. On TeleMetrum, this will
+        * disable the SPI link, so don't expect SPI to work after
+        * using the debugger.
+        */
+       DBG_PORT_SEL &= ~(DBG_CLOCK|DBG_DATA|DBG_RESET_N);
+
        /* make DBG_DATA tri-state */
        DBG_PORT_INP |= DBG_DATA;
 
@@ -184,11 +190,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 +201,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 +209,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 +220,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 +228,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