mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Merge pull request #6577 from SeppoTakalo/remove_features
Get rid of FEATURE_COMMON_PAL and FEATURE_NANOSTACKpull/6522/merge
						commit
						5038135c7d
					
				| 
						 | 
				
			
			@ -150,7 +150,7 @@ matrix:
 | 
			
		|||
        - python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
 | 
			
		||||
        # Check that example compiles without rtos
 | 
			
		||||
        - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
 | 
			
		||||
        - rm -r rtos features/cellular features/netsocket features/frameworks BUILD
 | 
			
		||||
        - rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks BUILD
 | 
			
		||||
        - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
 | 
			
		||||
        # Run local equeue tests
 | 
			
		||||
        - make -C $EVENTS/equeue test
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -844,11 +844,15 @@ EXCLUDE_PATTERNS       = */tools/* \
 | 
			
		|||
                         */features/mbedtls/* \
 | 
			
		||||
                         */features/storage/* \
 | 
			
		||||
                         */features/unsupported/* \
 | 
			
		||||
                         */features/FEATURE_COMMON_PAL/* \
 | 
			
		||||
                         */features/FEATURE_LWIP/* \
 | 
			
		||||
                         */features/FEATURE_UVISOR/* \
 | 
			
		||||
                         */features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/* \
 | 
			
		||||
                         */features/nanostack/FEATURE_NANOSTACK/coap-service/* \
 | 
			
		||||
                         */features/nanostack/sal-stack-nanostack/* \
 | 
			
		||||
                         */features/nanostack/coap-service/* \
 | 
			
		||||
                         */mbed-trace/* \
 | 
			
		||||
                         */mbed-coap/* \
 | 
			
		||||
                         */nanostack-libservice/* \
 | 
			
		||||
                         */mbed-client-randlib/* \
 | 
			
		||||
                         */nanostack/sal-stack-nanostack-eventloop/* \
 | 
			
		||||
                         */ble/generic/* \
 | 
			
		||||
                         */ble/pal/*
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,5 +10,5 @@
 | 
			
		|||
    "EXPAND_AS_DEFINED": "", 
 | 
			
		||||
    "SKIP_FUNCTION_MACROS": "NO",
 | 
			
		||||
    "STRIP_CODE_COMMENTS": "NO",
 | 
			
		||||
    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/storage/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/FEATURE_COMMON_PAL/* */features/FEATURE_LWIP/* */features/FEATURE_UVISOR/* */features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/* */features/nanostack/FEATURE_NANOSTACK/coap-service/* */ble/generic/* */ble/pal/*"
 | 
			
		||||
    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/storage/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/FEATURE_LWIP/* */features/FEATURE_UVISOR/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/*  */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/*"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,9 +18,6 @@
 | 
			
		|||
#include "lwip/debug.h"
 | 
			
		||||
#include "lwip/def.h"
 | 
			
		||||
#include "lwip_random.h"
 | 
			
		||||
 | 
			
		||||
#if FEATURE_COMMON_PAL
 | 
			
		||||
 | 
			
		||||
#include "randLIB.h"
 | 
			
		||||
 | 
			
		||||
void lwip_seed_random(void)
 | 
			
		||||
| 
						 | 
				
			
			@ -37,20 +34,3 @@ inline uint32_t lwip_get_random(void)
 | 
			
		|||
{
 | 
			
		||||
    return randLIB_get_32bit();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
 | 
			
		||||
void lwip_seed_random(void)
 | 
			
		||||
{
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void lwip_add_random_seed(uint64_t seed)
 | 
			
		||||
{
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint32_t lwip_get_random(void)
 | 
			
		||||
{
 | 
			
		||||
    return rand();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,14 +18,8 @@
 | 
			
		|||
#include "platform/FileHandle.h"
 | 
			
		||||
#include "platform/mbed_poll.h"
 | 
			
		||||
#include "events/EventQueue.h"
 | 
			
		||||
#if defined(FEATURE_COMMON_PAL)
 | 
			
		||||
#include "mbed_trace.h"
 | 
			
		||||
#define TRACE_GROUP "LPPP"
 | 
			
		||||
#else
 | 
			
		||||
#define tr_debug(...) (void(0)) //dummies if feature common pal is not added
 | 
			
		||||
#define tr_info(...)  (void(0)) //dummies if feature common pal is not added
 | 
			
		||||
#define tr_error(...) (void(0)) //dummies if feature common pal is not added
 | 
			
		||||
#endif //defined(FEATURE_COMMON_PAL)
 | 
			
		||||
#include "rtos/Thread.h"
 | 
			
		||||
#include "lwip/tcpip.h"
 | 
			
		||||
#include "lwip/tcp.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -58,7 +58,6 @@ The purpose of the library is to provide a light, simple and general tracing sol
 | 
			
		|||
 | 
			
		||||
### Enabling the tracing API in mbed OS 5
 | 
			
		||||
 | 
			
		||||
* Add the feature COMMON_PAL into the build
 | 
			
		||||
* Set `MBED_CONF_MBED_TRACE_ENABLE` to 1 or true
 | 
			
		||||
 | 
			
		||||
To do so, add the following to your mbed_app.json:
 | 
			
		||||
| 
						 | 
				
			
			@ -67,7 +66,6 @@ To do so, add the following to your mbed_app.json:
 | 
			
		|||
{
 | 
			
		||||
    "target_overrides": {
 | 
			
		||||
        "*": {
 | 
			
		||||
            "target.features_add": ["COMMON_PAL"],
 | 
			
		||||
            "mbed-trace.enable": 1
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
		Reference in New Issue