projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Split out TeleMini v3 log/telem labeling
[fw/altos]
/
src
/
kernel
/
ao_cmd.c
diff --git
a/src/kernel/ao_cmd.c
b/src/kernel/ao_cmd.c
index 10716afd5e8e0ffe9fab17fb459874a6dfa748d5..881f3500ab7efd4c4d5dd992eef09269a3c0d11b 100644
(file)
--- a/
src/kernel/ao_cmd.c
+++ b/
src/kernel/ao_cmd.c
@@
-24,13
+24,15
@@
__pdata uint32_t ao_cmd_lex_u32;
__pdata char ao_cmd_lex_c;
__pdata enum ao_cmd_status ao_cmd_status;
__pdata char ao_cmd_lex_c;
__pdata enum ao_cmd_status ao_cmd_status;
+#ifndef AO_CMD_LEN
#if AO_PYRO_NUM
#if AO_PYRO_NUM
-#define CMD_LEN 128
+#define
AO_
CMD_LEN 128
#else
#else
-#define CMD_LEN 48
+#define AO_CMD_LEN 48
+#endif
#endif
#endif
-static __xdata char cmd_line[CMD_LEN];
+static __xdata char cmd_line[
AO_
CMD_LEN];
static __pdata uint8_t cmd_len;
static __pdata uint8_t cmd_i;
static __pdata uint8_t cmd_len;
static __pdata uint8_t cmd_i;
@@
-48,8
+50,8
@@
backspace(void)
ao_put_string ("\010 \010");
}
ao_put_string ("\010 \010");
}
-
static
void
-readline(void)
+void
+
ao_cmd_
readline(void)
{
char c;
if (ao_echo())
{
char c;
if (ao_echo())
@@
-88,7
+90,7
@@
readline(void)
break;
}
break;
}
- if (cmd_len >= CMD_LEN - 2)
+ if (cmd_len >=
AO_
CMD_LEN - 2)
continue;
cmd_line[cmd_len++] = c;
if (ao_echo())
continue;
cmd_line[cmd_len++] = c;
if (ao_echo())
@@
-99,12
+101,13
@@
readline(void)
cmd_i = 0;
}
cmd_i = 0;
}
-void
+char
ao_cmd_lex(void)
{
ao_cmd_lex_c = '\n';
if (cmd_i < cmd_len)
ao_cmd_lex_c = cmd_line[cmd_i++];
ao_cmd_lex(void)
{
ao_cmd_lex_c = '\n';
if (cmd_i < cmd_len)
ao_cmd_lex_c = cmd_line[cmd_i++];
+ return ao_cmd_lex_c;
}
static void
}
static void
@@
-307,7
+310,7
@@
version(void)
#endif
#endif
#if defined(AO_BOOT_APPLICATION_BASE) && defined(AO_BOOT_APPLICATION_BOUND)
#endif
#endif
#if defined(AO_BOOT_APPLICATION_BASE) && defined(AO_BOOT_APPLICATION_BOUND)
- , (u
int32_t) AO_BOOT_APPLICATION_BOUND - (uint32_t) AO_BOOT_APPLICATION_BASE
+ , (u
nsigned) ((uint32_t) AO_BOOT_APPLICATION_BOUND - (uint32_t) AO_BOOT_APPLICATION_BASE)
#endif
);
printf("software-version %s\n", ao_version);
#endif
);
printf("software-version %s\n", ao_version);
@@
-376,7
+379,7
@@
ao_cmd(void)
void (*__xdata func)(void);
for (;;) {
void (*__xdata func)(void);
for (;;) {
- readline();
+
ao_cmd_
readline();
ao_cmd_lex();
ao_cmd_white();
c = ao_cmd_lex_c;
ao_cmd_lex();
ao_cmd_white();
c = ao_cmd_lex_c;