patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: host: Remove the deprecated bt_conn_create_slave_le function

Browse source 
Remove the deprecated bt_conn_create_slave_le function.
This was deprecated in the 2.3.0 release.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2021-01-20 16:43:04 +01:00 committed by Anas Nashif
parent 016b580beb
commit c14da53772
3 changed files with 3 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/releases/release-notes-2.5.rst
View file

@ -105,6 +105,9 @@ Removed APIs in this release
use bt_conn_le_create() instead. use bt_conn_le_create() instead.
* The deprecated bt_conn_create_auto_le() function has been removed, * The deprecated bt_conn_create_auto_le() function has been removed,
use bt_conn_le_create_auto() instead. use bt_conn_le_create_auto() instead.
* The deprecated bt_conn_create_slave_le() function has been removed,
use bt_le_adv_start() instead with bt_le_adv_param::peer set to the remote
peers address.
* The deprecated BT_LE_ADV_* macros have been removed, * The deprecated BT_LE_ADV_* macros have been removed,
use the BT_GAP_ADV_* enums instead. use the BT_GAP_ADV_* enums instead.
* The deprecated bt_conn_security function has been removed, * The deprecated bt_conn_security function has been removed,

39
include/bluetooth/conn.h
View file

@ -653,45 +653,6 @@ int bt_conn_create_auto_stop(void);
int bt_le_set_auto_conn(const bt_addr_le_t *addr, int bt_le_set_auto_conn(const bt_addr_le_t *addr,
const struct bt_le_conn_param *param); const struct bt_le_conn_param *param);
/** @brief Initiate directed advertising to a remote device
*
* Allows initiating a new LE connection to remote peer with the remote
* acting in central role and the local device in peripheral role.
*
* The advertising type will either be BT_LE_ADV_DIRECT_IND, or
* BT_LE_ADV_DIRECT_IND_LOW_DUTY if the BT_LE_ADV_OPT_DIR_MODE_LOW_DUTY
* option was used as part of the advertising parameters.
*
* In case of high duty cycle this will result in a callback with
* connected() with a new connection or with an error.
*
* The advertising may be canceled with bt_conn_disconnect().
*
* The caller gets a new reference to the connection object which must be
* released with bt_conn_unref() once done using the object.
*
* @param peer Remote address.
* @param param Directed advertising parameters.
*
* @return Valid connection object on success or NULL otherwise.
*/
__deprecated static inline
struct bt_conn *bt_conn_create_slave_le(const bt_addr_le_t *peer,
const struct bt_le_adv_param *param)
{
struct bt_le_adv_param adv_param = *param;
adv_param.options |= (BT_LE_ADV_OPT_CONNECTABLE |
BT_LE_ADV_OPT_ONE_TIME);
adv_param.peer = peer;
if (!bt_le_adv_start(&adv_param, NULL, 0, NULL, 0)) {
return NULL;
}
return bt_conn_lookup_addr_le(param->id, peer);
}
/** Security level. */ /** Security level. */
typedef enum __packed { typedef enum __packed {
/** Level 0: Only for BR/EDR special cases, like SDP */ /** Level 0: Only for BR/EDR special cases, like SDP */

11
subsys/bluetooth/host/conn.c
View file

@ -2158,17 +2158,6 @@ int bt_conn_disconnect(struct bt_conn *conn, uint8_t reason)
bt_le_scan_update(false); bt_le_scan_update(false);
} }
return 0; return 0;
case BT_CONN_CONNECT_DIR_ADV:
BT_WARN("Deprecated: Use bt_le_adv_stop instead");
conn->err = reason;
bt_conn_set_state(conn, BT_CONN_DISCONNECTED);
if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
/* User should unref connection object when receiving
* error in connection callback.
*/
return bt_le_adv_stop();
}
return 0;
case BT_CONN_CONNECT: case BT_CONN_CONNECT:
#if defined(CONFIG_BT_BREDR) #if defined(CONFIG_BT_BREDR)
if (conn->type == BT_CONN_TYPE_BR) { if (conn->type == BT_CONN_TYPE_BR) {