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

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

diff --git a/src/kernel/ao_rssi.c b/src/kernel/ao_rssi.c
index 244a84fe3f68c76e7c83371cc3683f2d9b57c18c..aacc38b271345e0e9db963ff5c5466eee3b4f4de 100644 (file)
--- a/src/kernel/ao_rssi.c
+++ b/src/kernel/ao_rssi.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
@@ -17,9 +18,9 @@
 
 #include "ao.h"
 
-static __xdata uint16_t        ao_rssi_time;
-static __pdata uint16_t        ao_rssi_delay;
-static __pdata uint8_t ao_rssi_led;
+static uint16_t                ao_rssi_time;
+static uint16_t                ao_rssi_delay;
+static AO_LED_TYPE     ao_rssi_led;
 
 void
 ao_rssi(void)
@@ -33,7 +34,7 @@ ao_rssi(void)
 }
 
 void
-ao_rssi_set(int rssi_value)
+ao_rssi_set(int16_t rssi_value)
 {
        if (rssi_value > 0)
                rssi_value = 0;
@@ -42,10 +43,10 @@ ao_rssi_set(int rssi_value)
        ao_wakeup(&ao_rssi_time);
 }
 
-__xdata struct ao_task ao_rssi_task;
+struct ao_task ao_rssi_task;
 
 void
-ao_rssi_init(uint8_t rssi_led)
+ao_rssi_init(AO_LED_TYPE rssi_led)
 {
        ao_rssi_led = rssi_led;
        ao_rssi_delay = 0;