Clean up bitbanging layer. Add debug printfs.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/Makefile b/Makefile
index 27a389e2b97e7e89e80a4d111c56b4bfe74994cd..965032e41130a3c97fe3e96e44fc553751c101a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ LIBS=-lusb
 KERNEL_OBJS=cccp.o
 LIBUSB_OBJS=cp-usb.o
 
-OBJS=ccdbg.o ccdbg-command.o ccdbg-io.o $(LIBUSB_OBJS)
+OBJS=ccdbg.o ccdbg-command.o ccdbg-debug.o ccdbg-io.o $(LIBUSB_OBJS)
 INCS=ccdbg.h cccp.h
 
 PROG=ccdbg

diff --git a/ccdbg-command.c b/ccdbg-command.c
index f79d3621726a78ac36d996d79ae88c3fb39be83a..099afc55d11444540111208f7484dbf759ebb155 100644 (file)
--- a/ccdbg-command.c
+++ b/ccdbg-command.c
@@ -22,20 +22,29 @@ void
 ccdbg_debug_mode(struct ccdbg *dbg)
 {
        /* force two rising clocks while holding RESET_N low */
-       ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_RESET_N|CC_CLOCK, 0); ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_CLOCK, CC_CLOCK);    ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_CLOCK, 0);           ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_CLOCK, CC_CLOCK);     ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_RESET_N, CC_RESET_N); ccdbg_half_clock(dbg);
+       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_half_clock(dbg);
-       ccdbg_write(dbg, CC_RESET_N, 0);                ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_RESET_N, CC_RESET_N);
+       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

diff --git a/ccdbg-debug.c b/ccdbg-debug.c
new file mode 100644 (file)
index 0000000..2e67bc8
--- /dev/null
+++ b/ccdbg-debug.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2008 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ccdbg.h"
+#include <stdarg.h>
+
+int
+ccdbg_level = 0;
+
+void
+ccdbg_add_debug(int level)
+{
+       ccdbg_level |= level;
+}
+
+void
+ccdbg_clear_debug(int level)
+{
+       ccdbg_level &= ~level;
+}
+
+void
+ccdbg_debug(int level, char *format, ...)
+{
+       va_list ap;
+
+       if (ccdbg_level & level) {
+               va_start(ap, format);
+               vprintf(format, ap);
+               va_end(ap);
+       }
+}

diff --git a/ccdbg-io.c b/ccdbg-io.c
index 2cd42e274da882556cf291cb79ddce2faebdc3a4..c69fc0d816751172b190393a96de95bbc047f83d 100644 (file)
--- a/ccdbg-io.c
+++ b/ccdbg-io.c
@@ -89,108 +89,125 @@ ccdbg_read(struct ccdbg *dbg)
        return cp_usb_read(dbg);
 #endif
 }
-       
+
+static char
+is_bit(uint8_t get, uint8_t mask, char on, uint8_t bit)
+{
+       if (mask&bit) {
+               if (get&bit)
+                       return on;
+               else
+                       return '.';
+       } else
+               return '-';
+}
 void
-ccdbg_clock_1_0(struct ccdbg *dbg)
+ccdbg_print(char *format, uint8_t mask, uint8_t set)
 {
-       ccdbg_quarter_clock(dbg);
-       assert(dbg->clock == 1);
-       ccdbg_write(dbg, CC_CLOCK, 0);
-       dbg->clock = 0;
-       ccdbg_quarter_clock(dbg);
+       ccdbg_debug (CC_DEBUG_BITBANG, format,
+                    is_bit(set, mask, 'C', CC_CLOCK),
+                    is_bit(set, mask, 'D', CC_DATA),
+                    is_bit(set, mask, 'R', CC_RESET_N));
 }
 
 void
-ccdbg_clock_0_1(struct ccdbg *dbg)
+ccdbg_send(struct ccdbg *dbg, uint8_t mask, uint8_t set)
 {
-       ccdbg_quarter_clock(dbg);
-       assert(dbg->clock == 0);
-       ccdbg_write(dbg, CC_CLOCK, CC_CLOCK);
-       dbg->clock = 1;
-       ccdbg_quarter_clock(dbg);
+       ccdbg_write(dbg, mask, set);
+       ccdbg_print("%c %c %c\n", mask, set);
+       ccdbg_half_clock(dbg);
 }
 
