Switch from GPLv2 to GPLv2+

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

diff --git a/src/kernel/ao_convert.c b/src/kernel/ao_convert.c
index aa9b5f484b438e0871aa395a1cd37d7979237a11..1cd623459ca860512799b57e0ec3626de048a669 100644 (file)
--- a/src/kernel/ao_convert.c
+++ b/src/kernel/ao_convert.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,14 +20,16 @@
 #include "ao.h"
 #endif
 
-static const int16_t altitude_table[] = {
+#include <ao_sample.h>
+
+static const ao_v_t altitude_table[] = {
 #include "altitude.h"
 };
 
 #define ALT_FRAC_SCALE (1 << ALT_FRAC_BITS)
 #define ALT_FRAC_MASK  (ALT_FRAC_SCALE - 1)
 
-int16_t
+ao_v_t
 ao_pres_to_altitude(int16_t pres) __reentrant
 {
        uint8_t o;
@@ -43,9 +46,9 @@ ao_pres_to_altitude(int16_t pres) __reentrant
 
 #if AO_NEED_ALTITUDE_TO_PRES
 int16_t
-ao_altitude_to_pres(int16_t alt) __reentrant
+ao_altitude_to_pres(ao_v_t alt) __reentrant
 {
-       int16_t span, sub_span;
+       ao_v_t span, sub_span;
        uint8_t l, h, m;
        int32_t pres;