From abcb920df46d6f063b857ebaf14140e041148201 Mon Sep 17 00:00:00 2001 From: Julien Lecoeur Date: Tue, 4 Jul 2017 18:50:00 +0200 Subject: [PATCH] Fix -Werror=implicit-fallthrough on arm-none-eabi-gcc 7.1.0 BMP280: fix -Werror=implicit-fallthrough on arm-none-eabi-gcc 7 gnss: fix -Werror=implicit-fallthrough on arm-none-eabi-gcc 7 fmu: fix -Werror=implicit-fallthrough on arm-none-eabi-gcc 7 timer.c: fix -Werror=implicit-fallthrough on arm-none-eabi-gcc 7 px4cannode_led: fix -Werror=implicit-fallthrough on arm-none-eabi-gcc 7 Fix -Werror=implicit-fallthrough on gcc7 --- src/drivers/bmp280/bmp280.cpp | 3 +++ src/drivers/boards/px4cannode-v1/px4cannode_led.c | 2 +- src/drivers/bootloaders/src/sched/timer.c | 3 ++- src/drivers/frsky_telemetry/frsky_telemetry.c | 2 ++ src/drivers/ms5611/ms5611.cpp | 3 ++- src/drivers/px4fmu/fmu.cpp | 13 +++++++++++-- src/modules/uavcan/sensors/gnss.cpp | 2 ++ 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/drivers/bmp280/bmp280.cpp b/src/drivers/bmp280/bmp280.cpp index 9674ffca92..283dd50cc4 100644 --- a/src/drivers/bmp280/bmp280.cpp +++ b/src/drivers/bmp280/bmp280.cpp @@ -358,9 +358,12 @@ BMP280::ioctl(struct file *filp, int cmd, unsigned long arg) return -EINVAL; case SENSOR_POLLRATE_MAX: + + /* FALLTHROUGH */ case SENSOR_POLLRATE_DEFAULT: ticks = _max_mesure_ticks; + /* FALLTHROUGH */ default: { if (ticks == 0) { ticks = USEC2TICK(USEC_PER_SEC / arg); diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_led.c b/src/drivers/boards/px4cannode-v1/px4cannode_led.c index 8ee0cee927..40530daded 100644 --- a/src/drivers/boards/px4cannode-v1/px4cannode_led.c +++ b/src/drivers/boards/px4cannode-v1/px4cannode_led.c @@ -158,7 +158,7 @@ __EXPORT void board_autoled_off(int led) case LED_STACKCREATED: phy_set_led(BOARD_LED_GREEN, false); - // no break + /* FALLTHROUGH */ case LED_INIRQ: case LED_SIGNAL: diff --git a/src/drivers/bootloaders/src/sched/timer.c b/src/drivers/bootloaders/src/sched/timer.c index 5730da4e87..fbbcea6129 100644 --- a/src/drivers/bootloaders/src/sched/timer.c +++ b/src/drivers/bootloaders/src/sched/timer.c @@ -220,7 +220,8 @@ void __wrap_sched_process_timer(void) case Repeating: timers[t].count = timers[t].reload; - /* fall through to callback */ + /* FALLTHROUGH */ + /* to callback */ case Timeout: if (timers[t].usr.cb) { timers[t].usr.cb(t, timers[t].usr.context); diff --git a/src/drivers/frsky_telemetry/frsky_telemetry.c b/src/drivers/frsky_telemetry/frsky_telemetry.c index 06441f98a9..93ba83e559 100644 --- a/src/drivers/frsky_telemetry/frsky_telemetry.c +++ b/src/drivers/frsky_telemetry/frsky_telemetry.c @@ -464,6 +464,8 @@ static int frsky_telemetry_thread_main(int argc, char *argv[]) } + /* FALLTHROUGH */ + case SMARTPORT_POLL_8: /* report nav_state as DIY_NAVSTATE 2Hz */ diff --git a/src/drivers/ms5611/ms5611.cpp b/src/drivers/ms5611/ms5611.cpp index 0b449563af..bcd4ba146f 100644 --- a/src/drivers/ms5611/ms5611.cpp +++ b/src/drivers/ms5611/ms5611.cpp @@ -1357,7 +1357,8 @@ ms5611_main(int argc, char *argv[]) } } - //no break + /* FALLTHROUGH */ + default: ms5611::usage(); exit(0); diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp index 7f444f3fab..ed17f4980e 100644 --- a/src/drivers/px4fmu/fmu.cpp +++ b/src/drivers/px4fmu/fmu.cpp @@ -653,9 +653,10 @@ PX4FMU::set_mode(Mode mode) up_input_capture_set(2, Rising, 0, NULL, NULL); up_input_capture_set(3, Rising, 0, NULL, NULL); DEVICE_DEBUG("MODE_2PWM2CAP"); - // no break #endif + /* FALLTHROUGH */ + case MODE_2PWM: // v1 multi-port with flow control lines as PWM DEVICE_DEBUG("MODE_2PWM"); @@ -674,9 +675,10 @@ PX4FMU::set_mode(Mode mode) case MODE_3PWM1CAP: // v1 multi-port with flow control lines as PWM DEVICE_DEBUG("MODE_3PWM1CAP"); up_input_capture_set(3, Rising, 0, NULL, NULL); - // no break #endif + /* FALLTHROUGH */ + case MODE_3PWM: // v1 multi-port with flow control lines as PWM DEVICE_DEBUG("MODE_3PWM"); @@ -2179,6 +2181,8 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg) #if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 8 case PWM_SERVO_SET(7): + + /* FALLTHROUGH */ case PWM_SERVO_SET(6): if (_mode < MODE_8PWM) { ret = -EINVAL; @@ -2189,7 +2193,10 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg) #if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 6 + /* FALLTHROUGH */ case PWM_SERVO_SET(5): + + /* FALLTHROUGH */ case PWM_SERVO_SET(4): if (_mode < MODE_6PWM) { ret = -EINVAL; @@ -2226,6 +2233,7 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg) #if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 8 + /* FALLTHROUGH */ case PWM_SERVO_GET(7): case PWM_SERVO_GET(6): if (_mode < MODE_8PWM) { @@ -2237,6 +2245,7 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg) #if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 6 + /* FALLTHROUGH */ case PWM_SERVO_GET(5): case PWM_SERVO_GET(4): if (_mode < MODE_6PWM) { diff --git a/src/modules/uavcan/sensors/gnss.cpp b/src/modules/uavcan/sensors/gnss.cpp index 1e5f366db2..8bf4048150 100644 --- a/src/modules/uavcan/sensors/gnss.cpp +++ b/src/modules/uavcan/sensors/gnss.cpp @@ -189,6 +189,7 @@ void UavcanGnssBridge::gnss_fix2_sub_cb(const uavcan::ReceivedDataStructure