Switch from GPLv2 to GPLv2+

[fw/altos] / src / drivers / ao_mpu6000.c

diff --git a/src/drivers/ao_mpu6000.c b/src/drivers/ao_mpu6000.c
index 0689d7a7f099d299251289d81adc05cae033f048..650407ad8b679d8f98478e82e84da422b1c3bdce 100644 (file)
--- a/src/drivers/ao_mpu6000.c
+++ b/src/drivers/ao_mpu6000.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
@@ -132,7 +133,7 @@ ao_mpu6000_gyro(int16_t v)
 #endif
 
 static uint8_t
-ao_mpu6000_accel_check(int16_t normal, int16_t test, char *which)
+ao_mpu6000_accel_check(int16_t normal, int16_t test)
 {
        int16_t diff = test - normal;
 
@@ -146,7 +147,7 @@ ao_mpu6000_accel_check(int16_t normal, int16_t test, char *which)
 }
 
 static uint8_t
-ao_mpu6000_gyro_check(int16_t normal, int16_t test, char *which)
+ao_mpu6000_gyro_check(int16_t normal, int16_t test)
 {
        int16_t diff = test - normal;
 
@@ -292,13 +293,13 @@ _ao_mpu6000_setup(void)
                ao_delay(AO_MS_TO_TICKS(200));
                _ao_mpu6000_sample(&normal_mode);
        
-               errors += ao_mpu6000_accel_check(normal_mode.accel_x, test_mode.accel_x, "x");
-               errors += ao_mpu6000_accel_check(normal_mode.accel_y, test_mode.accel_y, "y");
-               errors += ao_mpu6000_accel_check(normal_mode.accel_z, test_mode.accel_z, "z");
+               errors += ao_mpu6000_accel_check(normal_mode.accel_x, test_mode.accel_x);
+               errors += ao_mpu6000_accel_check(normal_mode.accel_y, test_mode.accel_y);
+               errors += ao_mpu6000_accel_check(normal_mode.accel_z, test_mode.accel_z);
 
-               errors += ao_mpu6000_gyro_check(normal_mode.gyro_x, test_mode.gyro_x, "x");
-               errors += ao_mpu6000_gyro_check(normal_mode.gyro_y, test_mode.gyro_y, "y");
-               errors += ao_mpu6000_gyro_check(normal_mode.gyro_z, test_mode.gyro_z, "z");
+               errors += ao_mpu6000_gyro_check(normal_mode.gyro_x, test_mode.gyro_x);
+               errors += ao_mpu6000_gyro_check(normal_mode.gyro_y, test_mode.gyro_y);
+               errors += ao_mpu6000_gyro_check(normal_mode.gyro_z, test_mode.gyro_z);
                if (!errors)
                        break;
        }