summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2012-12-10 20:17:14 +0100
committercodeworkx <codeworkx@cyanogenmod.org>2012-12-10 20:25:41 +0100
commit8b539062b9a9765c266e63766b1075170765474f (patch)
treedcac4b79fc7417ce4707f017e5666438d4ecef77
parented2a09860f19fb74b9ae96c59a42aa003341d303 (diff)
downloaddevice_samsung_smdk4412-common-8b539062b9a9765c266e63766b1075170765474f.zip
device_samsung_smdk4412-common-8b539062b9a9765c266e63766b1075170765474f.tar.gz
device_samsung_smdk4412-common-8b539062b9a9765c266e63766b1075170765474f.tar.bz2
smdk4412: remove bt init, add bt vendor conf, enable bt-pan interface
Change-Id: Ifc6e0f776be4dddf32a7c5fe2f8e22ed9dfe6fae
-rw-r--r--BoardCommonConfig.mk1
-rw-r--r--bluetooth/vnd_smdk4x12.txt12
-rw-r--r--common.mk1
-rwxr-xr-xinit.bt.rc155
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml2
5 files changed, 14 insertions, 157 deletions
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 7ab7f18..703be77 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -123,6 +123,7 @@ BOARD_HAVE_SAMSUNG_WIFI := true
BOARD_HAVE_BLUETOOTH := true
BOARD_HAVE_BLUETOOTH_BCM := true
BOARD_HAVE_SAMSUNG_BLUETOOTH := true
+BOARD_BLUEDROID_VENDOR_CONF := device/samsung/smdk4412-common/bluetooth/vnd_smdk4x12.txt
# Vold
TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/s3c-usbgadget/gadget/lun%d/file"
diff --git a/bluetooth/vnd_smdk4x12.txt b/bluetooth/vnd_smdk4x12.txt
new file mode 100644
index 0000000..4b18989
--- /dev/null
+++ b/bluetooth/vnd_smdk4x12.txt
@@ -0,0 +1,12 @@
+BLUETOOTH_UART_DEVICE_PORT = "/dev/ttySAC0"
+FW_PATCHFILE_LOCATION = "/system/bin/"
+BT_WAKE_VIA_PROC = TRUE
+LPM_IDLE_TIMEOUT_MULTIPLE = 5
+BTVND_DBG = FALSE
+BTHW_DBG = TRUE
+VNDUSERIAL_DBG = FALSE
+UPIO_DBG = FALSE
+UART_TARGET_BAUD_RATE = 4000000
+FW_PATCH_SETTLEMENT_DELAY_MS = 50
+PCM_DATA_FMT_FILL_METHOD = 3
+PCM_DATA_FMT_FILL_NUM = 3
diff --git a/common.mk b/common.mk
index 84215a2..d85f121 100644
--- a/common.mk
+++ b/common.mk
@@ -27,7 +27,6 @@ $(call inherit-product, device/common/gps/gps_us_supl.mk)
# Init files
PRODUCT_COPY_FILES := \
- $(COMMON_PATH)/init.bt.rc:root/init.bt.rc \
$(COMMON_PATH)/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
$(COMMON_PATH)/lpm.rc:root/lpm.rc \
$(COMMON_PATH)/init.trace.rc:root/init.trace.rc
diff --git a/init.bt.rc b/init.bt.rc
deleted file mode 100755
index 719864d..0000000
--- a/init.bt.rc
+++ /dev/null
@@ -1,155 +0,0 @@
-on boot
-
-# for bluetooth
- insmod /lib/modules/btlock.ko
- chmod 664 /dev/btlock
- chown bluetooth system /dev/btlock
-
-service poke_helper /system/bin/brcm_poke_helper /dev/ttySAC0
- class main
- group bluetooth net_bt_admin
-
-service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm --no2bytes --tosleep 50000 \
- --baudrate 4000000 --use_baudrate_for_download --patchram /system/bin/bcm4334.hcd \
- --i2s=1,0,0,0 /dev/ttySAC0
- class main
- user bluetooth
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service hciattach_le /system/bin/brcm_patchram_plus --enable_hci --no2bytes --tosleep 50000 \
- --baudrate 115200 --use_baudrate_for_download --patchram /system/bin/bcm4334.hcd \
- --i2s=1,0,0,0 /dev/ttySAC0
- class main
- user bluetooth
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_dut_cmd /system/bin/LE_dut
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-## LE Tx Ouput Power
-service LE_tx_low /system/bin/LE_dut --tx_low
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_mid /system/bin/LE_dut --tx_mid
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_max /system/bin/LE_dut --tx_max
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-## LE Tx Modulation Characteristics
-# Payload 0x0F
-service LE_tx_M_low /system/bin/LE_dut --tx_m_low
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_M_mid /system/bin/LE_dut --tx_m_mid
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_M_max /system/bin/LE_dut --tx_m_max
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-# Payload 0xAA
-service LE_tx_M_1_low /system/bin/LE_dut --tx_m_1_low
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_M_1_mid /system/bin/LE_dut --tx_m_1_mid
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_M_1_max /system/bin/LE_dut --tx_m_1_max
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-## Carrier Frequency
-service LE_tx_C_low /system/bin/LE_dut --tx_c_low
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_C_mid /system/bin/LE_dut --tx_c_mid
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_C_max /system/bin/LE_dut --tx_c_max
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-## In-band Emissions
-service LE_tx_I_low /system/bin/LE_dut --tx_i_low
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_tx_I_max /system/bin/LE_dut --tx_i_max
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-## Rx Test
-service LE_rx_ready_low /system/bin/LE_dut --rx_low
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_rx_ready_mid /system/bin/LE_dut --rx_mid
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_rx_ready_max /system/bin/LE_dut --rx_max
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service LE_test_end /system/bin/LE_dut --test_end
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-# for bluetooth rf test.
-service bt_dut_cmd /system/bin/bcm_dut
- class main
- group bluetooth net_bt_admin
- disabled
- oneshot
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 049462c..2c4d40f 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -167,7 +167,7 @@
bluetooth interfaces. If the device doesn't want to support tethering over bluetooth this
should be empty. -->
<string-array translatable="false" name="config_tether_bluetooth_regexs">
- <item>"bnep\\d"</item>
+ <item>"bt-pan"</item>
</string-array>
<!-- Boolean indicating whether the wifi chipset has dual frequency band support -->