summaryrefslogtreecommitdiffstats
path: root/btif
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2013-11-11 21:10:43 +0100
committerPaul Kocialkowski <contact@paulk.fr>2013-11-11 21:10:43 +0100
commit20c13c655e0cdd25d21d562d1d44988107a20711 (patch)
tree05c147bdeea1d7f868976cae3dbf2e7cb81ae28c /btif
parent10b999d68cf2535cd5f7a4df3b20d801c8f09fe0 (diff)
downloadexternal_bluetooth_bluedroid-20c13c655e0cdd25d21d562d1d44988107a20711.zip
external_bluetooth_bluedroid-20c13c655e0cdd25d21d562d1d44988107a20711.tar.gz
external_bluetooth_bluedroid-20c13c655e0cdd25d21d562d1d44988107a20711.tar.bz2
Properly handle missing firmwaresreplicant-4.2-0001
Change-Id: I47d7d59c49d06149cbf27e0ac570188b451197f8 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'btif')
-rwxr-xr-xbtif/src/btif_core.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c
index 62339a9..19ebae1 100755
--- a/btif/src/btif_core.c
+++ b/btif/src/btif_core.c
@@ -130,7 +130,7 @@ extern void bte_load_did_conf(const char *p_path);
/** TODO: Move these to _common.h */
void bte_main_boot_entry(void);
-void bte_main_enable(uint8_t *local_addr);
+bt_status_t bte_main_enable(uint8_t *local_addr);
void bte_main_disable(void);
void bte_main_shutdown(void);
#if (defined(HCILP_INCLUDED) && HCILP_INCLUDED == TRUE)
@@ -502,6 +502,8 @@ static bt_status_t btif_associate_evt(void)
bt_status_t btif_enable_bluetooth(void)
{
+ bt_status_t status;
+
BTIF_TRACE_DEBUG0("BTIF ENABLE BLUETOOTH");
if (btif_core_state != BTIF_CORE_STATE_DISABLED)
@@ -513,9 +515,11 @@ bt_status_t btif_enable_bluetooth(void)
btif_core_state = BTIF_CORE_STATE_ENABLING;
/* Create the GKI tasks and run them */
- bte_main_enable(btif_local_bd_addr.address);
+ status = bte_main_enable(btif_local_bd_addr.address);
+ if (status != BT_STATUS_SUCCESS)
+ btif_core_state = BTIF_CORE_STATE_DISABLED;
- return BT_STATUS_SUCCESS;
+ return status;
}