-/*
- * By convention, every macro function is entered with dbg->clock == 1
- */
-
 void
-ccdbg_write_bit(struct ccdbg *dbg, uint8_t bit)
+ccdbg_send_bit(struct ccdbg *dbg, uint8_t bit)
 {
-       uint8_t data;
-
-       assert(dbg->clock == 1);
-       data = CC_CLOCK;
-       if (bit)
-               data |= CC_DATA;
-       ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_DATA|CC_CLOCK, data);
-       ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_CLOCK, 0);
-//     printf ("%d", bit);
+       if (bit) bit = CC_DATA;
+       ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|bit|CC_RESET_N);
+       ccdbg_send(dbg, CC_CLOCK|CC_DATA|CC_RESET_N,          bit|CC_RESET_N);
 }
 
 void
-ccdbg_write_byte(struct ccdbg *dbg, uint8_t byte)
+ccdbg_send_byte(struct ccdbg *dbg, uint8_t byte)
 {
-       int     bit;
+       int bit;
+       ccdbg_debug(CC_DEBUG_BITBANG, "#\n# Send Byte 0x%02x\n#\n", byte);
+       for (bit = 7; bit >= 0; bit--) {
+               ccdbg_send_bit(dbg, (byte >> bit) & 1);
+               if (bit == 3)
+                       ccdbg_debug(CC_DEBUG_BITBANG, "\n");
+       }
+}
 
-       for (bit = 7; bit >= 0; bit--)
-               ccdbg_write_bit(dbg, (byte >> bit) & 1);
+void
+ccdbg_send_bytes(struct ccdbg *dbg, uint8_t *bytes, int nbytes)
+{
+       while (nbytes--)
+               ccdbg_send_byte(dbg, *bytes++);
 }
 
 uint8_t
-ccdbg_read_bit(struct ccdbg *dbg)
+ccdbg_recv_bit(struct ccdbg *dbg, int first)
 {
-       uint8_t data;
+       uint8_t mask = first ? CC_DATA : 0;
+       uint8_t read;
 
-       ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_CLOCK, CC_CLOCK);
-       ccdbg_half_clock(dbg);
-       ccdbg_write(dbg, CC_CLOCK, 0);
-       data = ccdbg_read(dbg);
-       return (data & CC_DATA) ? 1 : 0;
+       ccdbg_send(dbg, CC_CLOCK|mask|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
+       read = ccdbg_read(dbg);
+       ccdbg_send(dbg, CC_CLOCK|     CC_RESET_N,                  CC_RESET_N);
+       return (read & CC_DATA) ? 1 : 0;
 }
 
 uint8_t
-ccdbg_read_byte(struct ccdbg *dbg)
+ccdbg_recv_byte(struct ccdbg *dbg, int first)
 {
+       uint8_t byte = 0;
        int     bit;
-       uint8_t byte = 0;
 
-       for (bit = 7; bit >= 0; bit--)
-               byte |= ccdbg_read_bit(dbg) << bit;
+       ccdbg_debug(CC_DEBUG_BITBANG, "#\n# Recv byte\n#\n");
+       for (bit = 0; bit < 8; bit++) {
+               byte = byte << 1;
+               byte |= ccdbg_recv_bit(dbg, first);
+               if (bit == 3)
+                       ccdbg_debug(CC_DEBUG_BITBANG, "\n");
+               first = 0;
+       }
+       ccdbg_debug(CC_DEBUG_BITBANG, "#\n# Recv 0x%02x\n#\n", byte);
        return byte;
 }
 
