diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
| commit | 33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86 (patch) | |
| tree | a9ff47afab29fe141dcd1da0ca276b367f911cb6 /ao-tools/lib/cc-usb.h | |
| parent | 1a84db819a359be39be51c9105039ab28c9fc894 (diff) | |
| parent | 90b0db1ae53182c94bf12d661446fc369d916366 (diff) | |
Merge branch 'master' into stm-flash
Conflicts:
ao-tools/ao-stmload/ao-stmload.c
Diffstat (limited to 'ao-tools/lib/cc-usb.h')
| -rw-r--r-- | ao-tools/lib/cc-usb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ao-tools/lib/cc-usb.h b/ao-tools/lib/cc-usb.h index e90e1195..f1193456 100644 --- a/ao-tools/lib/cc-usb.h +++ b/ao-tools/lib/cc-usb.h @@ -54,6 +54,9 @@ void cc_queue_read(struct cc_usb *cc, uint8_t *buf, int len); int +cc_usb_getchar_timeout(struct cc_usb *cc, int timeout); + +int cc_usb_getchar(struct cc_usb *cc); void |