Skip to content

Commit b66f114

Browse files
chengkai15xiaoxiang781216
authored andcommitted
bluetooth: set bt_driver_register/unregister to xx_set/unset
change bt_driver_register/unregister function name to bt_driver_set/unset, which would be prepared for bt_driver.h Signed-off-by: chengkai <[email protected]>
1 parent 3144971 commit b66f114

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

wireless/bluetooth/bt_hcicore.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,10 +1661,10 @@ int bt_deinitialize(void)
16611661
}
16621662

16631663
/****************************************************************************
1664-
* Name: bt_driver_register
1664+
* Name: bt_driver_set
16651665
*
16661666
* Description:
1667-
* Register the Bluetooth low-level driver with the Bluetooth stack.
1667+
* Set the Bluetooth low-level driver with the Bluetooth stack.
16681668
* This is called from the low-level driver and is part of the driver
16691669
* interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
16701670
*
@@ -1679,7 +1679,7 @@ int bt_deinitialize(void)
16791679
*
16801680
****************************************************************************/
16811681

1682-
int bt_driver_register(FAR struct bt_driver_s *btdev)
1682+
int bt_driver_set(FAR struct bt_driver_s *btdev)
16831683
{
16841684
DEBUGASSERT(btdev != NULL && btdev->open != NULL && btdev->send != NULL);
16851685

@@ -1696,13 +1696,12 @@ int bt_driver_register(FAR struct bt_driver_s *btdev)
16961696
}
16971697

16981698
/****************************************************************************
1699-
* Name: bt_driver_unregister
1699+
* Name: bt_driver_unset
17001700
*
17011701
* Description:
1702-
* Unregister a Bluetooth low-level driver previously registered with
1703-
* bt_driver_register. This may be called from the low-level driver and
1704-
* is part of the driver interface prototyped in
1705-
* include/nuttx/wireless/bluetooth/bt_driver.h
1702+
* Unset a Bluetooth low-level driver previously set with bt_driver_set.
1703+
* This may be called from the low-level driver and is part of the driver
1704+
* interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
17061705
*
17071706
* Input Parameters:
17081707
* btdev - An instance of the low-level drivers interface structure.
@@ -1712,7 +1711,7 @@ int bt_driver_register(FAR struct bt_driver_s *btdev)
17121711
*
17131712
****************************************************************************/
17141713

1715-
void bt_driver_unregister(FAR struct bt_driver_s *btdev)
1714+
void bt_driver_unset(FAR struct bt_driver_s *btdev)
17161715
{
17171716
g_btdev.btdev = NULL;
17181717
}

wireless/bluetooth/bt_hcicore.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@ int bt_initialize(void);
275275
int bt_deinitialize(void);
276276

277277
/****************************************************************************
278-
* Name: bt_driver_register
278+
* Name: bt_driver_set
279279
*
280280
* Description:
281-
* Register the Bluetooth low-level driver with the Bluetooth stack.
281+
* Set the Bluetooth low-level driver with the Bluetooth stack.
282282
* This is called from the low-level driver and is part of the driver
283283
* interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
284284
*
@@ -293,16 +293,15 @@ int bt_deinitialize(void);
293293
*
294294
****************************************************************************/
295295

296-
int bt_driver_register(FAR struct bt_driver_s *btdev);
296+
int bt_driver_set(FAR struct bt_driver_s *btdev);
297297

298298
/****************************************************************************
299-
* Name: bt_driver_unregister
299+
* Name: bt_driver_unset
300300
*
301301
* Description:
302-
* Unregister a Bluetooth low-level driver previously registered with
303-
* bt_driver_register. This may be called from the low-level driver and
304-
* is part of the driver interface prototyped in
305-
* include/nuttx/wireless/bluetooth/bt_driver.h
302+
* Unset a Bluetooth low-level driver previously set with bt_driver_set.
303+
* This may be called from the low-level driver and is part of the driver
304+
* interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
306305
*
307306
* Input Parameters:
308307
* btdev - An instance of the low-level drivers interface structure.
@@ -312,7 +311,7 @@ int bt_driver_register(FAR struct bt_driver_s *btdev);
312311
*
313312
****************************************************************************/
314313

315-
void bt_driver_unregister(FAR struct bt_driver_s *btdev);
314+
void bt_driver_unset(FAR struct bt_driver_s *btdev);
316315

317316
/****************************************************************************
318317
* Name: bt_send

wireless/bluetooth/bt_netdev.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,10 +1262,10 @@ int bt_netdev_register(FAR struct bt_driver_s *btdev)
12621262
* supported.
12631263
*/
12641264

1265-
ret = bt_driver_register(btdev);
1265+
ret = bt_driver_set(btdev);
12661266
if (ret < 0)
12671267
{
1268-
nerr("ERROR: bt_driver_register() failed: %d\n", ret);
1268+
nerr("ERROR: bt_driver_set() failed: %d\n", ret);
12691269
goto errout;
12701270
}
12711271

@@ -1316,7 +1316,7 @@ int bt_netdev_register(FAR struct bt_driver_s *btdev)
13161316
errout:
13171317

13181318
btnet_ifdown(netdev);
1319-
bt_driver_unregister(btdev);
1319+
bt_driver_unset(btdev);
13201320

13211321
/* Free memory and return the error */
13221322

@@ -1367,7 +1367,7 @@ int bt_netdev_unregister(FAR struct bt_driver_s *btdev)
13671367

13681368
bt_deinitialize();
13691369

1370-
bt_driver_unregister(btdev);
1370+
bt_driver_unset(btdev);
13711371

13721372
kmm_free(btdev->bt_net);
13731373
btdev->bt_net = NULL;

0 commit comments

Comments
 (0)