Revision 398:b1dbc4eb89a9, committed 2015-08-07

Comitter:

rgrover1

Date:

Fri Aug 07 15:57:07 2015 +0100

Parent:

397:c7adea3c1e37

Child:

399:a471c3da4806

Commit message:

Synchronized with git rev 34977aea
Author: Jean-Philippe Brucker
Add S110 compatibility in S130 headers

Changed in this revision

--- a/source/nordic-sdk/components/softdevice/s130/include/ble_gap.h	Tue Jul 21 13:23:46 2015 +0100
+++ b/source/nordic-sdk/components/softdevice/s130/include/ble_gap.h	Fri Aug 07 15:57:07 2015 +0100
@@ -547,7 +547,9 @@
 {
   ble_gap_addr_t        peer_addr;              /**< Bluetooth address of the peer device. */
   ble_gap_addr_t        own_addr;               /**< Bluetooth address of the local device used during connection setup. */
+#if !defined(MCU_NORDIC_16K_S110) && !defined(MCU_NORDIC_32K_S110)
   uint8_t               role;                   /**< BLE role for this connection, see @ref BLE_GAP_ROLES */
+#endif
   uint8_t               irk_match :1;           /**< If 1, peer device's address resolved using an IRK. */
   uint8_t               irk_match_idx  :7;      /**< Index in IRK list where the address was matched. */
   ble_gap_conn_params_t conn_params;            /**< GAP Connection Parameters. */