Skip to content

Commit 771b69e

Browse files
DeepikaCruz Monrreal II
authored andcommitted
Components if using RTOS modules should be enabled only when RTOS is present
Build failures were observed when rtos is ignored with .mbedignored. Components dependent on RTOS should be guarded with MBED_CONF_RTOS_PRESENT
1 parent 0b38cb8 commit 771b69e

File tree

10 files changed

+10
-12
lines changed

10 files changed

+10
-12
lines changed

components/802.15.4_RF/atmel-rf-driver/atmel-rf-driver/NanostackRfPhyAtmel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "at24mac.h"
2121
#include "PinNames.h"
2222

23-
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C
23+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && defined(MBED_CONF_RTOS_PRESENT)
2424

2525
#include "NanostackRfPhy.h"
2626

components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAtmel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include <string.h>
1717

18-
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C
18+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && defined(MBED_CONF_RTOS_PRESENT)
1919

2020
#include "platform/arm_hal_interrupt.h"
2121
#include "nanostack/platform/arm_hal_phy.h"

components/802.15.4_RF/mcr20a-rf-driver/mcr20a-rf-driver/NanostackRfPhyMcr20a.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
#ifndef NANOSTACK_PHY_MCR20A_H_
1818
#define NANOSTACK_PHY_MCR20A_H_
1919

20+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
2021
#include "mbed.h"
21-
22-
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
23-
2422
#include "NanostackRfPhy.h"
2523

2624
// Arduino pin defaults for convenience

components/802.15.4_RF/mcr20a-rf-driver/source/NanostackRfPhyMcr20a.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "NanostackRfPhyMcr20a.h"
1717

18-
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
18+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
1919

2020
#include "ns_types.h"
2121
#include "platform/arm_hal_interrupt.h"

components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
#include <string.h>
17-
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
17+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
1818
#include "platform/arm_hal_interrupt.h"
1919
#include "nanostack/platform/arm_hal_phy.h"
2020
#include "ns_types.h"

components/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver/NanostackRfPhys2lp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#ifndef NANOSTACK_PHY_S2LP_H_
1818
#define NANOSTACK_PHY_S2LP_H_
1919

20+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
2021
#include "mbed.h"
21-
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
2222
#include "NanostackRfPhy.h"
2323

2424
// Uncomment to use testing gpios attached to TX/RX processes

components/wifi/esp8266-driver/ESP8266/ESP8266.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef MBED_CONF_NSAPI_PRESENT
17+
#if defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
1818
#include <string.h>
1919
#include <stdint.h>
2020
#include <stdlib.h>

components/wifi/esp8266-driver/ESP8266/ESP8266.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef ESP8266_H
1818
#define ESP8266_H
1919

20-
#ifdef MBED_CONF_NSAPI_PRESENT
20+
#if defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
2121
#include <stdint.h>
2222

2323
#include "drivers/UARTSerial.h"

components/wifi/esp8266-driver/ESP8266Interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef MBED_CONF_NSAPI_PRESENT
17+
#if defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
1818

1919
#include <string.h>
2020
#include <stdint.h>

components/wifi/esp8266-driver/ESP8266Interface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef ESP8266_INTERFACE_H
1818
#define ESP8266_INTERFACE_H
1919

20-
#ifdef MBED_CONF_NSAPI_PRESENT
20+
#if defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
2121
#include "ESP8266/ESP8266.h"
2222
#include "events/EventQueue.h"
2323
#include "events/mbed_shared_queues.h"

0 commit comments

Comments
 (0)