+void
+ccdbg_recv_bytes(struct ccdbg *dbg, uint8_t *bytes, int nbytes)
+{
+       int first = 1;
+       while (nbytes--) {
+               *bytes++ = ccdbg_recv_byte(dbg, first);
+               first = 0;
+       }
+}
+
 void
 ccdbg_cmd_write(struct ccdbg *dbg, uint8_t cmd, uint8_t *data, int len)
 {
        int     i;
-       ccdbg_write_byte(dbg, cmd);
+       ccdbg_send_byte(dbg, cmd);
        for (i = 0; i < len; i++)
-               ccdbg_write_byte(dbg, data[i]);
+               ccdbg_send_byte(dbg, data[i]);
 }
 
 uint8_t
 ccdbg_cmd_write_read8(struct ccdbg *dbg, uint8_t cmd, uint8_t *data, int len)
 {
-       uint8_t ret;
+       uint8_t byte[1];
        ccdbg_cmd_write(dbg, cmd, data, len);
-       ret = ccdbg_read_byte(dbg);
-       return ret;
+       ccdbg_recv_bytes(dbg, byte, 1);
+       return byte[0];
 }
 
 uint16_t
 ccdbg_cmd_write_read16(struct ccdbg *dbg, uint8_t cmd, uint8_t *data, int len)
 {
-       uint8_t byte1, byte0;
-       int     i;
+       uint8_t byte[2];
        ccdbg_cmd_write(dbg, cmd, data, len);
-       byte1 = ccdbg_read_byte(dbg); 
-       byte0 = ccdbg_read_byte(dbg);
-       for (i = 0; i < 4; i++)
-               (void) ccdbg_read_byte(dbg);
-       return (byte1 << 8) | byte0;
+       ccdbg_recv_bytes(dbg, byte, 2);
+       return (byte[0] << 8) | byte[1];
 }
-

diff --git a/ccdbg.c b/ccdbg.c
index 6462739a56b08747d55fe74aa6a5337c1c8a05a6..3fcf7053138df240ea04f97e735976cde72a92e4 100644 (file)
--- a/ccdbg.c
+++ b/ccdbg.c
@@ -18,227 +18,6 @@
 
 #include "ccdbg.h"
 
