summaryrefslogtreecommitdiff
path: root/bluetooth
diff options
context:
space:
mode:
Diffstat (limited to 'bluetooth')
-rw-r--r--bluetooth/bt_vendor.conf102
-rw-r--r--bluetooth/vnd_shinano.txt4
2 files changed, 7 insertions, 99 deletions
diff --git a/bluetooth/bt_vendor.conf b/bluetooth/bt_vendor.conf
index 1f4a63a..2d4267c 100644
--- a/bluetooth/bt_vendor.conf
+++ b/bluetooth/bt_vendor.conf
@@ -11,7 +11,7 @@ UimUartPort = /dev/ttyHS0
UartBaudRate = 3000000
# Firmware patch file location (compile default /vendor/firmware)
-FwPatchFilePath = /system/etc/firmware
+FwPatchFilePath = /vendor/firmware
# uncomment if you want to load a specific version
FwPatchFileName = BCM43xx.hcd
@@ -25,94 +25,6 @@ FwPatchSettlementDelay = 100
# 1: active high (positive logic) (default)
LpmWakePolarity = 1
-# stack/controller idle timeout in units (300/25ms)
-# make sur controller supports 25ms
-#LpmIdleTimeout = 2
-
-#**************************************
-# SCO I2S/PCM interface
-# 0: PCM
-# 1: I2S
-#**************************************
-#ScoInterface = 0
-
-#**************************************
-# SCO over PCM
-#
-# Configuration for SCO over PCM interface, which parameters are represented by array.
-# Each PCM parameters' definations are listed as below, in order. Be NOTICED that
-# this setting is ONLY VALID as PCM interface is selected/used.
-#
-# PCM Frame Type (SCO_PCM_IF_FRAME_TYPE)
-# - 0: Short
-# - 1: Long
-#
-# PCM Sync Mode (SCO_PCM_IF_SYNC_MODE)
-# - 0: Slave
-# - 1: Master
-#
-# PCM Clock Mode (SCO_PCM_IF_CLOCK_MODE)
-# - 0: Slave
-# - 1: Master
-#
-# PCM NBS(Narrow Band Speech) Clock Rate (SCO_PCM_IF_CLOCK_RATE)
-# - 0: 128K
-# - 1: 256K
-# - 2: 512K
-# - 3: 1024K
-# - 4: 2048K
-#
-# PCM WBS(Wide Band Speech) Clock Rate (SCO_I2SPCM_IF_CLOCK_RATE4WBS)
-# - 0: 128K
-# - 1: 256K
-# - 2: 512K
-# - 3: 1024K
-# - 4: 2048K
-#
-# PCM WBS (Wide Band Speech) Sample Rate (SCO_I2SPCM_IF_SAMPLE_RATE)
-#
-# - 0: 8K
-# - 1: 16K
-# - 2: 4K
-#
-# Carriers do not support 16K voice samples at present,
-# so, setting PCM WBS Sample Rate to 8K (0) for now.
-#
-#**************************************
-#ScoPCMifParams = {0,0,0,4,4,0}
-
-#**************************************
-# PCM Format
-#
-# Configuration for PCM format, which parameters are represented by array.
-# Each PCM format parameters' definations/descriptions are listed as below, in order.
-#
-# Shift Mode (PCM_DATA_FMT_SHIFT_MODE)
-# - 0: MSB first
-# - 1: LSB first
-#
-# Fill Bits (PCM_DATA_FMT_FILL_BITS)
-# - Specifies the value with which to fill unused bits
-# if Fill_Method is set to programmable
-#
-# Fill Method (PCM_DATA_FMT_FILL_METHOD)
-# - 0 : 0's
-# - 1 : 1's
-# - 2 : Signed
-# - 3 : Programmable
-#
-# Fill Num (PCM_DATA_FMT_FILL_NUM)
-# - Specifies the number of bits to be filled
-#
-# Justify Mode (PCM_DATA_FMT_JUSTIFY_MODE)
-# - 0: Left justify (fill data shifted out last)
-# - 1: Right justify (fill data shifted out first)
-#
-#**************************************
-#ScoPCMFmtParams = {0,0,3,0,0}
-
-#######################################################################################
-
#######################################################################################
# Configurations specific to V4L2 based solution
#######################################################################################
@@ -122,14 +34,14 @@ LpmWakePolarity = 1
# enabled or if it is handled in the platform
LpmEnable=true
-#For hammerhead and grouper LPM is through bluesleep
-#LPM for maguro and manta is done by UART driver itself
+# For hammerhead and grouper LPM is through bluesleep
+# LPM for maguro and manta is done by UART driver itself
LpmUseBluesleep=false
-#Set to true if bd address was programmed into firmware using OTP
+# Set to true if bd address was programmed into firmware using OTP
UseControllerBdaddr=false
-#Enable debugging (add values below to enable multiple options)
+# Enable debugging (add values below to enable multiple options)
# enable logging in driver for init/release driver : 1
# enable logging in driver for open : 2
# enable logging in driver for close : 4
@@ -138,7 +50,3 @@ UseControllerBdaddr=false
DBG_BT_DRV = 31
DBG_LDISC_DRV = 31
DBG_FM_DRV = 31
-#***************************************************************************
-
-#######################################################################################
-
diff --git a/bluetooth/vnd_shinano.txt b/bluetooth/vnd_shinano.txt
index 96c571c..c939e37 100644
--- a/bluetooth/vnd_shinano.txt
+++ b/bluetooth/vnd_shinano.txt
@@ -1,8 +1,8 @@
BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0"
-FW_PATCHFILE_LOCATION = "/system/etc/firmware/"
+FW_PATCHFILE_LOCATION = "/vendor/firmware/"
FW_PATCHFILE_NAME = "BCM43xx.hcd"
BT_WAKE_VIA_PROC = TRUE
-BT_WAKE_VIA_PROC_NOTIFY_DEASSERT=TRUE
+BT_WAKE_VIA_PROC_NOTIFY_DEASSERT = TRUE
PROC_BTWRITE_TIMER_TIMEOUT_MS = 0
FW_PATCH_SETTLEMENT_DELAY_MS = 100
UART_TARGET_BAUD_RATE = 3000000