X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_dbg.c;h=0d9ec8c0db958a306b9b3b5bc95f1bdf0e14ac3e;hp=d0633f9288afceeaf084480b68846228f52af9e0;hb=52ac83fedbfd380d14d4df2e79992bbdfba3552a;hpb=84c93bb2fc4558a5e4654794ba90e730a84eaf67

diff --git a/src/ao_dbg.c b/src/ao_dbg.c
index d0633f92..0d9ec8c0 100644
--- 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,6 +190,9 @@ ao_dbg_long_delay(void)
 		_asm nop _endasm;
 }
 
+#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)
 {
@@ -192,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_long_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    );
@@ -200,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_long_delay();
+	ao_delay(AO_RESET_HIGH_DELAY);
 }
 
 void
@@ -211,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_long_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    );
@@ -219,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_long_delay();
+	ao_delay(AO_RESET_HIGH_DELAY);
 }
 
 static void