Fill out ccdbg-command to support all debug commands.

[fw/altos] / ccdbg.c

diff --git a/ccdbg.c b/ccdbg.c
index 64cb768f4447f1fbb2e798005739489de590b565..b682372a96ba5a1d4615908aaf202add8a1a7488 100644 (file)
--- a/ccdbg.c
+++ b/ccdbg.c
@@ -18,80 +18,23 @@
 
 #include "ccdbg.h"
 
-static uint8_t
-get_bit(char *line, int i, char on, uint8_t bit)
-{
-       if (line[i] == on)
-               return bit;
-       if (line[i] == '.')
-               return 0;
-       fprintf(stderr, "bad line %s\n", line);
-       exit (1);
-}
-
-static char
-is_bit(uint8_t get, char on, uint8_t bit)
-{
-       if (get&bit)
-               return on;
-       else
-               return '.';
-}
-
-static uint8_t
-ccdbg_write_read(struct ccdbg *dbg, uint8_t set)
-{
-       uint8_t get;
-
-       cccp_write(dbg, CC_DATA|CC_CLOCK|CC_RESET_N, set);
-       get = cccp_read_all(dbg);
-       printf("%c %c %c -> %c %c %c\n",
-              is_bit(set, 'C', CC_CLOCK),
-              is_bit(set, 'D', CC_DATA),
-              is_bit(set, 'R', CC_RESET_N),
-              is_bit(get, 'C', CC_CLOCK),
-              is_bit(get, 'D', CC_DATA),
-              is_bit(get, 'R', CC_RESET_N));
-       ccdbg_half_clock(dbg);
-       return get;
-}
+#define MOV    0x75
 
-static void
-_ccdbg_debug_mode(struct ccdbg *dbg)
-{
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg,          CC_DATA           );
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           );
-       ccdbg_write_read(dbg,          CC_DATA           );
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           );
-       ccdbg_write_read(dbg,          CC_DATA|CC_RESET_N);
-}
+static uint8_t instructions[] = {
+       3, MOV, 0xfe, 0x02,
+       3, MOV, 0x90, 0xff,
+       0
+};
 
 static void
-_ccdbg_reset(struct ccdbg *dbg)
+ccdbg_instructions(struct ccdbg *dbg, uint8_t *inst)
 {
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           );
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           );
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA|CC_RESET_N);
-}
-
-static void
-ccdbg_manual(struct ccdbg *dbg, FILE *input)
-{
-       char    line[80];
-       uint8_t set;
-
-       while (fgets(line, sizeof line, input)) {
-               if (line[0] == '#' || line[0] == '\n') {
-                       printf ("%s", line);
-                       continue;
-               }
-               set = 0;
-               set |= get_bit(line, 0, 'C', CC_CLOCK);
-               set |= get_bit(line, 2, 'D', CC_DATA);
-               set |= get_bit(line, 4, 'R', CC_RESET_N);
-               ccdbg_write_read(dbg, set);
+       while(inst[0] != 0) {
+               uint8_t len = inst[0];
+               uint8_t status;
+               status = ccdbg_debug_instr(dbg, inst+1, len);
+               printf ("inst status 0x%02x\n", status);
+               inst += len + 1;
        }
 }
 
@@ -105,15 +48,19 @@ main (int argc, char **argv)
        dbg = ccdbg_open("/dev/ttyUSB0");
        if (!dbg)
                exit (1);
+#if 0
        ccdbg_manual(dbg, stdin);
-#if 0  
+#endif
+#if 1
        ccdbg_debug_mode(dbg);
        status = ccdbg_read_status(dbg);
        printf("Status: 0x%02x\n", status);
        chip_id = ccdbg_get_chip_id(dbg);
        printf("Chip id: 0x%04x\n", chip_id);
+       status = ccdbg_halt(dbg);
+       printf ("halt status: 0x%02x\n", status);
+       ccdbg_instructions(dbg, instructions);
 #endif
-       _ccdbg_reset(dbg);
        ccdbg_close(dbg);
        exit (0);
 }