X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=lib%2Fccdbg-command.c;h=7d1ae067556ee2dd2343566e7454a540409760c3;hp=38c006cb99c4ee303493b5baa59f75ad2211ebe0;hb=2d9b8a83a2d9f495199033e43f519d26f27938fe;hpb=9025eb792861930e6af918d2727c4f5d97a69936

diff --git a/lib/ccdbg-command.c b/lib/ccdbg-command.c
index 38c006cb..7d1ae067 100644
--- a/lib/ccdbg-command.c
+++ b/lib/ccdbg-command.c
@@ -18,35 +18,6 @@
 
 #include "ccdbg.h"
 
-void
-ccdbg_debug_mode(struct ccdbg *dbg)
-{
-	/* force two rising clocks while holding RESET_N low */
-	ccdbg_debug(CC_DEBUG_COMMAND, "#\n");
-	ccdbg_debug(CC_DEBUG_COMMAND, "# Debug mode\n");
-	ccdbg_debug(CC_DEBUG_COMMAND, "#\n");
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N,          CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N,          CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N,          CC_DATA|CC_RESET_N);
-}
-
-void
-ccdbg_reset(struct ccdbg *dbg)
-{
-	ccdbg_debug(CC_DEBUG_COMMAND, "#\n");
-	ccdbg_debug(CC_DEBUG_COMMAND, "# Reset\n");
-	ccdbg_debug(CC_DEBUG_COMMAND, "#\n");
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA           );
-	ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-}
-
 uint8_t
 ccdbg_chip_erase(struct ccdbg *dbg)
 {
@@ -68,7 +39,14 @@ ccdbg_rd_config(struct ccdbg *dbg)
 uint16_t
 ccdbg_get_pc(struct ccdbg *dbg)
 {
-	return ccdbg_cmd_write_read16(dbg, CC_GET_PC, NULL, 0);
+	uint16_t	pc1, pc2;
+
+	pc1 = ccdbg_cmd_write_read16(dbg, CC_GET_PC, NULL, 0);
+	pc2 = ccdbg_cmd_write_read16(dbg, CC_GET_PC, NULL, 0);
+	if (pc1 != pc2)
+		fprintf (stderr, "Invalid pc %04x != %04x\n",
+			 pc1, pc2);
+	return pc2;
 }
 
 uint8_t
@@ -106,6 +84,22 @@ ccdbg_debug_instr(struct ccdbg *dbg, uint8_t *instr, int nbytes)
 	return ccdbg_cmd_write_read8(dbg, CC_DEBUG_INSTR(nbytes), instr, nbytes);
 }
 
+void
+ccdbg_debug_instr_discard(struct ccdbg *dbg, uint8_t *instr, int nbytes)
+{
+	static uint8_t	discard;
+	ccdbg_cmd_write_queue8(dbg, CC_DEBUG_INSTR(nbytes),
+			       instr, nbytes, &discard);
+}
+
+void
+ccdbg_debug_instr_queue(struct ccdbg *dbg, uint8_t *instr, int nbytes,
+			uint8_t *reply)
+{
+	return ccdbg_cmd_write_queue8(dbg, CC_DEBUG_INSTR(nbytes),
+				      instr, nbytes, reply);
+}
+
 uint8_t
 ccdbg_step_instr(struct ccdbg *dbg)
 {
@@ -137,12 +131,13 @@ ccdbg_execute(struct ccdbg *dbg, uint8_t *inst)
 		ccdbg_debug(CC_DEBUG_INSTRUCTIONS, "\t%02x", inst[1]);
 		for (i = 0; i < len - 1; i++)
 			ccdbg_debug(CC_DEBUG_INSTRUCTIONS, " %02x", inst[i+2]);
-		status = ccdbg_debug_instr(dbg, inst+1, len);
+		ccdbg_debug_instr_queue(dbg, inst+1, len, &status);
 		for (; i < 3; i++)
 			ccdbg_debug(CC_DEBUG_INSTRUCTIONS, "   ");
 		ccdbg_debug(CC_DEBUG_INSTRUCTIONS, " -> %02x\n", status);
 		inst += len + 1;
 	}
+	ccdbg_sync(dbg);
 	return status;
 }
 
@@ -174,9 +169,9 @@ ccdbg_execute_hex_image(struct ccdbg *dbg, struct hex_image *image)
 	ccdbg_write_hex_image(dbg, image, 0);
 	ccdbg_set_pc(dbg, image->address);
 	pc = ccdbg_get_pc(dbg);
-	printf ("pc starts at 0x%04x\n", pc);
+	ccdbg_debug(CC_DEBUG_EXECUTE, "pc starts at 0x%04x\n", pc);
 	status = ccdbg_resume(dbg);
-	printf ("resume status: 0x%02x\n", status);
+	ccdbg_debug(CC_DEBUG_EXECUTE, "resume status: 0x%02x\n", status);
 	return 0;
 }