mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Merge pull request #13472 from talorion/master
Fix for targets where DEVICE_SPI or DEVICE_INTERRUPTIN are defined but not bothpull/13486/head
						commit
						1950ac61a9
					
				| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
#include "at24mac.h"
 | 
			
		||||
#include "PinNames.h"
 | 
			
		||||
 | 
			
		||||
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && defined(MBED_CONF_RTOS_PRESENT)
 | 
			
		||||
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
 | 
			
		||||
 | 
			
		||||
#include "NanostackRfPhy.h"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,7 @@
 | 
			
		|||
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
 | 
			
		||||
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
 | 
			
		||||
 | 
			
		||||
#include "ns_types.h"
 | 
			
		||||
#include "platform/arm_hal_interrupt.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,6 +17,8 @@
 | 
			
		|||
#ifndef RFBITS_H_
 | 
			
		||||
#define RFBITS_H_
 | 
			
		||||
 | 
			
		||||
#if DEVICE_SPI
 | 
			
		||||
 | 
			
		||||
#include "DigitalIn.h"
 | 
			
		||||
#include "DigitalOut.h"
 | 
			
		||||
#include "InterruptIn.h"
 | 
			
		||||
| 
						 | 
				
			
			@ -78,4 +80,5 @@ public:
 | 
			
		|||
    DigitalOut ANT_SEL;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#endif /* DEVICE_SPI */
 | 
			
		||||
#endif /* RFBITS_H_ */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue