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

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

diff --git a/src/kernel/ao_report_micro.c b/src/kernel/ao_report_micro.c
index 0e8e287f63eae1c123988dd26ee12df95c3868ec..efada54b516be302d477c891e05947292e9640f8 100644 (file)
--- a/src/kernel/ao_report_micro.c
+++ b/src/kernel/ao_report_micro.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
@@ -16,12 +17,13 @@
  */
 
 #include <ao.h>
+#include <ao_report_micro.h>
 
 #define mid(time)      ao_led_for(AO_LED_REPORT, time)
 #define pause(time)    ao_delay(time)
 
 static void
-ao_report_digit(uint8_t digit) __reentrant
+ao_report_digit(uint8_t digit) 
 {
        if (!digit) {
                mid(AO_MS_TO_TICKS(1000));
@@ -38,9 +40,9 @@ ao_report_digit(uint8_t digit) __reentrant
 void
 ao_report_altitude(void)
 {
-       __pdata alt_t   agl = ao_max_height;
-       static __xdata uint8_t  digits[11];
-       __pdata uint8_t ndigits, i;
+       alt_t   agl = ao_max_height;
+       static uint8_t  digits[11];
+       uint8_t ndigits, i;
 
        if (agl < 0)
                agl = 0;