diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 13:55:52 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 13:55:52 +0200 |
| commit | 02ad0f2b91b5587b72171f570996659be02251d8 (patch) | |
| tree | 8eedb6e8e898a2ffc7e3bfd054ab0244875627da | |
| parent | 83f343f196c07d0a633ee8fc7d2324e8cb3d129c (diff) | |
| parent | 0b4ff28037e244ce3a6edff20d043c3c7df3345d (diff) | |
| download | px4-firmware-02ad0f2b91b5587b72171f570996659be02251d8.tar.gz px4-firmware-02ad0f2b91b5587b72171f570996659be02251d8.tar.bz2 px4-firmware-02ad0f2b91b5587b72171f570996659be02251d8.zip | |
Merge branch 'warning_fixes_v5' into sensor_drivers
| m--------- | mavlink/include/mavlink/v1.0 | 0 | ||||
| -rw-r--r-- | src/systemcmds/mtd/24xxxx_mtd.c | 1 | ||||
| -rw-r--r-- | src/systemcmds/param/param.c | 4 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mavlink/include/mavlink/v1.0 b/mavlink/include/mavlink/v1.0 -Subproject 3711190d23d9928ea0687e00621c8d9ecf145f5 +Subproject d1ebe85eb6bb06d0078f3e0b8144adb13126362 diff --git a/src/systemcmds/mtd/24xxxx_mtd.c b/src/systemcmds/mtd/24xxxx_mtd.c index 72200f418..991363797 100644 --- a/src/systemcmds/mtd/24xxxx_mtd.c +++ b/src/systemcmds/mtd/24xxxx_mtd.c @@ -161,6 +161,7 @@ static ssize_t at24c_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg); void at24c_test(void); +int at24c_nuke(void); /************************************************************************************ * Private Data diff --git a/src/systemcmds/param/param.c b/src/systemcmds/param/param.c index 28e1b108b..e110335e7 100644 --- a/src/systemcmds/param/param.c +++ b/src/systemcmds/param/param.c @@ -63,7 +63,7 @@ static void do_import(const char* param_file_name); static void do_show(const char* search_string); static void do_show_print(void *arg, param_t param); static void do_set(const char* name, const char* val, bool fail_on_not_found); -static void do_compare(const char* name, const char* vals[], unsigned comparisons); +static void do_compare(const char* name, char* vals[], unsigned comparisons); static void do_reset(void); static void do_reset_nostart(void); @@ -351,7 +351,7 @@ do_set(const char* name, const char* val, bool fail_on_not_found) } static void -do_compare(const char* name, const char* vals[], unsigned comparisons) +do_compare(const char* name, char* vals[], unsigned comparisons) { int32_t i; float f; |