diff options
| author | Sean Wan <swan@google.com> | 2014-08-26 22:45:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-26 22:45:56 +0000 |
| commit | 04b8686dd7b5e26893924dfb5daee66735beebf4 (patch) | |
| tree | 5dc6b0de06d1c9794696ca647e2865637d0d15ec /src | |
| parent | 21371a06c8ab730b56276e7dc6aa768c59e13db3 (diff) | |
| parent | 5a63d16f5220c1706f866225a10ea9aa7bd898bc (diff) | |
| download | android_hardware_broadcom_libbt-04b8686dd7b5e26893924dfb5daee66735beebf4.tar.gz android_hardware_broadcom_libbt-04b8686dd7b5e26893924dfb5daee66735beebf4.tar.bz2 android_hardware_broadcom_libbt-04b8686dd7b5e26893924dfb5daee66735beebf4.zip | |
am 5a63d16f: am 95c9eded: Merge "BT: Increasing firmware settlement delay to 200ms" into klp-modular-dev
* commit '5a63d16f5220c1706f866225a10ea9aa7bd898bc':
BT: Increasing firmware settlement delay to 200ms
Diffstat (limited to 'src')
| -rwxr-xr-x | src/hardware.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/hardware.c b/src/hardware.c index 315eb12..db7d26a 100755 --- a/src/hardware.c +++ b/src/hardware.c @@ -228,6 +228,7 @@ static uint8_t bt_sco_i2spcm_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. }; @@ -618,6 +619,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 @@ -760,7 +762,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: |