Skip to content

Commit 61ade84

Browse files
author
Cruz Monrreal
authored
Merge pull request #8875 from deepikabhavnani/fix_components
Add dependency checks to components
2 parents 8952760 + 76220fa commit 61ade84

File tree

12 files changed

+19
-14
lines changed

12 files changed

+19
-14
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/source/rf_configuration.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "ns_types.h"
17-
#include "rf_configuration.h"
18-
#include "mbed_trace.h"
1916

20-
#define TRACE_GROUP "rfcf"
17+
#include "rf_configuration.h"
2118

2219
// Note that F_XO and F_DIG depends on the used clock frequency
2320
#define F_XO 50000000

components/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
#ifndef RF_CONF_H_
1818
#define RF_CONF_H_
19+
20+
#include <stdint.h>
21+
1922
#ifdef __cplusplus
2023
extern "C" {
2124
#endif

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
1718
#include <string.h>
1819
#include <stdint.h>
1920
#include <stdlib.h>
@@ -1096,3 +1097,4 @@ nsapi_connection_status_t ESP8266::connection_status() const
10961097
{
10971098
return _conn_status;
10981099
}
1100+
#endif

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

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

20+
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
2021
#include <stdint.h>
2122

2223
#include "drivers/UARTSerial.h"
@@ -455,5 +456,5 @@ class ESP8266 {
455456
nsapi_connection_status_t _conn_status;
456457
mbed::Callback<void()> _conn_stat_cb; // ESP8266Interface registered
457458
};
458-
459+
#endif
459460
#endif

components/wifi/esp8266-driver/ESP8266Interface.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
18+
1719
#include <string.h>
1820
#include <stdint.h>
1921

@@ -678,3 +680,4 @@ void ESP8266Interface::proc_oob_evnt()
678680
_esp.bg_process_oob(ESP8266_RECV_TIMEOUT, true);
679681
}
680682
}
683+
#endif

components/wifi/esp8266-driver/ESP8266Interface.h

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

20+
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
2021
#include "ESP8266/ESP8266.h"
2122
#include "events/EventQueue.h"
2223
#include "events/mbed_shared_queues.h"
@@ -359,5 +360,5 @@ class ESP8266Interface : public NetworkStack, public WiFiInterface {
359360
void proc_oob_evnt();
360361
void _oob2global_event_queue();
361362
};
362-
363+
#endif
363364
#endif

0 commit comments

Comments
 (0)