From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 May 2014 03:58:24 +0000 (-0700)
Subject: ao-tools: Add cc_usb_write function
X-Git-Tag: 1.3.2.2~74
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d63319f6f29ef714bb1d5c359c2448f63e7a4534;hp=0a6c76fc0525d6588a1d88127f0085f13a02f1af

ao-tools: Add cc_usb_write function

This writes raw bytes to the USB port; useful for sending binary data
for flashing or the upcoming flight test stuff.

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

diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index a3a19d5c..38dfff04 100644
--- a/ao-tools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
@@ -53,6 +53,7 @@ struct cc_usb {
 
 	struct cc_hex_read	hex_buf[CC_NUM_HEX_READ];
 	int			hex_count;
+	int			show_input;
 
 	int			remote;
 };
@@ -156,7 +157,7 @@ cc_usb_dbg(int indent, uint8_t *bytes, int len)
  */
 
 static int
-_cc_usb_sync(struct cc_usb *cc, int wait_for_input)
+_cc_usb_sync(struct cc_usb *cc, int wait_for_input, int write_timeout)
 {
 	int		ret;
 	struct pollfd	fds;
@@ -165,7 +166,7 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input)
 	fds.fd = cc->fd;
 	for (;;) {
 		if (cc->hex_count || cc->out_count)
-			timeout = 5000;
+			timeout = write_timeout;
 		else if (wait_for_input && cc->in_pos == cc->in_count)
 			timeout = wait_for_input;
 		else
@@ -200,6 +201,10 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input)
 				cc->in_count += ret;
 				if (cc->hex_count)
 					cc_handle_hex_read(cc);
+				if (cc->show_input && cc->in_count) {
+					write(2, cc->in_buf, cc->in_count);
+					cc->in_count = 0;
+				}
 			} else if (ret < 0)
 				perror("read");
 		}
@@ -222,7 +227,7 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input)
 void
 cc_usb_sync(struct cc_usb *cc)
 {
-	if (_cc_usb_sync(cc, 0) < 0) {
+	if (_cc_usb_sync(cc, 0, 5000) < 0) {
 		fprintf(stderr, "USB link timeout\n");
 		exit(1);
 	}
@@ -263,7 +268,7 @@ int
 cc_usb_getchar_timeout(struct cc_usb *cc, int timeout)
 {
 	while (cc->in_pos == cc->in_count) {
-		if (_cc_usb_sync(cc, timeout) < 0) {
+		if (_cc_usb_sync(cc, timeout, 5000) < 0) {
 			fprintf(stderr, "USB link timeout\n");
 			exit(1);
 		}
@@ -395,7 +400,7 @@ cc_usb_open_remote(struct cc_usb *cc, int freq, char *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);
+			_cc_usb_sync(cc, 100, 5000);
 		} while (cc->in_count > 0);
 		cc->remote = 1;
 	}
@@ -454,7 +459,7 @@ cc_usb_open(char *tty)
 	cc_usb_printf(cc, "\nE 0\nm 0\n");
 	do {
 		cc->in_count = cc->in_pos = 0;
-		_cc_usb_sync(cc, 100);
+		_cc_usb_sync(cc, 100, 5000);
 	} while (cc->in_count > 0);
 	return cc;
 }
@@ -468,3 +473,26 @@ cc_usb_close(struct cc_usb *cc)
 	close (cc->fd);
 	free (cc);
 }
+
+int
+cc_usb_write(struct cc_usb *cc, void *buf, int c)
+{
+	uint8_t	*b;
+	int this_time;
+
+	b = buf;
+	cc->show_input = 1;
+	while (c > 0) {
+		this_time = c;
+		if (this_time > CC_OUT_BUF - cc->out_count)
+			this_time = CC_OUT_BUF - cc->out_count;
+		memcpy(cc->out_buf + cc->out_count, b, this_time);
+		cc->out_count += this_time;
+		c -= this_time;
+		b += this_time;
+		while (cc->out_count >= CC_OUT_BUF) {
+			_cc_usb_sync(cc, 0, -1);
+		}
+	}
+	return 1;
+}
diff --git a/ao-tools/lib/cc-usb.h b/ao-tools/lib/cc-usb.h
index f1193456..e08a956b 100644
--- a/ao-tools/lib/cc-usb.h
+++ b/ao-tools/lib/cc-usb.h
@@ -65,6 +65,9 @@ cc_usb_getline(struct cc_usb *cc, char *line, int max);
 void
 cc_usb_printf(struct cc_usb *cc, char *format, ...);
 
+int
+cc_usb_write(struct cc_usb *cc, void *buf, int c);
+
 void
 cc_usb_open_remote(struct cc_usb *cc, int freq, char *call);