Switch from GPLv2 to GPLv2+

[fw/altos] / src / kernel / ao_data.h

diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h
index c4b062fdb1d0f9f4631354ada9b2baa30df9910a..d62852efd69cdc707a7dacf8c49e2f898e18514c 100644 (file)
--- a/src/kernel/ao_data.h
+++ b/src/kernel/ao_data.h
@@ -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
@@ -117,9 +118,7 @@ extern volatile __data uint8_t              ao_data_count;
 
 typedef int32_t        pres_t;
 
-#ifndef AO_ALT_TYPE
 #define AO_ALT_TYPE    int32_t
-#endif
 
 typedef AO_ALT_TYPE    alt_t;
 
@@ -146,10 +145,6 @@ typedef int16_t alt_t;
 
 #endif
 
-#if !HAS_BARO
-typedef int16_t alt_t;
-#endif
-
 /*
  * Need a few macros to pull data from the sensors:
  *
@@ -275,6 +270,10 @@ typedef int16_t accel_t;
 
 #define AO_ACCEL_INVERT                4095
 
+#ifndef AO_MMA655X_INVERT
+#error AO_MMA655X_INVERT not defined
+#endif
+
 #define ao_data_accel(packet)                  ((packet)->mma655x)
 #if AO_MMA655X_INVERT
 #define ao_data_accel_cook(packet)             (AO_ACCEL_INVERT - (packet)->mma655x)