Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix sim:bluetooth compiler error #18

Merged
merged 1 commit into from
Dec 31, 2019
Merged

fix sim:bluetooth compiler error #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions boards/sim/sim/sim/src/sim_bringup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ int sim_bringup(void)
#ifdef CONFIG_RAMMTD
FAR uint8_t *ramstart;
#endif
int ret;
int ret = OK;

#ifdef CONFIG_FS_BINFS
/* Mount the binfs file system */
Expand Down Expand Up @@ -300,7 +300,6 @@ int sim_bringup(void)
}
#endif

#ifdef CONFIG_WIRELESS_BLUETOOTH
#ifdef CONFIG_BLUETOOTH_NULL
/* Register the NULL Bluetooth network device */

Expand All @@ -311,18 +310,5 @@ int sim_bringup(void)
}
#endif

/* Initialize the Bluetooth stack (This will fail if no device has been
* registered).
*/

ret = bt_netdev_register();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: bt_netdev_register() failed: %d\n", ret);
}

#endif

UNUSED(ret);
return OK;
return ret;
}
2 changes: 1 addition & 1 deletion drivers/wireless/bluetooth/bt_null.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,5 +271,5 @@ int btnull_register(void)
{
/* Register the driver with the Bluetooth stack */

return bt_driver_register(&g_bt_null);
return bt_netdev_register(&g_bt_null);
}
2 changes: 1 addition & 1 deletion drivers/wireless/bluetooth/bt_uart_bcm4343x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ int btuart_register(FAR const struct btuart_lowerhalf_s *lower)
ret = bt_netdev_register(&upper->dev);
if (ret < 0)
{
wlerr("ERROR: bt_driver_register failed: %d\n", ret);
wlerr("ERROR: bt_netdev_register failed: %d\n", ret);
kmm_free(upper);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/wireless/bluetooth/bt_uart_cc2564.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ int btuart_register(FAR const struct btuart_lowerhalf_s *lower)
ret = bt_netdev_register(&upper->dev);
if (ret < 0)
{
wlerr("ERROR: bt_driver_register failed: %d\n", ret);
wlerr("ERROR: bt_netdev_register failed: %d\n", ret);
kmm_free(upper);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/wireless/bluetooth/bt_uart_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int btuart_register(FAR const struct btuart_lowerhalf_s *lower)
ret = bt_netdev_register(&upper->dev);
if (ret < 0)
{
wlerr("ERROR: bt_driver_register failed: %d\n", ret);
wlerr("ERROR: bt_netdev_registe failed: %d\n", ret);
kmm_free(upper);
}

Expand Down