Skip to content

Commit 6e89573

Browse files
author
Arto Kinnunen
committed
Squashed 'connectivity/drivers/802.15.4_RF/atmel-rf-driver/' changes from 293edc63b8..ae4ef1b197
ae4ef1b197 Merge pull request ARMmbed#101 from ARMmbed/sync_with_mbed_os_master dd57078cf8 (via Mbed OS)resolved astyle - coding format. f62ac25b09 (via Mbed OS)fixed the preprocessor guards 63cc85e983 Follow Mbed OS coding style git-subtree-dir: connectivity/drivers/802.15.4_RF/atmel-rf-driver git-subtree-split: ae4ef1b197698749ce030c39d84e222ac4b4cd0e
1 parent e1376bf commit 6e89573

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

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

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"

source/NanostackRfPhyAtmel.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
#if (MBED_VERSION > MBED_ENCODE_VERSION(6, 0, 0))
4040
/* Mbed OS 6.0 introduces support for chrono time management */
4141
using namespace std::chrono;
42-
#define ATMEL_RF_TIME_50US 50us
43-
#define ATMEL_RF_TIME_2MS 2ms
44-
#define ATMEL_RF_TIME_10MS 10ms
45-
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach(signal_ref, timeout_ref)
42+
#define ATMEL_RF_TIME_50US 50us
43+
#define ATMEL_RF_TIME_2MS 2ms
44+
#define ATMEL_RF_TIME_10MS 10ms
45+
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach(signal_ref, timeout_ref)
4646
#else
47-
#define ATMEL_RF_TIME_50US 50
48-
#define ATMEL_RF_TIME_2MS 2
49-
#define ATMEL_RF_TIME_10MS 10
50-
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach_us(signal_ref, timeout_ref)
47+
#define ATMEL_RF_TIME_50US 50
48+
#define ATMEL_RF_TIME_2MS 2
49+
#define ATMEL_RF_TIME_10MS 10
50+
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach_us(signal_ref, timeout_ref)
5151
#endif
5252

5353
#define TRACE_GROUP "AtRF"

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)