From 814539ca8c1155b11cea7a557deb27605cf4b7c2 Mon Sep 17 00:00:00 2001
From: xkeita <keita_nya@live.jp>
Date: Mon, 22 May 2017 07:10:53 +0000
Subject: shinano-common: Fix Bluetooth Voice Calls

- Remove BTA timer delay and IOCTL false flag
- Hardcode vnd_shinano.txt path

Change-Id: Ife81025c3ce0ac535bdf0883ecd225422e7ea80c
---
 bluetooth/bdroid_buildcfg.h |  3 ---
 bluetooth/vnd_generic.txt   | 18 ------------------
 bluetooth/vnd_shinano.txt   | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 bluetooth/vnd_generic.txt
 create mode 100644 bluetooth/vnd_shinano.txt

(limited to 'bluetooth')

diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 297c49a..08219a1 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -18,9 +18,6 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#define BTA_DISABLE_DELAY 100 /* in milliseconds */
-#define HCILP_INCLUDED FALSE
-#define BT_WAKE_VIA_USERIAL_IOCTL FALSE
 #define BTM_WBS_INCLUDED TRUE
 
 /* Defined if the kernel does not have support for CLOCK_BOOTTIME_ALARM */
diff --git a/bluetooth/vnd_generic.txt b/bluetooth/vnd_generic.txt
deleted file mode 100644
index 31b1ff8..0000000
--- a/bluetooth/vnd_generic.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0"
-FW_PATCHFILE_LOCATION = "/system/etc/firmware/"
-FW_PATCHFILE_NAME = "BCM43xx.hcd"
-BT_WAKE_VIA_USERIAL_IOCTL = TRUE
-USERIAL_IOCTL_BT_WAKE_ASSERT = 0x5441
-USERIAL_IOCTL_BT_WAKE_DEASSERT = 0x5442
-USERIAL_IOCTL_BT_WAKE_GET_ST = 0x5443
-FW_PATCH_SETTLEMENT_DELAY_MS = 100
-UART_TARGET_BAUD_RATE = 3000000
-LPM_IDLE_TIMEOUT_MULTIPLE = 5
-LPM_BT_WAKE_POLARITY = 1
-LPM_HOST_WAKE_POLARITY = 1
-SCO_USE_I2S_INTERFACE = FALSE
-SCO_I2SPCM_IF_ROLE = 0
-BTVND_DBG = FALSE
-BTHW_DBG = TRUE
-VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE
diff --git a/bluetooth/vnd_shinano.txt b/bluetooth/vnd_shinano.txt
new file mode 100644
index 0000000..e076a9d
--- /dev/null
+++ b/bluetooth/vnd_shinano.txt
@@ -0,0 +1,18 @@
+BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0"
+FW_PATCHFILE_LOCATION = "/system/etc/firmware/"
+FW_PATCHFILE_NAME = "BCM43xx.hcd"
+BT_WAKE_VIA_USERIAL_IOCTL = TRUE
+USERIAL_IOCTL_BT_WAKE_ASSERT = 0x5441
+USERIAL_IOCTL_BT_WAKE_DEASSERT = 0x5442
+USERIAL_IOCTL_BT_WAKE_GET_ST = 0x5443
+FW_PATCH_SETTLEMENT_DELAY_MS = 100
+UART_TARGET_BAUD_RATE = 3000000
+LPM_IDLE_TIMEOUT_MULTIPLE = 5
+LPM_BT_WAKE_POLARITY = 1
+LPM_HOST_WAKE_POLARITY = 1
+SCO_USE_I2S_INTERFACE = FALSE
+SCO_I2SPCM_IF_ROLE = 0
+BTVND_DBG = FALSE
+BTHW_DBG = TRUE
+VNDUSERIAL_DBG = FALSE
+UPIO_DBG = FALSE
\ No newline at end of file
-- 
cgit v1.2.3