am b7b7af83: Fix btwrite timer timeout for Angler (1/2)

* commit 'b7b7af83922fc5918d2632402daa3824364806fb':
  Fix btwrite timer timeout for Angler (1/2)

2 files changed, 7 insertions, 3 deletions

diff --git a/src/hardware.c b/src/hardware.c
index 9869ffa..b97d5f1 100755
--- a/src/hardware.c
+++ b/src/hardware.c
@@ -1220,9 +1220,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;
 
diff --git a/src/upio.c b/src/upio.c
index 3f73482..43dc5b5 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -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);