-static void
-get_bit(char *line, int i, char on, uint8_t bit, uint8_t *bits, uint8_t *masks)
-{
-       if (line[i] == on) {
-               *bits |= bit;
-               *masks |= bit;
-               return;
-       }
-       if (line[i] == '.') {
-               *masks |= bit;
-               return;
-       }
-       if (line[i] == '-') {
-               return;
-       }
-       fprintf(stderr, "bad line %s\n", line);
-       exit (1);
-}
-
-static char
-is_bit(uint8_t get, uint8_t mask, char on, uint8_t bit)
-{
-       if (mask&bit) {
-               if (get&bit)
-                       return on;
-               else
-                       return '.';
-       } else
-               return '-';
-}
-
-static uint8_t
-ccdbg_write_read(struct ccdbg *dbg, uint8_t set, uint8_t mask)
-{
-       uint8_t get = set;
-
-       if (mask != (CC_DATA|CC_CLOCK|CC_RESET_N))
-               get = ccdbg_read(dbg);
-       ccdbg_write(dbg, mask, set);
-       printf ("%c %c %c",
-               is_bit(set, mask, 'C', CC_CLOCK),
-               is_bit(set, mask, 'D', CC_DATA),
-               is_bit(set, mask, 'R', CC_RESET_N));
-       if (mask != (CC_DATA|CC_CLOCK|CC_RESET_N))
-               printf(" -> %c %c %c",
-                      is_bit(get, 0xf, 'C', CC_CLOCK),
-                      is_bit(get, 0xf, 'D', CC_DATA),
-                      is_bit(get, 0xf, 'R', CC_RESET_N));
-       printf("\n");
-       ccdbg_half_clock(dbg);
-       return get;
-}
-
-static void
-_ccdbg_debug_mode(struct ccdbg *dbg)
-{
-       printf ("#\n");
-       printf ("# Debug mode\n");
-       printf ("#\n");
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg,          CC_DATA           , CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           , CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg,          CC_DATA           , CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           , CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg,          CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-}
-
-static void
-_ccdbg_reset(struct ccdbg *dbg)
-{
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           , CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA           , CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-}
-
-static void
-_ccdbg_send_bit(struct ccdbg *dbg, uint8_t bit)
-{
-       if (bit) bit = CC_DATA;
-       ccdbg_write_read(dbg, CC_CLOCK|bit|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-       ccdbg_write_read(dbg,          bit|CC_RESET_N, CC_CLOCK|CC_DATA|CC_RESET_N);
-}
-
-static void
-_ccdbg_send_byte(struct ccdbg *dbg, uint8_t byte)
-{
-       int bit;
-       printf ("#\n");
-       printf ("# Send Byte 0x%02x\n", byte);
-       printf ("#\n");
-       for (bit = 7; bit >= 0; bit--) {
-               _ccdbg_send_bit(dbg, (byte >> bit) & 1);
-               if (bit == 3)
-                       printf ("\n");
-       }
-}
-
-static void
-_ccdbg_send_bits(struct ccdbg *dbg, int n, uint32_t bits)
-{
-       int bit;
-       printf ("#\n");
-       printf ("# Send %d bits 0x%08x\n", n, bits);
-       printf ("#\n");
-       for (bit = n - 1; bit >= 0; bit--) {
-               _ccdbg_send_bit(dbg, (bits >> bit) & 1);
-               if ((bit & 3) == 3)
-                       printf ("\n");
-       }
-}
-
-static void
-_ccdbg_print_bits(int n, uint32_t bits)
-{
-       int     bit;
-
-       for (bit = n - 1; bit >= 0; bit--)
-               printf ("%d", (bits >> bit) & 1);
-}
-
-static uint32_t
-_ccdbg_read_bits(struct ccdbg *dbg, int bits)
-{
-       int             bit;
-       uint32_t        val = 0;
-       uint8_t         get;
-
-       printf ("#\n");
-       printf ("# Read %d bits\n", bits);
-       printf ("#\n");
-       for (bit = 0; bit < bits; bit++) {
-                     ccdbg_write_read(dbg, CC_CLOCK|CC_DATA|CC_RESET_N, CC_CLOCK|CC_RESET_N);
-               get = ccdbg_write_read(dbg,          CC_DATA|CC_RESET_N, CC_CLOCK|CC_RESET_N);
-               val <<= 1;
-               if (get & CC_DATA)
-                       val |= 1;
-               if ((bit & 3) == 3)
-                       printf ("\n");
-       }
-       printf ("#\n");
-       printf ("# Read "); _ccdbg_print_bits(bits, val); printf ("\n");
-       printf ("#\n");
-       return val;
-}
-
-static int
-_ccdbg_check_bits(uint32_t bits, uint8_t match)
-{
-       int     bit;
-
-       for (bit = 0; bit < 24; bit++)
-               if (((bits >> bit) & 0xff) == match)
-                       return 1;
-       return 0;
-}
-
-static uint32_t
-_ccdbg_play(struct ccdbg *dbg, int num_sync, uint32_t sync)
-{
-       uint32_t        bits;
-       _ccdbg_debug_mode(dbg);
-       _ccdbg_send_bits(dbg, num_sync, sync);
-       _ccdbg_send_byte(dbg, CC_GET_CHIP_ID);
-       bits = _ccdbg_read_bits(dbg, 16);
-       _ccdbg_send_byte(dbg, CC_GET_CHIP_ID);
-       bits = _ccdbg_read_bits(dbg, 16);
-//     _ccdbg_send_byte(dbg, CC_READ_STATUS);
-       _ccdbg_reset(dbg);
-       if (_ccdbg_check_bits(bits, 0x11)) {
-               printf("#\n#match with %d bits 0x%08x\n#\n", num_sync, sync);
-               return 1;
-       }
-       return 0;
-}
-
-static int
-_ccdbg_play_num(struct ccdbg *dbg, int num)
-{
-       uint32_t        sync;
-       uint32_t        max;
-
-       printf ("#\n#play %d\n#\n", num);
-       max = (1 << num);
-       for (sync = 0; sync < max; sync++)
-               if (_ccdbg_play(dbg, num, sync))
-                       return 1;
-       return 0;
-}
-
-static int
-_ccdbg_play_many(struct ccdbg *dbg, int max)
-{
-       int     num;
-
-       for (num = 0; num < max; num++)
-               if (_ccdbg_play_num(dbg, num))
-                       return 1;
-       return 0;
-}
-
-static void
-ccdbg_manual(struct ccdbg *dbg, FILE *input)
-{
-       char    line[80];
-       uint8_t set, mask;
-
-       while (fgets(line, sizeof line, input)) {
-               if (line[0] == '#' || line[0] == '\n') {
-                       printf ("%s", line);
-                       continue;
-               }
-               set = 0;
-               mask = 0;
-               get_bit(line, 0, 'C', CC_CLOCK, &set, &mask);
-               get_bit(line, 2, 'D', CC_DATA, &set, &mask);
-               get_bit(line, 4, 'R', CC_RESET_N, &set, &mask);
-               ccdbg_write_read(dbg, set, mask);
-       }
-}
-
 int
 main (int argc, char **argv)
 {
@@ -249,18 +28,16 @@ main (int argc, char **argv)
        dbg = ccdbg_open("/dev/ttyUSB0");
        if (!dbg)
                exit (1);
-#if 0  
-       _ccdbg_play(dbg, 0, 0);
-       _ccdbg_play_many(dbg, 8);
-#endif
-       ccdbg_manual(dbg, stdin);
 #if 0
+       ccdbg_manual(dbg, stdin);
+#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);
-       _ccdbg_reset(dbg);
+       ccdbg_reset(dbg);
 #endif
        ccdbg_close(dbg);
        exit (0);

diff --git a/ccdbg.h b/ccdbg.h
index 8ccd477012ca6d7264a8f8810a4aa911e7825019..a0ef1c86bccdbb22781c5a65e726fe3474c2fe26 100644 (file)
--- a/ccdbg.h
+++ b/ccdbg.h
@@ -45,7 +45,7 @@
 
 
 /* painfully slow for now */
-#define CC_CLOCK_US    (100)
+#define CC_CLOCK_US    (1000)
 
 struct ccdbg {
        usb_dev_handle  *usb_dev;
@@ -91,6 +91,9 @@ struct ccdbg {
 #define CC_STEP_REPLACE                (0x64|(n))
 #define CC_GET_CHIP_ID         0x68
 
+#define CC_DEBUG_BITBANG       0x00000001
+#define CC_DEBUG_COMMAND       0x00000002
+
 /* ccdbg-command.c */
 void
 ccdbg_debug_mode(struct ccdbg *dbg);
@@ -107,6 +110,16 @@ ccdbg_rd_config(struct ccdbg *dbg);
 uint16_t
 ccdbg_get_chip_id(struct ccdbg *dbg);
 
+/* ccdbg-debug.c */
+void
+ccdbg_debug(int level, char *format, ...);
+
+void
+ccdbg_add_debug(int level);
+
+void
+ccdbg_clear_debug(int level);
+
 /* ccdbg-io.c */
 void
 ccdbg_quarter_clock(struct ccdbg *dbg);
@@ -153,6 +166,35 @@ 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);
+
+void
+ccdbg_send_byte(struct ccdbg *dbg, uint8_t byte);
+
+void
+ccdbg_send_bytes(struct ccdbg *dbg, uint8_t *bytes, int nbytes);
+
+uint8_t
+ccdbg_recv_bit(struct ccdbg *dbg, int first);
+
+uint8_t
+ccdbg_recv_byte(struct ccdbg *dbg, int first);
+
+void
+ccdbg_recv_bytes(struct ccdbg *dbg, uint8_t *bytes, int nbytes);
+
+void
+ccdbg_print(char *format, uint8_t mask, uint8_t set);
+
+/* ccdbg-manual.c */
+
+void
+ccdbg_manual(struct ccdbg *dbg, FILE *input);
+
 /* cp-usb.c */
 void
 cp_usb_init(struct ccdbg *dbg);

diff --git a/rd_config b/rd_config
index 7f8686fe79d81fe73b71c4bbb2b1be8c275c95a0..e2d43f10121f81a910bdacbd8d53412a978e9d0a 100644 (file)
--- a/rd_config
+++ b/rd_config
@@ -35,19 +35,21 @@ C . R       0
 #
 
 C D R
-. D R
-C D R
-. D R
-C D R
-. D R
-C D R
-. D R
+. - R
+C - R
+. - R
+C - R
+. - R
+C - R
+. - R
+
+C - R
+. - R
+C - R
+. - R
+C - R
+. - R
+C - R
+. - R
 
 C D R
-. D R
-C D R
-. D R
-C D R
-. D R
-C D R
-. D R