From 951efe320c6a035b67c99deae380b351b2e0b9c0 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 20 Feb 2016 21:50:58 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8917 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- testhal/STM32/STM32F4xx/RTC/Makefile | 12 +++++++----- testhal/STM32/STM32F4xx/RTC/main.c | 3 ++- testhal/STM32/STM32F4xx/SDC/Makefile | 11 ++++++----- testhal/STM32/STM32F4xx/SDC/main.c | 14 ++++++-------- testhal/STM32/STM32L0xx/ADC/chconf.h | 2 +- testhal/STM32/STM32L0xx/EXT/chconf.h | 2 +- testhal/STM32/STM32L0xx/SPI/chconf.h | 2 +- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/testhal/STM32/STM32F4xx/RTC/Makefile b/testhal/STM32/STM32F4xx/RTC/Makefile index 6736dd39d..05ed107b3 100644 --- a/testhal/STM32/STM32F4xx/RTC/Makefile +++ b/testhal/STM32/STM32F4xx/RTC/Makefile @@ -99,6 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). #include $(CHIBIOS)/test/rt/test.mk +include $(CHIBIOS)/os/hal/lib/streams/streams.mk +include $(CHIBIOS)/os/various/shell/shell.mk # Define linker script file here LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld @@ -113,11 +115,10 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(TESTSRC) \ + $(STREAMSSRC) \ + $(SHELLSRC) \ $(CHIBIOS)/os/various/evtimer.c \ $(CHIBIOS)/os/various/syscalls.c \ - $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ - $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global @@ -149,7 +150,8 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various + $(STREAMSINC) $(SHELLINC) \ + $(CHIBIOS)/os/various # # Project, sources and paths @@ -199,7 +201,7 @@ CPPWARN = -Wall -Wextra -Wundef # # List all user C define here, like -D_DEBUG=1 -UDEFS = +UDEFS = -DSHELL_CMD_TEST_ENABLED=0 # Define ASM defines here UADEFS = diff --git a/testhal/STM32/STM32F4xx/RTC/main.c b/testhal/STM32/STM32F4xx/RTC/main.c index 3c029028a..c4507af54 100644 --- a/testhal/STM32/STM32F4xx/RTC/main.c +++ b/testhal/STM32/STM32F4xx/RTC/main.c @@ -278,7 +278,8 @@ int main(void){ /* Shell initialization.*/ sdStart(&SD6, &ser_cfg); shellInit(); - shellCreateStatic(&shell_cfg1, waShell, sizeof(waShell), NORMALPRIO); + chThdCreateStatic(waShell, sizeof(waShell), NORMALPRIO, + shellThread, (void *)&shell_cfg1); /* wait until user do not want to test wakeup */ while (true){ diff --git a/testhal/STM32/STM32F4xx/SDC/Makefile b/testhal/STM32/STM32F4xx/SDC/Makefile index 0389b7059..910cbd6d5 100644 --- a/testhal/STM32/STM32F4xx/SDC/Makefile +++ b/testhal/STM32/STM32F4xx/SDC/Makefile @@ -99,6 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). #include $(CHIBIOS)/test/rt/test.mk +include $(CHIBIOS)/os/hal/lib/streams/streams.mk +include $(CHIBIOS)/os/various/shell/shell.mk # Define linker script file here LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld @@ -113,9 +115,8 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(TESTSRC) \ - $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ - $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ - $(CHIBIOS)/os/various/shell.c \ + $(STREAMSSRC) \ + $(SHELLSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global @@ -147,7 +148,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various + $(STREAMSINC) $(SHELLINC) # # Project, sources and paths @@ -197,7 +198,7 @@ CPPWARN = -Wall -Wextra -Wundef # # List all user C define here, like -D_DEBUG=1 -UDEFS = +UDEFS = -DSHELL_CMD_TEST_ENABLED=0 # Define ASM defines here UADEFS = diff --git a/testhal/STM32/STM32F4xx/SDC/main.c b/testhal/STM32/STM32F4xx/SDC/main.c index 93538ae5c..2aed5c496 100644 --- a/testhal/STM32/STM32F4xx/SDC/main.c +++ b/testhal/STM32/STM32F4xx/SDC/main.c @@ -292,7 +292,6 @@ static const ShellConfig shell_cfg1 = { * Application entry point. */ int main(void) { - thread_t *shelltp = NULL; /* * System initializations. @@ -325,15 +324,14 @@ int main(void) { chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL); /* - * Normal main() thread activity, in this demo it does nothing. + * Normal main() thread activity, spawning shells. */ while (true) { - if (!shelltp) - shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO); - else if (chThdTerminatedX(shelltp)) { - chThdRelease(shelltp); /* Recovers memory of the previous shell. */ - shelltp = NULL; /* Triggers spawning of a new shell. */ - } + thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE, + NORMALPRIO + 1, shellThread, + (void *)&shell_cfg1); + chThdWait(shelltp); /* Waiting termination. */ + chThdFreeToHeap(shelltp); /* Returning memory to heap. */ chThdSleepMilliseconds(1000); } } diff --git a/testhal/STM32/STM32L0xx/ADC/chconf.h b/testhal/STM32/STM32L0xx/ADC/chconf.h index 216731eef..506389994 100644 --- a/testhal/STM32/STM32L0xx/ADC/chconf.h +++ b/testhal/STM32/STM32L0xx/ADC/chconf.h @@ -140,7 +140,7 @@ * * @note The default is @p TRUE. */ -#define CH_CFG_USE_TM TRUE +#define CH_CFG_USE_TM FALSE /** * @brief Threads registry APIs. diff --git a/testhal/STM32/STM32L0xx/EXT/chconf.h b/testhal/STM32/STM32L0xx/EXT/chconf.h index 216731eef..506389994 100644 --- a/testhal/STM32/STM32L0xx/EXT/chconf.h +++ b/testhal/STM32/STM32L0xx/EXT/chconf.h @@ -140,7 +140,7 @@ * * @note The default is @p TRUE. */ -#define CH_CFG_USE_TM TRUE +#define CH_CFG_USE_TM FALSE /** * @brief Threads registry APIs. diff --git a/testhal/STM32/STM32L0xx/SPI/chconf.h b/testhal/STM32/STM32L0xx/SPI/chconf.h index 216731eef..506389994 100644 --- a/testhal/STM32/STM32L0xx/SPI/chconf.h +++ b/testhal/STM32/STM32L0xx/SPI/chconf.h @@ -140,7 +140,7 @@ * * @note The default is @p TRUE. */ -#define CH_CFG_USE_TM TRUE +#define CH_CFG_USE_TM FALSE /** * @brief Threads registry APIs. -- cgit v1.2.3