mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Merge branch 'nordic_structure'
						commit
						e35fd00101
					
				| 
						 | 
					@ -33,8 +33,8 @@
 | 
				
			||||||
#include "pstorage.h"
 | 
					#include "pstorage.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "hw/GapEvents.h"
 | 
					#include "hw/GapEvents.h"
 | 
				
			||||||
#include "hw/nRF51822n/nRF51Gap.h"
 | 
					#include "nRF51Gap.h"
 | 
				
			||||||
#include "hw/nRF51822n/nRF51GattServer.h"
 | 
					#include "nRF51GattServer.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void service_error_callback(uint32_t nrf_error);
 | 
					static void service_error_callback(uint32_t nrf_error);
 | 
				
			||||||
void        assert_nrf_callback(uint16_t line_num, const uint8_t * p_file_name);
 | 
					void        assert_nrf_callback(uint16_t line_num, const uint8_t * p_file_name);
 | 
				
			||||||
| 
						 | 
					@ -25,8 +25,8 @@
 | 
				
			||||||
#include "mbed.h"
 | 
					#include "mbed.h"
 | 
				
			||||||
#include "blecommon.h"
 | 
					#include "blecommon.h"
 | 
				
			||||||
#include "hw/BLEDevice.h"
 | 
					#include "hw/BLEDevice.h"
 | 
				
			||||||
#include "hw/nRF51822n/nRF51Gap.h"
 | 
					#include "nRF51Gap.h"
 | 
				
			||||||
#include "hw/nRF51822n/nRF51GattServer.h"
 | 
					#include "nRF51GattServer.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**************************************************************************/
 | 
					/**************************************************************************/
 | 
				
			||||||
/*!
 | 
					/*!
 | 
				
			||||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
		Reference in New Issue