X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_dbg.c;h=d4c9567fe519039ec28713dd97282c126c919b42;hp=e7fbd7ad8d207c709997d9b02c3dfac2311cc1dd;hb=81ad44d4b6d9ad2f6b91d0906e8543da82da424f;hpb=f4383394b5d2b275b21e3ce8040d8cb9e48bb375

diff --git a/src/ao_dbg.c b/src/ao_dbg.c
index e7fbd7ad..d4c9567f 100644
--- a/src/ao_dbg.c
+++ b/src/ao_dbg.c
@@ -31,7 +31,7 @@ ao_dbg_send_bits(uint8_t msk, uint8_t val) __reentrant
 void
 ao_dbg_send_byte(uint8_t byte)
 {
-	__xdata uint8_t	b, d;
+	__pdata uint8_t	b, d;
 
 	DBG_PORT |= DBG_DATA;
 	DBG_PORT_DIR |= DBG_DATA;
@@ -49,7 +49,7 @@ ao_dbg_send_byte(uint8_t byte)
 uint8_t
 ao_dbg_recv_byte(void)
 {
-	__xdata uint8_t	byte, b;
+	__pdata uint8_t	byte, b;
 
 	byte = 0;
 	for (b = 0; b < 8; b++) {
@@ -89,12 +89,12 @@ ao_dbg_recv_byte(void)
 #define SFR_DPL1		0x84
 #define SFR_DPH1		0x85
 
-__xdata uint8_t	save_acc;
-__xdata uint8_t save_psw;
-__xdata uint8_t save_dpl0;
-__xdata uint8_t save_dph0;
-__xdata uint8_t save_dpl1;
-__xdata uint8_t save_dph1;
+__pdata uint8_t	save_acc;
+__pdata uint8_t save_psw;
+__pdata uint8_t save_dpl0;
+__pdata uint8_t save_dph0;
+__pdata uint8_t save_dpl1;
+__pdata uint8_t save_dph1;
 
 static uint8_t
 ao_dbg_inst1(uint8_t a) __reentrant
@@ -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;
 
@@ -254,9 +260,9 @@ debug_put(void)
 static void
 debug_get(void)
 {
-	__xdata uint16_t count;
-	__xdata uint16_t i;
-	__xdata uint8_t byte;
+	__pdata uint16_t count;
+	__pdata uint16_t i;
+	__pdata uint8_t byte;
 	ao_cmd_hex();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
@@ -278,7 +284,7 @@ debug_get(void)
 static uint8_t
 getnibble(void)
 {
-	__xdata char	c;
+	__pdata char	c;
 
 	c = getchar();
 	if ('0' <= c && c <= '9')
@@ -294,10 +300,10 @@ getnibble(void)
 static void
 debug_input(void)
 {
-	__xdata uint16_t count;
-	__xdata uint16_t addr;
-	__xdata uint8_t b;
-	__xdata uint8_t	i;
+	__pdata uint16_t count;
+	__pdata uint16_t addr;
+	__pdata uint8_t b;
+	__pdata uint8_t	i;
 
 	ao_cmd_hex();
 	count = ao_cmd_lex_i;
@@ -320,9 +326,9 @@ debug_input(void)
 static void
 debug_output(void)
 {
-	__xdata uint16_t count;
-	__xdata uint16_t addr;
-	__xdata uint8_t b;
+	__pdata uint16_t count;
+	__pdata uint16_t addr;
+	__pdata uint8_t b;
 
 	ao_cmd_hex();
 	count = ao_cmd_lex_i;
@@ -342,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