projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools/ao-stmload: Add --verbose flag
[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 485583f98b3897c1816547ffc4b7ae95ee32a6b1..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,10
+136,12
@@
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:
if (c < ' ' || c > '~')
ccdbg_debug(CC_DEBUG_BITBANG, "\\%02x", c);
default:
if (c < ' ' || c > '~')
ccdbg_debug(CC_DEBUG_BITBANG, "\\%02x", c);
@@
-193,7
+196,6
@@
_cc_usb_sync(struct cc_usb *cc, int wait_for_input)
ret = read(cc->fd, cc->in_buf + cc->in_count,
CC_IN_BUF - cc->in_count);
if (ret > 0) {
ret = read(cc->fd, cc->in_buf + cc->in_count,
CC_IN_BUF - cc->in_count);
if (ret > 0) {
- int i;
cc_usb_dbg(24, cc->in_buf + cc->in_count, ret);
cc->in_count += ret;
if (cc->hex_count)
cc_usb_dbg(24, cc->in_buf + cc->in_count, ret);
cc->in_count += ret;
if (cc->hex_count)