projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: complain if st-flash is not available
[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 1580c6d9ffee488f84e1910e3e1cc9ecec943938..d7ac138c6e1210b87c6bae203d76569c23812e26 100644
(file)
--- 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)
{
static void
cc_usb_dbg(int indent, uint8_t *bytes, int len)
{
-
int
eol = 1;
+
static int
eol = 1;
int i;
uint8_t c;
int i;
uint8_t c;
+ ccdbg_debug(CC_DEBUG_BITBANG, "<<<%d bytes>>>", len);
while (len--) {
c = *bytes++;
if (eol) {
while (len--) {
c = *bytes++;
if (eol) {
@@
-135,12
+136,17
@@
cc_usb_dbg(int indent, uint8_t *bytes, int len)
}
switch (c) {
case '\r':
}
switch (c) {
case '\r':
- ccdbg_debug(CC_DEBUG_BITBANG, "
^M
");
+ ccdbg_debug(CC_DEBUG_BITBANG, "
\\r
");
break;
case '\n':
eol = 1;
break;
case '\n':
eol = 1;
+ ccdbg_debug(CC_DEBUG_BITBANG, "\\n\n");
+ break;
default:
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
}
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
+271,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)
{
@@
-375,11
+387,12
@@
cc_usb_reset(struct cc_usb *cc)
}
void
}
void
-cc_usb_open_remote(struct cc_usb *cc, int
channe
l)
+cc_usb_open_remote(struct cc_usb *cc, int
freq, char *cal
l)
{
if (!cc->remote) {
{
if (!cc->remote) {
- printf ("channel %d\n", channel);
- cc_usb_printf(cc, "\nc r %d\np\nE 0\n", channel);
+ 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);
do {
cc->in_count = cc->in_pos = 0;
_cc_usb_sync(cc, 100);
@@
-419,6
+432,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 {