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

[fw/altos] / src / kernel / ao_send_packet.c

diff --git a/src/kernel/ao_send_packet.c b/src/kernel/ao_send_packet.c
index 66315d227e8e05ac8a620e6727e11d44586f00ca..cae25151f4db99077a061123f2bb69792bba3c3a 100644 (file)
--- a/src/kernel/ao_send_packet.c
+++ b/src/kernel/ao_send_packet.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,17 +20,16 @@
 
 #define AO_MAX_SEND    128
 
-static __xdata uint8_t ao_send[AO_MAX_SEND];
+static uint8_t ao_send[AO_MAX_SEND];
 
 static void
 ao_send_packet(void)
 {
-       __pdata uint16_t count;
+       uint16_t count;
        uint8_t b;
-       __pdata uint8_t i;
+       uint8_t i;
 
-       ao_cmd_hex();
-       count = ao_cmd_lex_i;
+       count = ao_cmd_hex();
        if (ao_cmd_status != ao_cmd_success)
                return;
        if (count > AO_MAX_SEND - 2) {
@@ -46,7 +46,7 @@ ao_send_packet(void)
        ao_radio_send(ao_send, count);
 }
 
-static __code struct ao_cmds ao_send_packet_cmds[] = {
+static const struct ao_cmds ao_send_packet_cmds[] = {
        { ao_send_packet, "S <len>\0Send packet. Data on next line" },
        { 0, NULL }
 };