X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=lib%2Fccdbg.h;h=fe0ea3a0192cf4721f7a741c32232bb499556afb;hp=203b5aebb8c723b043f0654c95838afcfa7dcfac;hb=2d9b8a83a2d9f495199033e43f519d26f27938fe;hpb=23aca1fcbc169184e32d4ec19f28dd4fd4cfda36

diff --git a/lib/ccdbg.h b/lib/ccdbg.h
index 203b5aeb..fe0ea3a0 100644
--- a/lib/ccdbg.h
+++ b/lib/ccdbg.h
@@ -31,14 +31,12 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include "ccdbg-debug.h"
-
-#define CC_CLOCK	0x1
-#define CC_DATA		0x2
-#define CC_RESET_N	0x4
-#define CC_CLOCK_US	(0)
+#include "cc-bitbang.h"
+#include "cc-usb.h"
 
 /* 8051 instructions
  */
+#define NOP			0x00
 #define MOV_direct_data		0x75
 #define LJMP			0x02
 #define MOV_Rn_data(n)		(0x78 | (n))
@@ -99,14 +97,13 @@
 /* Bit-addressable accumulator */
 #define ACC(bit)		(0xE0 | (bit))
 
-#define CP_USB_ASYNC
+/* Bit-addressable status word */
+#define PSW(bit)		(0xD0 | (bit))
 
 struct ccdbg {
-#ifdef CP_USB_ASYNC
-	struct cp_usb_async *cp_async;
-#else
-	struct cp_usb *cp;
-#endif
+	struct cc_bitbang	*bb;
+	struct cc_usb		*usb;
+	struct hex_image	*rom;
 };
 
 /* Intel hex file format data
@@ -130,6 +127,18 @@ struct hex_image {
 	uint8_t		data[0];
 };
 
+#define CC_STATE_ACC	0x1
+#define CC_STATE_PSW	0x2
+#define CC_STATE_DP	0x4
+
+#define CC_STATE_NSFR	5
+
+struct ccstate {
+	uint16_t	mask;
+	uint8_t		acc;
+	uint8_t		sfr[CC_STATE_NSFR];
+};
+
 #define HEX_RECORD_NORMAL		0x00
 #define HEX_RECORD_EOF			0x01
 #define HEX_RECORD_EXTENDED_ADDRESS	0x02
@@ -202,6 +211,13 @@ ccdbg_resume(struct ccdbg *dbg);
 uint8_t
 ccdbg_debug_instr(struct ccdbg *dbg, uint8_t *instr, int nbytes);
 
+void
+ccdbg_debug_instr_discard(struct ccdbg *dbg, uint8_t *instr, int nbytes);
+
+void
+ccdbg_debug_instr_queue(struct ccdbg *dbg, uint8_t *instr, int nbytes,
+			uint8_t *reply);
+
 uint8_t
 ccdbg_step_instr(struct ccdbg *dbg);
 
@@ -241,74 +257,33 @@ int
 ccdbg_hex_image_equal(struct hex_image *a, struct hex_image *b);
 
 /* ccdbg-io.c */
-void
-ccdbg_half_clock(struct ccdbg *dbg);
-
-int
-ccdbg_write(struct ccdbg *dbg, uint8_t mask, uint8_t value);
-
-void
-ccdbg_read(struct ccdbg *dbg, uint8_t *valuep);
-
 struct ccdbg *
 ccdbg_open(void);
 
 void
 ccdbg_close(struct ccdbg *dbg);
 
-void
-ccdbg_clock_1_0(struct ccdbg *dbg);
-
-void
-ccdbg_clock_0_1(struct ccdbg *dbg);
-
-void
-ccdbg_write_bit(struct ccdbg *dbg, uint8_t bit);
-
-void
-ccdbg_write_byte(struct ccdbg *dbg, uint8_t byte);
-
-uint8_t
-ccdbg_read_bit(struct ccdbg *dbg);
-
-uint8_t
-ccdbg_read_byte(struct ccdbg *dbg);
-
 void
 ccdbg_cmd_write(struct ccdbg *dbg, uint8_t cmd, uint8_t *data, int len);
 
 uint8_t
 ccdbg_cmd_write_read8(struct ccdbg *dbg, uint8_t cmd, uint8_t *data, int len);
 
-uint16_t
-ccdbg_cmd_write_read16(struct ccdbg *dbg, uint8_t cmd, uint8_t *data, int len);
-
-void
-ccdbg_send(struct ccdbg *dbg, uint8_t mask, uint8_t set);
-
 void
-ccdbg_send_bit(struct ccdbg *dbg, uint8_t bit);
+ccdbg_cmd_write_queue8(struct ccdbg *dbg, uint8_t cmd,
+		       uint8_t *data, int len, uint8_t *reply);
 
-void
-ccdbg_send_byte(struct ccdbg *dbg, uint8_t byte);
+uint16_t
+ccdbg_cmd_write_read16(struct ccdbg *dbg, uint8_t cmd, uint8_t *data, int len);
 
 void
 ccdbg_send_bytes(struct ccdbg *dbg, uint8_t *bytes, int nbytes);
 
-void
-ccdbg_recv_bit(struct ccdbg *dbg, int first, uint8_t *bit);
-
-void
-ccdbg_recv_byte(struct ccdbg *dbg, int first, uint8_t *byte);
-
 void
 ccdbg_recv_bytes(struct ccdbg *dbg, uint8_t *bytes, int nbytes);
 
 void
-ccdbg_sync_io(struct ccdbg *dbg);
-
-void
-ccdbg_print(char *format, uint8_t mask, uint8_t set);
+ccdbg_sync(struct ccdbg *dbg);
 
 /* ccdbg-manual.c */
 
@@ -337,4 +312,30 @@ ccdbg_read_sfr(struct ccdbg *dbg, uint8_t addr, uint8_t *bytes, int nbytes);
 uint8_t
 ccdbg_write_sfr(struct ccdbg *dbg, uint8_t addr, uint8_t *bytes, int nbytes);
 
+/* ccdbg-rom.c */
+uint8_t
+ccdbg_set_rom(struct ccdbg *dbg, struct hex_image *rom);
+
+uint8_t
+ccdbg_rom_contains(struct ccdbg *dbg, uint16_t addr, int nbytes);
+
+uint8_t
+ccdbg_rom_replace_xmem(struct ccdbg *dbg,
+		       uint16_t addrp, uint8_t *bytesp, int nbytes);
+
+/* ccdbg-state.c */
+uint8_t
+ccdbg_state_save(struct ccdbg *dbg, struct ccstate *state, unsigned int mask);
+
+uint8_t
+ccdbg_state_restore(struct ccdbg *dbg, struct ccstate *state);
+
+void
+ccdbg_state_replace_xmem(struct ccdbg *dbg, struct ccstate *state,
+			 uint16_t addr, uint8_t *bytes, int nbytes);
+
+void
+ccdbg_state_replace_sfr(struct ccdbg *dbg, struct ccstate *state,
+			uint8_t addr, uint8_t *bytes, int nbytes);
+
 #endif /* _CCDBG_H_ */