projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB spec limits bulk endpoints to 64 byte payload max.
[fw/altos]
/
ao_cmd.c
diff --git
a/ao_cmd.c
b/ao_cmd.c
index 7f7865364da5a4a10949a1a5e2d964aeecca1512..f0459a73fd4976b17b6077328d2c2b2c8ea13516 100644
(file)
--- a/
ao_cmd.c
+++ b/
ao_cmd.c
@@
-18,20
+18,20
@@
#include "ao.h"
__xdata uint16_t ao_cmd_lex_i;
#include "ao.h"
__xdata uint16_t ao_cmd_lex_i;
-__xdata
uint8_t
ao_cmd_lex_c;
+__xdata
char
ao_cmd_lex_c;
__xdata enum ao_cmd_status ao_cmd_status;
static __xdata uint8_t lex_echo;
#define CMD_LEN 32
__xdata enum ao_cmd_status ao_cmd_status;
static __xdata uint8_t lex_echo;
#define CMD_LEN 32
-static __xdata
uint8_t
cmd_line[CMD_LEN];
+static __xdata
char
cmd_line[CMD_LEN];
static __xdata uint8_t cmd_len;
static __xdata uint8_t cmd_i;
static void
put_string(char *s)
{
static __xdata uint8_t cmd_len;
static __xdata uint8_t cmd_i;
static void
put_string(char *s)
{
- __xdata
uint8_t
c;
+ __xdata
char
c;
while (c = *s++)
putchar(c);
}
while (c = *s++)
putchar(c);
}
@@
-39,7
+39,7
@@
put_string(char *s)
static void
readline(void)
{
static void
readline(void)
{
- __xdata
uint8_t
c;
+ __xdata
char
c;
if (lex_echo)
put_string("> ");
cmd_len = 0;
if (lex_echo)
put_string("> ");
cmd_len = 0;
@@
-152,9
+152,8
@@
ao_cmd_hex(void)
ao_cmd_status = r;
}
ao_cmd_status = r;
}
-#if 0
-static void
-decimal(void)
+void
+ao_cmd_decimal(void)
{
__xdata uint8_t r = ao_cmd_lex_error;
{
__xdata uint8_t r = ao_cmd_lex_error;
@@
-162,7
+161,7
@@
decimal(void)
ao_cmd_white();
for(;;) {
if ('0' <= ao_cmd_lex_c && ao_cmd_lex_c <= '9')
ao_cmd_white();
for(;;) {
if ('0' <= ao_cmd_lex_c && ao_cmd_lex_c <= '9')
- ao_cmd_lex_i = (ao_cmd_lex_i * 10
) |
(ao_cmd_lex_c - '0');
+ ao_cmd_lex_i = (ao_cmd_lex_i * 10
) +
(ao_cmd_lex_c - '0');
else
break;
r = ao_cmd_success;
else
break;
r = ao_cmd_success;
@@
-171,7
+170,6
@@
decimal(void)
if (r != ao_cmd_success)
ao_cmd_status = r;
}
if (r != ao_cmd_success)
ao_cmd_status = r;
}
-#endif
static void
eol(void)
static void
eol(void)
@@
-214,9
+212,9
@@
echo(void)
lex_echo = ao_cmd_lex_i != 0;
}
lex_echo = ao_cmd_lex_i != 0;
}
-static const
uint8_t
help_txt[] = "All numbers are in hex";
+static const
char
help_txt[] = "All numbers are in hex";
-#define NUM_CMDS 1
0
+#define NUM_CMDS 1
1
static __code struct ao_cmds *__xdata (ao_cmds[NUM_CMDS]);
static __xdata uint8_t ao_ncmds;
static __code struct ao_cmds *__xdata (ao_cmds[NUM_CMDS]);
static __xdata uint8_t ao_ncmds;
@@
-258,7
+256,7
@@
ao_cmd_register(__code struct ao_cmds *cmds)
void
ao_cmd(void *parameters)
{
void
ao_cmd(void *parameters)
{
- __xdata
uint8_t
c;
+ __xdata
char
c;
__xdata uint8_t cmd, cmds;
__code struct ao_cmds * __xdata cs;
void (*__xdata func)(void);
__xdata uint8_t cmd, cmds;
__code struct ao_cmds * __xdata cs;
void (*__xdata func)(void);