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

diff --git a/src/ao_dbg.c b/src/ao_dbg.c
index d0633f92..14a123a2 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
@@ -339,13 +348,13 @@ debug_output(void)
 }
 
 __code struct ao_cmds ao_dbg_cmds[7] = {
-	{ 'D',	debug_enable,	"D                                  Enable debug mode" },
-	{ 'G',	debug_get,	"G <count>                          Get data from debug port" },
-	{ 'I',	debug_input,	"I <count> <addr>                   Input <count> bytes to target at <addr>" },
-	{ 'O',	debug_output,	"O <count> <addr>                   Output <count> bytes to target at <addr>" },
-	{ 'P',	debug_put,	"P <byte> ...                       Put data to debug port" },
-	{ 'R',	debug_reset,	"R                                  Reset target" },
-	{ 0, debug_reset,	0 },
+	{ debug_enable,	"D\0Enable debug" },
+	{ debug_get,	"G <count>\0Get data" },
+	{ debug_input,	"I <count> <addr>\0Input <count> at <addr>" },
+	{ debug_output,	"O <count> <addr>\0Output <count> at <addr>" },
+	{ debug_put,	"P <byte> ...\0Put data" },
+	{ debug_reset,	"R\0Reset" },
+	{ 0, NULL },
 };
 
 void