From: Keith Packard <keithp@keithp.com>
Date: Sat, 3 Sep 2016 04:36:36 +0000 (-0500)
Subject: ao-tools/ao-cal-freq: Re-open usb device each try
X-Git-Tag: 1.6.8~1^2~10
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=30e8f003381c30434058905f53f5a219ac5feb4f;p=fw%2Faltos

ao-tools/ao-cal-freq: Re-open usb device each try

Instead of trying to re-use the same file descriptor, close and
re-open the device each time around the loop to avoid getting stuck
when calibrating TeleMega boards.

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

diff --git a/ao-tools/ao-cal-freq/ao-cal-freq.c b/ao-tools/ao-cal-freq/ao-cal-freq.c
index c2982684..12c2a3ae 100644
--- a/ao-tools/ao-cal-freq/ao-cal-freq.c
+++ b/ao-tools/ao-cal-freq/ao-cal-freq.c
@@ -168,7 +168,8 @@ await_key(void)
 }
 
 int
-do_cal(struct cc_usb *usb) {
+do_cal(char *tty) {
+	struct cc_usb *usb = NULL;
 	struct flash	*b;
 	char	line[1024];
 	double	measured_freq;
@@ -178,10 +179,17 @@ do_cal(struct cc_usb *usb) {
 	int	cur_freq;
 	int	cur_cal;
 	int	new_cal;
-
-	cc_usb_printf(usb, "E 0\n");
+	int	ret = 1;
 
 	for(;;) {
+		usb = cc_usb_open(tty);
+
+		if (!usb)
+			exit(1);
+
+		cc_usb_printf(usb, "E 0\n");
+
+		cc_usb_sync(usb);
 		cc_usb_printf(usb, "C 1\n");
 		cc_usb_sync(usb);
 
@@ -202,7 +210,8 @@ do_cal(struct cc_usb *usb) {
 
 		if (!cur_cal_words || !cur_freq_words) {
 			printf("no response\n");
-			return 0;
+			ret = 0;
+			break;
 		}
 
 		cur_cal = atoi(cur_cal_words[2]);
@@ -218,8 +227,11 @@ do_cal(struct cc_usb *usb) {
 
 		cc_usb_printf (usb, "c f %d\nc w\n", new_cal);
 		cc_usb_sync(usb);
+		cc_usb_close(usb);
 	}
-	return 1;
+	if (usb)
+		cc_usb_close(usb);
+	return ret;
 }
 
 int
@@ -232,7 +244,6 @@ main (int argc, char **argv)
 	int			i;
 	int			c;
 	int			tries;
-	struct cc_usb		*cc = NULL;
 	char			*tty = NULL;
 	int			success;
 	int			verbose = 0;
@@ -270,12 +281,6 @@ main (int argc, char **argv)
 	if (!tty)
 		tty="/dev/ttyACM0";
 
-	cc = cc_usb_open(tty);
-
-	if (!cc)
-		exit(1);
-
-	if (!do_cal(cc))
+	if (!do_cal(tty))
 		ret = 1;
-	done(cc, ret);
 }