Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / usbrelay-v0.1 / ao_usbrelay.c

diff --git a/src/usbrelay-v0.1/ao_usbrelay.c b/src/usbrelay-v0.1/ao_usbrelay.c
index d908f4dbeebdee342ff9d17751e8599a5ab47950..946f4b12985b66cc8567ea84e8c39859c3063074 100644 (file)
--- a/src/usbrelay-v0.1/ao_usbrelay.c
+++ b/src/usbrelay-v0.1/ao_usbrelay.c
@@ -45,21 +45,20 @@ ao_relay_control(uint8_t output)
 }
 
 static void
-ao_relay_select(void) __reentrant
+ao_relay_select(void) 
 {
        uint8_t output;
 
-       ao_cmd_decimal();
+       output = ao_cmd_decimal();
         if (ao_cmd_status != ao_cmd_success)
                 return;
-       output = ao_cmd_lex_i;
        if (output > 1) 
                printf ("Invalid relay position %u\n", output);
        else
                ao_relay_control(output);
 }
 
-static __code struct ao_cmds ao_relay_cmds[] = {
+static const struct ao_cmds ao_relay_cmds[] = {
        { ao_relay_select, "R <output>\0Select relay output" },
        { 0, NULL }
 };