andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12658 110e8d01-0319-4d1e-a829-52ad28d1bb01

This commit is contained in:
Giovanni Di Sirio 2019-02-11 13:07:01 +00:00
parent a5f9798f6f
commit 23ce2e2a77
15 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/SPC5/NIL-SPC560D-EVB/Makefile
View File

@ -103,6 +103,7 @@ LDSCRIPT= $(STARTUPLD)/SPC560D40.ld
# C sources here. # C sources here.
CSRC = $(STARTUPSRC) \ CSRC = $(STARTUPSRC) \
$(KERNSRC) \ $(KERNSRC) \
$(LIBSRC) \
$(PORTSRC) \ $(PORTSRC) \
$(OSALSRC) \ $(OSALSRC) \
$(HALSRC) \ $(HALSRC) \
@ -119,7 +120,7 @@ ASMSRC =
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(CHIBIOS)/os/license \ INCDIR = $(CHIBIOS)/os/license \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(STARTUPINC) $(KERNINC) $(LIBINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various $(CHIBIOS)/os/various

1
demos/SPC5/NIL-SPC560D-EVB/main.c
View File

@ -123,7 +123,6 @@ THD_FUNCTION(Thread2, arg) {
*/ */
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker", waThread1, Thread1, NULL)
THD_TABLE_THREAD(1, "test_support", wa_test_support, test_support, (void *)&nil.threads[2])
THD_TABLE_THREAD(2, "tester", waThread2, Thread2, NULL) THD_TABLE_THREAD(2, "tester", waThread2, Thread2, NULL)
THD_TABLE_END THD_TABLE_END

27
demos/SPC5/RT-SPC560B-EVB/Makefile
View File

@ -82,6 +82,12 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
CONFDIR := .
BUILDDIR := ./build
DEPDIR := ./.dep
# Licensing files.
include $(CHIBIOS)/os/license/license.mk
# Startup files. # Startup files.
include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/startup_spc560bxx.mk include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/startup_spc560bxx.mk
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
@ -103,29 +109,18 @@ include $(CHIBIOS)/os/various/shell/shell.mk
LDSCRIPT= $(STARTUPLD)/SPC560B60.ld LDSCRIPT= $(STARTUPLD)/SPC560B60.ld
# C sources here. # C sources here.
CSRC = $(STARTUPSRC) \ CSRC = $(ALLCSRC) \
$(KERNSRC) \
$(PORTSRC) \
$(OSALSRC) \
$(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \ $(TESTSRC) \
$(STREAMSSRC) \
$(SHELLSRC) \
main.c main.c
# C++ sources here. # C++ sources here.
CPPSRC = CPPSRC = $(ALLCPPSRC)
# List ASM source files here # List ASM source files here
ASMSRC = ASMSRC = $(ALLASMSRC)
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) ASMXSRC = $(ALLXASMSRC)
INCDIR = $(CHIBIOS)/os/license \ INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(STREAMSINC) $(SHELLINC)
# #
# Project, sources and paths # Project, sources and paths

2
demos/SPC5/RT-SPC560D-EVB/Makefile-ht
View File

@ -153,7 +153,7 @@ ULIBS =
# Compiler settings # Compiler settings
# #
MCU = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec MCU = e200zx -meabi -msdata=none -mregnames # HighTec
#MCU = e200z4 -meabi -msdata=none -mregnames # Free GCC #MCU = e200z4 -meabi -msdata=none -mregnames # Free GCC
TRGT = ppc-vle- TRGT = ppc-vle-

25
demos/SPC5/RT-SPC560P-EVB/Makefile
View File

@ -82,6 +82,12 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
CONFDIR := .
BUILDDIR := ./build
DEPDIR := ./.dep
# Licensing files.
include $(CHIBIOS)/os/license/license.mk
# Startup files. # Startup files.
include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/startup_spc560pxx.mk include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/startup_spc560pxx.mk
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
@ -103,29 +109,18 @@ include $(CHIBIOS)/os/various/shell/shell.mk
LDSCRIPT= $(STARTUPLD)/SPC560P50.ld LDSCRIPT= $(STARTUPLD)/SPC560P50.ld
# C sources here. # C sources here.
CSRC = $(STARTUPSRC) \ CSRC = $(ALLCSRC) \
$(KERNSRC) \
$(PORTSRC) \
$(OSALSRC) \
$(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \ $(TESTSRC) \
$(STREAMSSRC) \
$(SHELLSRC) \
main.c main.c
# C++ sources here. # C++ sources here.
CPPSRC = CPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = ASMSRC = $(ALLASMSRC)
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) ASMXSRC = $(ALLXASMSRC)
INCDIR = $(CHIBIOS)/os/license \ INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(STREAMSINC) $(SHELLINC)
# #
# Project, sources and paths # Project, sources and paths

2
demos/SPC5/RT-SPC56EC-EVB/Makefile-ht
View File

@ -153,7 +153,7 @@ ULIBS =
# Compiler settings # Compiler settings
# #
MCU = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec MCU = e200zx -meabi -msdata=none -mregnames # HighTec
#MCU = e200z4 -meabi -msdata=none -mregnames # Free GCC #MCU = e200z4 -meabi -msdata=none -mregnames # Free GCC
TRGT = ppc-vle- TRGT = ppc-vle-

2
demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
View File

@ -47,7 +47,7 @@
* @note This values also defines the number of available priorities * @note This values also defines the number of available priorities
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#define CH_CFG_MAX_THREADS 4 #define CH_CFG_MAX_THREADS 5
/** /**
* @brief Auto starts threads when @p chSysInit() is invoked. * @brief Auto starts threads when @p chSysInit() is invoked.

1
demos/STM32/NIL-STM32F051-DISCOVERY/main.c
View File

@ -86,7 +86,6 @@ THD_FUNCTION(Thread3, arg) {
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL)
THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL) THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL)
THD_TABLE_THREAD(2, "test_support", wa_test_support, test_support, (void *)&nil.threads[3])
THD_TABLE_THREAD(3, "tester", waThread3, Thread3, NULL) THD_TABLE_THREAD(3, "tester", waThread3, Thread3, NULL)
THD_TABLE_END THD_TABLE_END

2
demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
View File

@ -47,7 +47,7 @@
* @note This values also defines the number of available priorities * @note This values also defines the number of available priorities
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#define CH_CFG_MAX_THREADS 3 #define CH_CFG_MAX_THREADS 4
/** /**
* @brief Auto starts threads when @p chSysInit() is invoked. * @brief Auto starts threads when @p chSysInit() is invoked.

1
demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
View File

@ -72,7 +72,6 @@ THD_FUNCTION(Thread2, arg) {
*/ */
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL)
THD_TABLE_THREAD(1, "test_support", wa_test_support, test_support, (void *)&nil.threads[2])
THD_TABLE_THREAD(2, "tester", waThread2, Thread2, NULL) THD_TABLE_THREAD(2, "tester", waThread2, Thread2, NULL)
THD_TABLE_END THD_TABLE_END

8
demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
View File

@ -47,7 +47,7 @@
* @note This values also defines the number of available priorities * @note This values also defines the number of available priorities
* (0..CH_CFG_MAX_THREADS-1). * (0..CH_CFG_MAX_THREADS-1).
*/ */
#define CH_CFG_MAX_THREADS 4 #define CH_CFG_MAX_THREADS 5
/** /**
* @brief Auto starts threads when @p chSysInit() is invoked. * @brief Auto starts threads when @p chSysInit() is invoked.
@ -284,21 +284,21 @@
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_SYSTEM_STATE_CHECK TRUE #define CH_DBG_SYSTEM_STATE_CHECK FALSE
/** /**
* @brief Debug option, parameters checks. * @brief Debug option, parameters checks.
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_ENABLE_CHECKS TRUE #define CH_DBG_ENABLE_CHECKS FALSE
/** /**
* @brief System assertions. * @brief System assertions.
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_ENABLE_ASSERTS TRUE #define CH_DBG_ENABLE_ASSERTS FALSE
/** /**
* @brief Stack check. * @brief Stack check.

1
demos/STM32/NIL-STM32L476-DISCOVERY/main.c
View File

@ -83,7 +83,6 @@ THD_FUNCTION(Thread3, arg) {
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL)
THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL) THD_TABLE_THREAD(1, "blinker2", waThread2, Thread2, NULL)
THD_TABLE_THREAD(2, "test_support", wa_test_support, test_support, (void *)&nil.threads[3])
THD_TABLE_THREAD(3, "tester", waThread3, Thread3, NULL) THD_TABLE_THREAD(3, "tester", waThread3, Thread3, NULL)
THD_TABLE_END THD_TABLE_END

3
os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.c
View File

@ -34,10 +34,13 @@
/* Driver exported variables. */ /* Driver exported variables. */
/*===========================================================================*/ /*===========================================================================*/
#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE) || \
defined(__DOXYGEN__)
/** /**
* @brief Event records (to be implemented). * @brief Event records (to be implemented).
*/ */
palevent_t _pal_events[1]; palevent_t _pal_events[1];
#endif
/*===========================================================================*/ /*===========================================================================*/
/* Driver local variables and types. */ /* Driver local variables and types. */

2
os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.h
View File

@ -443,8 +443,10 @@ typedef struct {
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
extern const PALConfig pal_default_config; extern const PALConfig pal_default_config;
#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE)
extern palevent_t _pal_events[1]; extern palevent_t _pal_events[1];
#endif #endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
test/lib/ch_test.c
View File

@ -255,7 +255,7 @@ msg_t test_execute(BaseSequentialStream *stream, const testsuite_t *tsp) {
test_print("*** Test Board: "); test_print("*** Test Board: ");
test_println(BOARD_NAME); test_println(BOARD_NAME);
#endif #endif
#if defined(__GNUC__) && !defined(TEST_SUPPRESS_SIZE_REPORT) #if defined(TEST_SIZE_REPORT)
{ {
extern uint8_t __text_base, __text_end, extern uint8_t __text_base, __text_end,
_data_start, _data_end, _data_start, _data_end,