commit a1481418aa69bf2f4f6f6f02dba7f4974251e095
author Keun Soo Yim <yim@google.com> Mon Oct 26 19:35:50 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 26 19:35:50 2015 +0000
tree a5ab5ad55a9d32232e1548e79e6a3b77c9b3ae68
parent 9ac18e70df13c2723ad9a8e7460ba0129fda7a03
parent 6e49363df5d6a20a063fe003ac640f3f8efe4d78

libbt conf file for google gce_x86 devices
am: 6e49363df5

* commit '6e49363df5d6a20a063fe003ac640f3f8efe4d78':
  libbt conf file for google gce_x86 devices

include/vnd_angler.txt

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 @@
 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

src/hardware.c

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 @@
      */
     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;
 

src/upio.c

diff --git a/src/upio.c b/src/upio.c
index 3f73482..d24d496 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -507,6 +507,10 @@
             }
 #endif
 
+#if (BT_WAKE_VIA_PROC_NOTIFY_DEASSERT == TRUE)
+            lpm_proc_cb.btwrite_active = TRUE;
+#endif
+
             UPIODBG("%s: proc btwrite assertion, buffer: %c, timer_armed %d %d",
                     __FUNCTION__, buffer, lpm_proc_cb.btwrite_active, lpm_proc_cb.timer_created);