projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: first cut at easymega v2.0 support .. nothing working yet
[fw/altos]
/
ao-tools
/
lib
/
ccdbg-io.c
diff --git
a/ao-tools/lib/ccdbg-io.c
b/ao-tools/lib/ccdbg-io.c
index 9c6693cdbe0ad5a0698cdcfc8b214761b877b148..d3f8727433fa40d90a68c753f803a27cc8f95241 100644
(file)
--- a/
ao-tools/lib/ccdbg-io.c
+++ b/
ao-tools/lib/ccdbg-io.c
@@
-22,25
+22,32
@@
#include "cc-bitbang.h"
struct ccdbg *
#include "cc-bitbang.h"
struct ccdbg *
-ccdbg_open(
void
)
+ccdbg_open(
char *tty
)
{
struct ccdbg *dbg;
{
struct ccdbg *dbg;
- char *tty;
dbg = calloc(sizeof (struct ccdbg), 1);
if (!dbg) {
perror("calloc");
return NULL;
}
dbg = calloc(sizeof (struct ccdbg), 1);
if (!dbg) {
perror("calloc");
return NULL;
}
- tty = getenv("CCDBG_TTY");
- if (!tty || tty[0] == '/')
- dbg->usb = cc_usb_open(tty);
- if (!dbg->usb) {
+ if (!tty)
+ tty = getenv("ALTOS_TTY");
+ if (!tty)
+ tty="/dev/ttyACM0";
+
+ if (!strcmp(tty, "BITBANG")) {
dbg->bb = cc_bitbang_open();
if (!dbg->bb) {
free(dbg);
return NULL;
}
dbg->bb = cc_bitbang_open();
if (!dbg->bb) {
free(dbg);
return NULL;
}
+ } else {
+ dbg->usb = cc_usb_open(tty);
+ if (!dbg->usb) {
+ free(dbg);
+ return NULL;
+ }
}
return dbg;
}
}
return dbg;
}