Skip to content

Commit 16d3077

Browse files
author
Cruz Monrreal
authored
Merge pull request #6905 from kivaisan/remove_common_pal_flags
Lora: Remove obsolete FEATURE_COMMON_PAL flags
2 parents 1ae48fc + 3094327 commit 16d3077

File tree

4 files changed

+5
-24
lines changed

4 files changed

+5
-24
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/nanostack features/frameworks BUILD
153+
- rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks/greentea-client features/frameworks/utest features/frameworks/unity 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

features/lorawan/LoRaWANStack.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,9 @@ SPDX-License-Identifier: BSD-3-Clause
2929
#include "events/EventQueue.h"
3030

3131
#include "LoRaWANStack.h"
32-
#if defined(FEATURE_COMMON_PAL)
33-
#include "mbed_trace.h"
32+
33+
#include "mbed-trace/mbed_trace.h"
3434
#define TRACE_GROUP "LSTK"
35-
#else
36-
#define tr_debug(...) (void(0)) //dummies if feature common pal is not added
37-
#define tr_info(...) (void(0)) //dummies if feature common pal is not added
38-
#define tr_error(...) (void(0)) //dummies if feature common pal is not added
39-
#define tr_warn(...) (void(0)) //dummies if feature common pal is not added
40-
#endif //defined(FEATURE_COMMON_PAL)
4135

4236
#define INVALID_PORT 0xFF
4337
#define MAX_CONFIRMED_MSG_RETRIES 255

features/lorawan/lorastack/mac/LoRaMac.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@ Copyright (c) 2017, Arm Limited and affiliates.
2222
SPDX-License-Identifier: BSD-3-Clause
2323
*/
2424
#include <stdlib.h>
25-
2625
#include "LoRaMac.h"
2726

28-
#if defined(FEATURE_COMMON_PAL)
29-
#include "mbed_trace.h"
27+
#include "mbed-trace/mbed_trace.h"
3028
#define TRACE_GROUP "LMAC"
31-
#else
32-
#define tr_debug(...) (void(0)) //dummies if feature common pal is not added
33-
#define tr_info(...) (void(0)) //dummies if feature common pal is not added
34-
#define tr_error(...) (void(0)) //dummies if feature common pal is not added
35-
#endif //defined(FEATURE_COMMON_PAL)
3629

3730
using namespace events;
3831
using namespace mbed;

features/lorawan/lorastack/mac/LoRaMacCommand.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@ SPDX-License-Identifier: BSD-3-Clause
2525
#include "LoRaMacCommand.h"
2626
#include "LoRaMac.h"
2727

28-
#if defined(FEATURE_COMMON_PAL)
29-
#include "mbed_trace.h"
28+
#include "mbed-trace/mbed_trace.h"
3029
#define TRACE_GROUP "LMACC"
31-
#else
32-
#define tr_debug(...) (void(0)) //dummies if feature common pal is not added
33-
#define tr_info(...) (void(0)) //dummies if feature common pal is not added
34-
#define tr_error(...) (void(0)) //dummies if feature common pal is not added
35-
#endif //defined(FEATURE_COMMON_PAL)
3630

3731
/**
3832
* LoRaMAC max EIRP (dBm) table.

0 commit comments

Comments
 (0)