michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Follow central-peripheral ifdefs rule

Browse source 
Use same ifdefs rule in all places in SMP code. This makes code
easier to read.

Change-Id: I6936ca6f7a0212fc1918ed18d247f3e6d73f0370
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-12-03 18:04:52 +01:00 • committed by Anas Nashif
commit b2db881468
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
net/bluetooth/smp.c
View file

@ -641,21 +641,16 @@ static void smp_reset(struct bt_smp *smp)
conn->required_sec_level = conn->sec_level;
}
switch (conn->role) {
#if defined(CONFIG_BLUETOOTH_CENTRAL)
case BT_HCI_ROLE_MASTER:
if (conn->role == BT_HCI_ROLE_MASTER) {
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_SECURITY_REQUEST);
break;
return;
}
#endif /* CONFIG_BLUETOOTH_CENTRAL */
#if defined(CONFIG_BLUETOOTH_PERIPHERAL)
case BT_HCI_ROLE_SLAVE:
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_REQ);
break;
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_REQ);
#endif /* CONFIG_BLUETOOTH_PERIPHERAL */
default:
break;
}
}
static void smp_timeout(int arg1, int arg2)
@ -3078,21 +3073,16 @@ void bt_auth_passkey_entry(struct bt_conn *conn, unsigned int passkey)
return;
}
switch(conn->role) {
#if defined(CONFIG_BLUETOOTH_CENTRAL)
case BT_HCI_ROLE_MASTER:
if (smp->chan.conn->role == BT_HCI_ROLE_MASTER) {
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_CONFIRM);
break;
return;
}
#endif /* CONFIG_BLUETOOTH_CENTRAL */
#if defined(CONFIG_BLUETOOTH_PERIPHERAL)
case BT_HCI_ROLE_SLAVE:
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_RANDOM);
break;
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_RANDOM);
#endif /* CONFIG_BLUETOOTH_PERIPHERAL */
default:
break;
}
}
void bt_auth_passkey_confirm(struct bt_conn *conn, bool match)