X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Flib%2Fcc-usb.c;fp=ao-tools%2Flib%2Fcc-usb.c;h=f82752435d03c48126253541e8b5af8d5a653b63;hb=15bc83a0eaaa9a43d67fdc3e9f412d5b2c1f06dd;hp=9f07e6624d2c849f7469c07cbc80dc018648f383;hpb=50dd268a715224a01f8a6b481670a4ae6621cb28;p=fw%2Faltos

diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index 9f07e662..f8275243 100644
--- a/ao-tools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
@@ -254,10 +254,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 +265,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)
 {
@@ -420,6 +426,8 @@ 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, "\nE 0\nm 0\n");
 	do {