From 1ffcc1b527ea652dfc067e13e90b0ab728ece3e7 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 22 Dec 2017 11:05:26 +0000 Subject: Workaround for GCC7 fallthrough bug. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11161 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/RT-STM32F746G-DISCOVERY/main.c | 2 +- os/rt/src/chschd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c index c54cfc578..5f257e98b 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c @@ -48,7 +48,7 @@ int main(void) { * - Kernel initialization, the main() function becomes a thread and the * RTOS is active. */ - halInit(); + halInit(); chSysInit(); /* diff --git a/os/rt/src/chschd.c b/os/rt/src/chschd.c index 5243c8798..03e39c2ec 100644 --- a/os/rt/src/chschd.c +++ b/os/rt/src/chschd.c @@ -334,11 +334,11 @@ static void wakeup(void *p) { chSemFastSignalI(tp->u.wtsemp); #endif /* Falls through.*/ + case CH_STATE_QUEUED: + /* Falls through.*/ #if (CH_CFG_USE_CONDVARS == TRUE) && (CH_CFG_USE_CONDVARS_TIMEOUT == TRUE) case CH_STATE_WTCOND: #endif - /* Falls through.*/ - case CH_STATE_QUEUED: /* States requiring dequeuing.*/ (void) queue_dequeue(tp); break; -- cgit v1.2.3