From 7d11f36c4837c16ae0213627c5cd9588522b4335 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 13 Mar 2018 09:52:55 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11723 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/license/chcustomer.h | 1 + os/nil/nil.mk | 28 +++++----------------------- os/rt/rt.mk | 28 +++++----------------------- readme.txt | 8 +++++++- 4 files changed, 18 insertions(+), 47 deletions(-) diff --git a/os/license/chcustomer.h b/os/license/chcustomer.h index 8e81312fa..433d26db2 100644 --- a/os/license/chcustomer.h +++ b/os/license/chcustomer.h @@ -57,6 +57,7 @@ */ #define CH_CUSTOMER_LIC_RT TRUE #define CH_CUSTOMER_LIC_NIL TRUE +#define CH_CUSTOMER_LIC_LIB TRUE #define CH_CUSTOMER_LIC_EX TRUE #define CH_CUSTOMER_LIC_PORT_CM0 TRUE #define CH_CUSTOMER_LIC_PORT_CM3 TRUE diff --git a/os/nil/nil.mk b/os/nil/nil.mk index f3d144199..0d6350f56 100644 --- a/os/nil/nil.mk +++ b/os/nil/nil.mk @@ -3,34 +3,16 @@ ifeq ($(USE_SMART_BUILD),yes) CHCONF := $(strip $(shell cat chconf.h | egrep -e "\#define")) KERNSRC := ${CHIBIOS}/os/nil/src/ch.c -ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmboxes.c -endif -ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmemcore.c -endif -ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chheap.c -endif -ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmempools.c -endif -ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chfactory.c -endif else -KERNSRC := ${CHIBIOS}/os/nil/src/ch.c \ - $(CHIBIOS)/os/common/oslib/src/chmboxes.c \ - $(CHIBIOS)/os/common/oslib/src/chmemcore.c \ - $(CHIBIOS)/os/common/oslib/src/chheap.c \ - $(CHIBIOS)/os/common/oslib/src/chmempools.c \ - $(CHIBIOS)/os/common/oslib/src/chfactory.c +KERNSRC := ${CHIBIOS}/os/nil/src/ch.c endif # Required include directories -KERNINC := ${CHIBIOS}/os/nil/include \ - ${CHIBIOS}/os/common/oslib/include +KERNINC := ${CHIBIOS}/os/nil/include # Shared variables ALLCSRC += $(KERNSRC) ALLINC += $(KERNINC) + +# OS Library +include $(CHIBIOS)/os/lib/lib.mk diff --git a/os/rt/rt.mk b/os/rt/rt.mk index f415cb341..8816a61e5 100644 --- a/os/rt/rt.mk +++ b/os/rt/rt.mk @@ -42,21 +42,6 @@ endif ifneq ($(findstring CH_CFG_USE_DYNAMIC TRUE,$(CHCONF)),) KERNSRC += $(CHIBIOS)/os/rt/src/chdynamic.c endif -ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmboxes.c -endif -ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmemcore.c -endif -ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chheap.c -endif -ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmempools.c -endif -ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHCONF)),) -KERNSRC += $(CHIBIOS)/os/common/oslib/src/chfactory.c -endif else KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \ $(CHIBIOS)/os/rt/src/chdebug.c \ @@ -72,18 +57,15 @@ KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \ $(CHIBIOS)/os/rt/src/chcond.c \ $(CHIBIOS)/os/rt/src/chevents.c \ $(CHIBIOS)/os/rt/src/chmsg.c \ - $(CHIBIOS)/os/rt/src/chdynamic.c \ - $(CHIBIOS)/os/common/oslib/src/chmboxes.c \ - $(CHIBIOS)/os/common/oslib/src/chmemcore.c \ - $(CHIBIOS)/os/common/oslib/src/chheap.c \ - $(CHIBIOS)/os/common/oslib/src/chmempools.c \ - $(CHIBIOS)/os/common/oslib/src/chfactory.c + $(CHIBIOS)/os/rt/src/chdynamic.c endif # Required include directories -KERNINC := $(CHIBIOS)/os/rt/include \ - $(CHIBIOS)/os/common/oslib/include +KERNINC := $(CHIBIOS)/os/rt/include # Shared variables ALLCSRC += $(KERNSRC) ALLINC += $(KERNINC) + +# OS Library +include $(CHIBIOS)/os/lib/lib.mk diff --git a/readme.txt b/readme.txt index 4eda156ea..6c048202c 100644 --- a/readme.txt +++ b/readme.txt @@ -39,7 +39,6 @@ | | | +--cmsis_os/ - CMSIS OS emulation layer for RT (ARMCMx port only). | | | +--nasa_osal/ - NASA Operating System Abstraction Layer for RT. | | +--ext/ - Vendor files used by the OS. - | | +--oslib/ - RTOS modules usable by both RT and NIL. | | +--ports/ - RTOS ports usable by both RT and NIL. | | +--startup/ - Startup support for all compilers and platforms. | +--ex/ - EX component. @@ -64,6 +63,10 @@ | | +--ports/ - HAL ports. | | +--templates/ - HAL driver template files. | | +--osal/ - HAL OSAL templates. + | +--lib/ - RTOS modules usable by both RT and NIL (OSLIB). + | | +--include/ - OSLIB high level headers. + | | +--src/ - OSLIB high level source. + | | +--templates/ - OSLIB configuration template files. | +--nil/ - NIL RTOS component. | | +--dox/ - NIL documentation resources. | | +--include/ - NIL high level headers. @@ -92,6 +95,9 @@ *** Next *** - NEW: Added support for LPS22HB 2 axis Barometer\Thermometer MEMS. +- NEW: Separated OSLIB from RT and NIL, now it is a separate "product" with + its own version, configuration file and licensing. The library will + grow to include more functionalities. - HAL: Fixed I2C address not accepted (bug #923)(backported to 18.2.1 and 17.6.4). - HAL: Fixed problem with HSI48 on STM32L4xx (bug #922)(backported to 18.2.1). -- cgit v1.2.3