diff options
| -rwxr-xr-x | include/vnd_angler.txt | 2 | ||||
| -rwxr-xr-x | src/hardware.c | 3 | ||||
| -rw-r--r-- | src/upio.c | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/include/vnd_angler.txt b/include/vnd_angler.txt index 103b656..8d7b271 100755 --- a/include/vnd_angler.txt +++ b/include/vnd_angler.txt @@ -2,7 +2,7 @@ BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0" FW_PATCHFILE_LOCATION = "/vendor/firmware/" BT_WAKE_VIA_PROC = TRUE BT_WAKE_VIA_PROC_NOTIFY_DEASSERT=TRUE -PROC_BTWRITE_TIMER_TIMEOUT_MS = 4000 +PROC_BTWRITE_TIMER_TIMEOUT_MS = 0 UART_TARGET_BAUD_RATE = 3000000 LPM_IDLE_TIMEOUT_MULTIPLE = 5 LPM_HC_IDLE_THRESHOLD = 24 diff --git a/src/hardware.c b/src/hardware.c index 02103ca..10bf22b 100755 --- a/src/hardware.c +++ b/src/hardware.c @@ -1211,9 +1211,10 @@ uint32_t hw_lpm_get_idle_timeout(void) */ timeout_ms = (uint32_t)lpm_param.host_stack_idle_threshold \ * LPM_IDLE_TIMEOUT_MULTIPLE; - if (strstr(hw_cfg_cb.local_chip_name, "BCM4325") != NULL) timeout_ms *= 25; // 12.5 or 25 ? + else if (strstr(hw_cfg_cb.local_chip_name, "BCM4358") != NULL) + timeout_ms *= 50; else timeout_ms *= 300; @@ -499,13 +499,16 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity) ALOGE("upio_set : write(%s) failed: %s (%d)", VENDOR_BTWRITE_PROC_NODE, strerror(errno),errno); } -#if (PROC_BTWRITE_TIMER_TIMEOUT_MS != 0) else { +#if (BT_WAKE_VIA_PROC == TRUE) + lpm_proc_cb.btwrite_active = TRUE; +#endif +#if (PROC_BTWRITE_TIMER_TIMEOUT_MS != 0) /* arm user space timer based on action */ upio_start_stop_timer(action); - } #endif + } UPIODBG("%s: proc btwrite assertion, buffer: %c, timer_armed %d %d", __FUNCTION__, buffer, lpm_proc_cb.btwrite_active, lpm_proc_cb.timer_created); |