X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flib%2Fcc-usb.c;h=a3a19d5cda58c875fce4c0dc90d54d15013fa3a2;hp=9b3b831f3898e44c5f61f9bb14f70e6f770f78e6;hb=ca4b20f9781b1dc6974d26952973dfe0d607478c;hpb=27ebaf8e13aed06bb1ea6e770f767495a02be6c5

diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index 9b3b831f..a3a19d5c 100644
--- a/ao-tools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
@@ -123,9 +123,10 @@ cc_handle_hex_read(struct cc_usb *cc)
 static void
 cc_usb_dbg(int indent, uint8_t *bytes, int len)
 {
-	int	eol = 1;
+	static int	eol = 1;
 	int	i;
 	uint8_t	c;
+	ccdbg_debug(CC_DEBUG_BITBANG, "<<<%d bytes>>>", len);
 	while (len--) {
 		c = *bytes++;
 		if (eol) {
@@ -135,12 +136,17 @@ cc_usb_dbg(int indent, uint8_t *bytes, int len)
 		}
 		switch (c) {
 		case '\r':
-			ccdbg_debug(CC_DEBUG_BITBANG, "^M");
+			ccdbg_debug(CC_DEBUG_BITBANG, "\\r");
 			break;
 		case '\n':
 			eol = 1;
+			ccdbg_debug(CC_DEBUG_BITBANG, "\\n\n");
+			break;
 		default:
-			ccdbg_debug(CC_DEBUG_BITBANG, "%c", c);
+			if (c < ' ' || c > '~')
+				ccdbg_debug(CC_DEBUG_BITBANG, "\\%02x", c);
+			else
+				ccdbg_debug(CC_DEBUG_BITBANG, "%c", c);
 		}
 	}
 }
@@ -254,10 +260,10 @@ cc_usb_printf(struct cc_usb *cc, char *format, ...)
 }
 
 int
-cc_usb_getchar(struct cc_usb *cc)
+cc_usb_getchar_timeout(struct cc_usb *cc, int timeout)
 {
 	while (cc->in_pos == cc->in_count) {
-		if (_cc_usb_sync(cc, 5000) < 0) {
+		if (_cc_usb_sync(cc, timeout) < 0) {
 			fprintf(stderr, "USB link timeout\n");
 			exit(1);
 		}
@@ -265,6 +271,12 @@ cc_usb_getchar(struct cc_usb *cc)
 	return cc->in_buf[cc->in_pos++];
 }
 
+int
+cc_usb_getchar(struct cc_usb *cc)
+{
+	return cc_usb_getchar_timeout(cc, 5000);
+}
+
 void
 cc_usb_getline(struct cc_usb *cc, char *line, int max)
 {
@@ -375,10 +387,12 @@ cc_usb_reset(struct cc_usb *cc)
 }
 
 void
-cc_usb_open_remote(struct cc_usb *cc)
+cc_usb_open_remote(struct cc_usb *cc, int freq, char *call)
 {
 	if (!cc->remote) {
-		cc_usb_printf(cc, "p\nE 0\n");
+		fprintf (stderr, "freq %dkHz\n", freq);
+		fprintf (stderr, "call %s\n", call);
+		cc_usb_printf(cc, "\nc F %d\nc c %s\np\nE 0\n", freq, call);
 		do {
 			cc->in_count = cc->in_pos = 0;
 			_cc_usb_sync(cc, 100);
@@ -398,19 +412,35 @@ cc_usb_close_remote(struct cc_usb *cc)
 
 static struct termios	save_termios;
 
+#include <errno.h>
+
 struct cc_usb *
 cc_usb_open(char *tty)
 {
 	struct cc_usb	*cc;
 	struct termios	termios;
+	int		i;
 
 	if (!tty)
 		tty = DEFAULT_TTY;
 	cc = calloc (sizeof (struct cc_usb), 1);
 	if (!cc)
 		return NULL;
-	cc->fd = open(tty, O_RDWR | O_NONBLOCK);
-	if (cc->fd < 0) {
+	i = 0;
+	for (;;) {
+		cc->fd = open(tty, O_RDWR | O_NONBLOCK);
+		if (cc->fd >= 0)
+			break;
+		i++;
+		if (errno == EBUSY || errno == EPERM || errno == EACCES) {
+			fprintf(stderr, "open failed, pausing");
+			perror(tty);
+			if (i < 20) {
+				sleep(3);
+				continue;
+			}
+		}
+
 		perror(tty);
 		free (cc);
 		return NULL;
@@ -418,8 +448,10 @@ cc_usb_open(char *tty)
 	tcgetattr(cc->fd, &termios);
 	save_termios = termios;
 	cfmakeraw(&termios);
+	cfsetospeed(&termios, B9600);
+	cfsetispeed(&termios, B9600);
 	tcsetattr(cc->fd, TCSAFLUSH, &termios);
-	cc_usb_printf(cc, "E 0\nm 0\n");
+	cc_usb_printf(cc, "\nE 0\nm 0\n");
 	do {
 		cc->in_count = cc->in_pos = 0;
 		_cc_usb_sync(cc, 100);