Merge pull request #8875 from deepikabhavnani/fix_components

Add dependency checks to components
pull/9043/head
Cruz Monrreal 2018-12-10 19:20:30 -06:00 committed by GitHub
commit 61ade84447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 19 additions and 14 deletions

View File

@ -20,7 +20,7 @@
#include "at24mac.h"
#include "PinNames.h"
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && defined(MBED_CONF_RTOS_PRESENT)
#include "NanostackRfPhy.h"

View File

@ -15,7 +15,7 @@
*/
#include <string.h>
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && defined(MBED_CONF_RTOS_PRESENT)
#include "platform/arm_hal_interrupt.h"
#include "nanostack/platform/arm_hal_phy.h"

View File

@ -17,10 +17,8 @@
#ifndef NANOSTACK_PHY_MCR20A_H_
#define NANOSTACK_PHY_MCR20A_H_
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
#include "mbed.h"
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
#include "NanostackRfPhy.h"
// Arduino pin defaults for convenience

View File

@ -15,7 +15,7 @@
*/
#include "NanostackRfPhyMcr20a.h"
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
#include "ns_types.h"
#include "platform/arm_hal_interrupt.h"

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <string.h>
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
#include "platform/arm_hal_interrupt.h"
#include "nanostack/platform/arm_hal_phy.h"
#include "ns_types.h"

View File

@ -13,11 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "ns_types.h"
#include "rf_configuration.h"
#include "mbed_trace.h"
#define TRACE_GROUP "rfcf"
#include "rf_configuration.h"
// Note that F_XO and F_DIG depends on the used clock frequency
#define F_XO 50000000

View File

@ -16,6 +16,9 @@
#ifndef RF_CONF_H_
#define RF_CONF_H_
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -17,8 +17,8 @@
#ifndef NANOSTACK_PHY_S2LP_H_
#define NANOSTACK_PHY_S2LP_H_
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && defined(MBED_CONF_RTOS_PRESENT)
#include "mbed.h"
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI
#include "NanostackRfPhy.h"
// Uncomment to use testing gpios attached to TX/RX processes

View File

@ -14,6 +14,7 @@
* limitations under the License.
*/
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
@ -1096,3 +1097,4 @@ nsapi_connection_status_t ESP8266::connection_status() const
{
return _conn_status;
}
#endif

View File

@ -17,6 +17,7 @@
#ifndef ESP8266_H
#define ESP8266_H
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
#include <stdint.h>
#include "drivers/UARTSerial.h"
@ -455,5 +456,5 @@ private:
nsapi_connection_status_t _conn_status;
mbed::Callback<void()> _conn_stat_cb; // ESP8266Interface registered
};
#endif
#endif

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
#include <string.h>
#include <stdint.h>
@ -678,3 +680,4 @@ void ESP8266Interface::proc_oob_evnt()
_esp.bg_process_oob(ESP8266_RECV_TIMEOUT, true);
}
}
#endif

View File

@ -17,6 +17,7 @@
#ifndef ESP8266_INTERFACE_H
#define ESP8266_INTERFACE_H
#if DEVICE_SERIAL && defined(MBED_CONF_EVENTS_PRESENT) && defined(MBED_CONF_NSAPI_PRESENT) && defined(MBED_CONF_RTOS_PRESENT)
#include "ESP8266/ESP8266.h"
#include "events/EventQueue.h"
#include "events/mbed_shared_queues.h"
@ -359,5 +360,5 @@ private:
void proc_oob_evnt();
void _oob2global_event_queue();
};
#endif
#endif