diff options
| author | Sean Wan <swan@google.com> | 2014-08-25 23:55:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 23:55:12 +0000 |
| commit | 5a63d16f5220c1706f866225a10ea9aa7bd898bc (patch) | |
| tree | 99d3f534ff24943d2b1ba10fa0f2e641e0110f88 /src/hardware.c | |
| parent | 3c6fa1114f34347d27b6b46dec1f3940bd50ed11 (diff) | |
| parent | 95c9eded71027bd2bba695ebcf9c1a796efe46f6 (diff) | |
| download | android_hardware_broadcom_libbt-5a63d16f5220c1706f866225a10ea9aa7bd898bc.tar.gz android_hardware_broadcom_libbt-5a63d16f5220c1706f866225a10ea9aa7bd898bc.tar.bz2 android_hardware_broadcom_libbt-5a63d16f5220c1706f866225a10ea9aa7bd898bc.zip | |
am 95c9eded: Merge "BT: Increasing firmware settlement delay to 200ms" into klp-modular-dev
* commit '95c9eded71027bd2bba695ebcf9c1a796efe46f6':
BT: Increasing firmware settlement delay to 200ms
Diffstat (limited to 'src/hardware.c')
| -rw-r--r-- | src/hardware.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/hardware.c b/src/hardware.c index c8bf746..e2eb7d7 100644 --- a/src/hardware.c +++ b/src/hardware.c @@ -217,6 +217,7 @@ static uint8_t bt_sco_param[SCO_I2SPCM_PARAM_SIZE] = */ static const fw_settlement_entry_t fw_settlement_table[] = { {"BCM43241", 200}, + {"BCM43341", 200}, {(const char *) NULL, 100} // Giving the generic fw settlement delay setting. }; @@ -586,6 +587,7 @@ void hw_config_cback(void *p_mem) HC_BT_HDR *p_buf=NULL; uint8_t is_proceeding = FALSE; int i; + int delay=100; #if (USE_CONTROLLER_BDADDR == TRUE) const uint8_t null_bdaddr[BD_ADDR_LEN] = {0,0,0,0,0,0}; #endif @@ -728,7 +730,9 @@ void hw_config_cback(void *p_mem) /* Check if we need to pause a few hundred milliseconds * before sending down any HCI command. */ - ms_delay(look_up_fw_settlement_delay()); + delay = look_up_fw_settlement_delay(); + ALOGI("Setting fw settlement delay to %d ", delay); + ms_delay(delay); /* fall through intentionally */ case HW_CFG_START: |