projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: Make library support µPusb
[fw/altos]
/
ao-tools
/
lib
/
cc-usb.c
diff --git
a/ao-tools/lib/cc-usb.c
b/ao-tools/lib/cc-usb.c
index 9f07e6624d2c849f7469c07cbc80dc018648f383..f82752435d03c48126253541e8b5af8d5a653b63 100644
(file)
--- 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
}
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) {
{
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);
}
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++];
}
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)
{
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);
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 {
tcsetattr(cc->fd, TCSAFLUSH, &termios);
cc_usb_printf(cc, "\nE 0\nm 0\n");
do {