Skip to content

Commit faaab75

Browse files
author
Arto Kinnunen
committed
Merge commit '6e89573be1c458bf3cfa6f1677a31648b4686284' into nanostack-as_subtree
* commit '6e89573be1c458bf3cfa6f1677a31648b4686284': Squashed 'connectivity/drivers/802.15.4_RF/atmel-rf-driver/' changes from 293edc63b8..ae4ef1b197
2 parents 1045b9c + 6e89573 commit faaab75

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

connectivity/drivers/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 && defined(MBED_CONF_RTOS_PRESENT)
23+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
2424

2525
#include "NanostackRfPhy.h"
2626

connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <string.h>
1818

19-
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
19+
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
2020

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

connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/rfbits.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#ifndef RFBITS_H_
1818
#define RFBITS_H_
1919

20+
#if DEVICE_SPI
21+
2022
#include "DigitalIn.h"
2123
#include "DigitalOut.h"
2224
#include "InterruptIn.h"
@@ -78,4 +80,5 @@ class Se2435Pins {
7880
DigitalOut ANT_SEL;
7981
};
8082

83+
#endif /* DEVICE_SPI */
8184
#endif /* RFBITS_H_ */

0 commit comments

Comments
 (0)