summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Kim <dojip.kim@lge.com>2014-08-22 23:33:34 -0700
committerPrashant Malani <pmalani@google.com>2014-08-25 15:54:10 -0700
commit822e4da8a67b777df7fa40b00aba434cb94ff601 (patch)
treecd0601ffcf7d4104bde9e5fa3034fd339d0f5087
parent232a9c5e07c236ce13efa8a23f4b8f045533f377 (diff)
downloadandroid_hardware_broadcom_libbt-822e4da8a67b777df7fa40b00aba434cb94ff601.tar.gz
android_hardware_broadcom_libbt-822e4da8a67b777df7fa40b00aba434cb94ff601.tar.bz2
android_hardware_broadcom_libbt-822e4da8a67b777df7fa40b00aba434cb94ff601.zip
Do not set timer if PROC_BTWRITE_TIMER_TIMEOUT_MS == 0
When PROC_BTWRITE_TIMER_TIMEOUT_MS is set to 0, it disables btwrite timer setup so that bluesleep driver controls timeout for tx data Bug: 16889688 Change-Id: I721ae88fdd671495c509acfcbdee559daf34e089
-rw-r--r--src/upio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/upio.c b/src/upio.c
index 360c6d4..9008355 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -372,6 +372,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
ALOGE("upio_set : write(%s) failed: %s (%d)",
VENDOR_LPM_PROC_NODE, strerror(errno),errno);
}
+#if (PROC_BTWRITE_TIMER_TIMEOUT_MS != 0)
else
{
if (action == UPIO_ASSERT)
@@ -395,6 +396,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
}
}
}
+#endif
if (fd >= 0)
close(fd);
@@ -453,6 +455,7 @@ 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
{
lpm_proc_cb.btwrite_active = TRUE;
@@ -469,6 +472,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
timer_settime(lpm_proc_cb.timer_id, 0, &ts, 0);
}
}
+#endif
UPIODBG("proc btwrite assertion");