ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8327 from SeppoTakalo/i2c_guard 

Guard Atmel RF driver build by DEVICE_I2C
pull/8192/merge
Martin Kojtal 2018-10-09 11:37:43 -05:00 committed by GitHub
parent 313073ca3e f16a99cf15
commit 06dffda530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/802.15.4_RF/atmel-rf-driver/atmel-rf-driver/NanostackRfPhyAtmel.h
View File

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

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

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

4
components/802.15.4_RF/atmel-rf-driver/source/at24mac.cpp
View File

@ -15,6 +15,8 @@
*/ */
#include "at24mac.h" #include "at24mac.h"
#if DEVICE_I2C
/* Device addressing */ /* Device addressing */
#define AT24MAC_EEPROM_ADDRESS (0x0A<<4) #define AT24MAC_EEPROM_ADDRESS (0x0A<<4)
#define AT24MAC_RW_PROTECT_ADDRESS (0x06<<4) #define AT24MAC_RW_PROTECT_ADDRESS (0x06<<4)
@ -59,3 +61,5 @@ int AT24Mac::read_eui48(void *buf)
return -1; //No ACK return -1; //No ACK
return _i2c.read(AT24MAC_SERIAL_ADDRESS, (char*)buf, EUI48_LEN); return _i2c.read(AT24MAC_SERIAL_ADDRESS, (char*)buf, EUI48_LEN);
} }
#endif /* DEVICE_I2C */

4
components/802.15.4_RF/atmel-rf-driver/source/at24mac.h
View File

@ -17,6 +17,9 @@
#define AT24MAC_H #define AT24MAC_H
#include "PinNames.h" #include "PinNames.h"
#if DEVICE_I2C
#include "I2C.h" #include "I2C.h"
#include "drivers/DigitalInOut.h" #include "drivers/DigitalInOut.h"
#include "platform/mbed_wait_api.h" #include "platform/mbed_wait_api.h"
@ -62,4 +65,5 @@ private:
mbed::I2C _i2c; mbed::I2C _i2c;
}; };
#endif /* DEVICE_I2C */
#endif /* AT24MAC_H */ #endif /* AT24MAC_H */