Skip to content

Commit 5038135

Browse files
author
Cruz Monrreal
authored
Merge pull request #6577 from SeppoTakalo/remove_features
Get rid of FEATURE_COMMON_PAL and FEATURE_NANOSTACK
2 parents 53aa1b0 + d5af6ec commit 5038135

File tree

724 files changed

+9
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

724 files changed

+9
-33
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ matrix:
150150
- python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
151151
# Check that example compiles without rtos
152152
- sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
153-
- rm -r rtos features/cellular features/netsocket features/frameworks BUILD
153+
- rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks BUILD
154154
- python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
155155
# Run local equeue tests
156156
- make -C $EVENTS/equeue test

doxyfile_options

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -844,11 +844,15 @@ EXCLUDE_PATTERNS = */tools/* \
844844
*/features/mbedtls/* \
845845
*/features/storage/* \
846846
*/features/unsupported/* \
847-
*/features/FEATURE_COMMON_PAL/* \
848847
*/features/FEATURE_LWIP/* \
849848
*/features/FEATURE_UVISOR/* \
850-
*/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/* \
851-
*/features/nanostack/FEATURE_NANOSTACK/coap-service/* \
849+
*/features/nanostack/sal-stack-nanostack/* \
850+
*/features/nanostack/coap-service/* \
851+
*/mbed-trace/* \
852+
*/mbed-coap/* \
853+
*/nanostack-libservice/* \
854+
*/mbed-client-randlib/* \
855+
*/nanostack/sal-stack-nanostack-eventloop/* \
852856
*/ble/generic/* \
853857
*/ble/pal/*
854858

doxygen_options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
"EXPAND_AS_DEFINED": "",
1111
"SKIP_FUNCTION_MACROS": "NO",
1212
"STRIP_CODE_COMMENTS": "NO",
13-
"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/*"
13+
"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/*"
1414
}

features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_random.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
#include "lwip/debug.h"
1919
#include "lwip/def.h"
2020
#include "lwip_random.h"
21-
22-
#if FEATURE_COMMON_PAL
23-
2421
#include "randLIB.h"
2522

2623
void lwip_seed_random(void)
@@ -37,20 +34,3 @@ inline uint32_t lwip_get_random(void)
3734
{
3835
return randLIB_get_32bit();
3936
}
40-
41-
#else
42-
43-
void lwip_seed_random(void)
44-
{
45-
}
46-
47-
void lwip_add_random_seed(uint64_t seed)
48-
{
49-
}
50-
51-
uint32_t lwip_get_random(void)
52-
{
53-
return rand();
54-
}
55-
56-
#endif

features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,8 @@
1818
#include "platform/FileHandle.h"
1919
#include "platform/mbed_poll.h"
2020
#include "events/EventQueue.h"
21-
#if defined(FEATURE_COMMON_PAL)
2221
#include "mbed_trace.h"
2322
#define TRACE_GROUP "LPPP"
24-
#else
25-
#define tr_debug(...) (void(0)) //dummies if feature common pal is not added
26-
#define tr_info(...) (void(0)) //dummies if feature common pal is not added
27-
#define tr_error(...) (void(0)) //dummies if feature common pal is not added
28-
#endif //defined(FEATURE_COMMON_PAL)
2923
#include "rtos/Thread.h"
3024
#include "lwip/tcpip.h"
3125
#include "lwip/tcp.h"

features/FEATURE_COMMON_PAL/mbed-trace/README.md renamed to features/frameworks/mbed-trace/README.md

Lines changed: 0 additions & 2 deletions

0 commit comments

Comments
 (0)