summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorYK Jeffrey Chao <jechao@broadcom.com>2012-04-23 11:28:18 -0700
committerMatthew Xie <mattx@google.com>2012-07-14 11:19:20 -0700
commit32f0db60f911ed0b7f3bca0210a4568621b99074 (patch)
tree5e41addd71324439e3bbaa2a9fe5978c262311e4 /conf
parenta4b46830e5efa9b753a692b98971d1f5a9975905 (diff)
downloadexternal_bluetooth_bluedroid-32f0db60f911ed0b7f3bca0210a4568621b99074.zip
external_bluetooth_bluedroid-32f0db60f911ed0b7f3bca0210a4568621b99074.tar.gz
external_bluetooth_bluedroid-32f0db60f911ed0b7f3bca0210a4568621b99074.tar.bz2
Split and restructure the original BT vendor lib (I - external/bluetooth/bluedroid).
1. Split the original external/bluetooth/bluedroid/vendor directory to two parts: external/bluetooth/bluedroid/hci and vendor/broadcom/libbt-vendor. Each part produces a .so library (libbt-hci.so and libbt-vendor.so). 2. libbt-hci.so contains: + HCI H4 send & receive functions + Userial read & write functions + LPM common logic operations + btsnoop functions. 3. No build-time (.txt) and run-time (.conf) configuration for libbt-hci.so. 4. libbt-vendor.so contains: + firmware patch download function + SCO configuration + LPM VSC and BT_WAKE control + UART port open + upio control for BT chip power on/off. 5. libbt-vendor.so has build-time and run-time configuration support. Change-Id: I61d55c75c66d25459d80893a5f72bccce2b54770
Diffstat (limited to 'conf')
-rwxr-xr-xconf/Android.mk23
-rw-r--r--conf/bt_stack.conf7
-rw-r--r--conf/moto/wingray/Android.mk14
-rw-r--r--conf/moto/wingray/bt_vendor.conf48
-rw-r--r--conf/samsung/crespo/Android.mk14
-rw-r--r--conf/samsung/crespo/bt_vendor.conf48
-rw-r--r--conf/samsung/crespo4g/Android.mk14
-rw-r--r--conf/samsung/crespo4g/bt_vendor.conf48
-rw-r--r--conf/samsung/maguro/Android.mk14
-rw-r--r--conf/samsung/maguro/bt_vendor.conf48
10 files changed, 13 insertions, 265 deletions
diff --git a/conf/Android.mk b/conf/Android.mk
index 816757f..22d03d7 100755
--- a/conf/Android.mk
+++ b/conf/Android.mk
@@ -4,36 +4,25 @@ include $(CLEAR_VARS)
LOCAL_MODULE := bt_stack.conf
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)
+
include $(CLEAR_VARS)
LOCAL_MODULE := bt_did.conf
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-LOCAL_MODULE_TAGS := eng
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)
+
include $(CLEAR_VARS)
LOCAL_MODULE := auto_pair_devlist.conf
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)
-ifeq ($(TARGET_PRODUCT), full_maguro)
- include $(LOCAL_PATH)/samsung/maguro/Android.mk
-endif
-ifeq ($(TARGET_PRODUCT), full_crespo)
- include $(LOCAL_PATH)/samsung/crespo/Android.mk
-endif
-ifeq ($(TARGET_PRODUCT), full_crespo4g)
- include $(LOCAL_PATH)/samsung/crespo4g/Android.mk
-endif
-ifeq ($(TARGET_PRODUCT), full_wingray)
- include $(LOCAL_PATH)/moto/wingray/Android.mk
-endif
-
diff --git a/conf/bt_stack.conf b/conf/bt_stack.conf
index c64e538..0b16be4 100644
--- a/conf/bt_stack.conf
+++ b/conf/bt_stack.conf
@@ -1,3 +1,10 @@
+# Enable BtSnoop logging function
+# valid value : true, false
+BtSnoopLogOutput=false
+
+# BtSnoop log output file
+BtSnoopFileName=/sdcard/btsnoop_hci.log
+
# Enable trace level reconfiguration function
# Must be present before any TRC_ trace level settings
TraceConf=true
diff --git a/conf/moto/wingray/Android.mk b/conf/moto/wingray/Android.mk
deleted file mode 100644
index 974e213..0000000
--- a/conf/moto/wingray/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := bt_vendor.conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-
-LOCAL_MODULE_TAGS := eng
-
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
diff --git a/conf/moto/wingray/bt_vendor.conf b/conf/moto/wingray/bt_vendor.conf
deleted file mode 100644
index 2d4f0e7..0000000
--- a/conf/moto/wingray/bt_vendor.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# UART device port where Bluetooth controller is attached
-UartPort = /dev/ttyHS2
-
-# Firmware patch file location
-FwPatchFilePath = /etc/firmware/
-
-# Enable/Disable debug mode of libbt-vendor.so library
-# The main key turns on/off debug modes of the whole library
-# valid value : true, false
-EnableDebug = true
-
-# The sub-key to enable/disable BtSnoop logging function
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopLogOutput = false
-
-# BtSnoop log output file
-BtSnoopFileName = /sdcard/btsnoop_hci.log
-
-# The sub-key to enable/disable trace output of main vendor lib module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-VndDebug = true
-
-# The sub-key to enable/disable trace output of hardware.c module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HwDebug = true
-
-# The sub-key to enable/disable trace output of userial module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UserialDebug = false
-
-# The sub-key to enable/disable trace output of Transport (e.g. H4) module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HciDebug = false
-
-# The sub-key to enable/disable trace output of upio module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UpioDebug = false
-
-# The sub-key to enable/disable debugging in BtSnoop module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopDebug = false
diff --git a/conf/samsung/crespo/Android.mk b/conf/samsung/crespo/Android.mk
deleted file mode 100644
index 974e213..0000000
--- a/conf/samsung/crespo/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := bt_vendor.conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-
-LOCAL_MODULE_TAGS := eng
-
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
diff --git a/conf/samsung/crespo/bt_vendor.conf b/conf/samsung/crespo/bt_vendor.conf
deleted file mode 100644
index 0c4910c..0000000
--- a/conf/samsung/crespo/bt_vendor.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# UART device port where Bluetooth controller is attached
-UartPort = /dev/s3c2410_serial0
-
-# Firmware patch file location
-FwPatchFilePath = /vendor/firmware/
-
-# Enable/Disable debug mode of libbt-vendor.so library
-# The main key turns on/off debug modes of the whole library
-# valid value : true, false
-EnableDebug = true
-
-# The sub-key to enable/disable BtSnoop logging function
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopLogOutput = false
-
-# BtSnoop log output file
-BtSnoopFileName = /sdcard/btsnoop_hci.log
-
-# The sub-key to enable/disable trace output of main vendor lib module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-VndDebug = false
-
-# The sub-key to enable/disable trace output of hardware.c module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HwDebug = false
-
-# The sub-key to enable/disable trace output of userial module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UserialDebug = false
-
-# The sub-key to enable/disable trace output of Transport (e.g. H4) module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HciDebug = false
-
-# The sub-key to enable/disable trace output of upio module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UpioDebug = false
-
-# The sub-key to enable/disable debugging in BtSnoop module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopDebug = false
diff --git a/conf/samsung/crespo4g/Android.mk b/conf/samsung/crespo4g/Android.mk
deleted file mode 100644
index 974e213..0000000
--- a/conf/samsung/crespo4g/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := bt_vendor.conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-
-LOCAL_MODULE_TAGS := eng
-
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
diff --git a/conf/samsung/crespo4g/bt_vendor.conf b/conf/samsung/crespo4g/bt_vendor.conf
deleted file mode 100644
index 0c4910c..0000000
--- a/conf/samsung/crespo4g/bt_vendor.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# UART device port where Bluetooth controller is attached
-UartPort = /dev/s3c2410_serial0
-
-# Firmware patch file location
-FwPatchFilePath = /vendor/firmware/
-
-# Enable/Disable debug mode of libbt-vendor.so library
-# The main key turns on/off debug modes of the whole library
-# valid value : true, false
-EnableDebug = true
-
-# The sub-key to enable/disable BtSnoop logging function
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopLogOutput = false
-
-# BtSnoop log output file
-BtSnoopFileName = /sdcard/btsnoop_hci.log
-
-# The sub-key to enable/disable trace output of main vendor lib module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-VndDebug = false
-
-# The sub-key to enable/disable trace output of hardware.c module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HwDebug = false
-
-# The sub-key to enable/disable trace output of userial module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UserialDebug = false
-
-# The sub-key to enable/disable trace output of Transport (e.g. H4) module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HciDebug = false
-
-# The sub-key to enable/disable trace output of upio module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UpioDebug = false
-
-# The sub-key to enable/disable debugging in BtSnoop module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopDebug = false
diff --git a/conf/samsung/maguro/Android.mk b/conf/samsung/maguro/Android.mk
deleted file mode 100644
index 974e213..0000000
--- a/conf/samsung/maguro/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := bt_vendor.conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-
-LOCAL_MODULE_TAGS := eng
-
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
diff --git a/conf/samsung/maguro/bt_vendor.conf b/conf/samsung/maguro/bt_vendor.conf
deleted file mode 100644
index b20482a..0000000
--- a/conf/samsung/maguro/bt_vendor.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# UART device port where Bluetooth controller is attached
-UartPort = /dev/ttyO1
-
-# Firmware patch file location
-FwPatchFilePath = /vendor/firmware/
-
-# Enable/Disable debug mode of libbt-vendor.so library
-# The main key turns on/off debug modes of the whole library
-# valid value : true, false
-EnableDebug = true
-
-# The sub-key to enable/disable BtSnoop logging function
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopLogOutput = false
-
-# BtSnoop log output file
-BtSnoopFileName = /sdcard/btsnoop_hci.log
-
-# The sub-key to enable/disable trace output of main vendor lib module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-VndDebug = false
-
-# The sub-key to enable/disable trace output of hardware.c module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HwDebug = false
-
-# The sub-key to enable/disable trace output of userial module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UserialDebug = false
-
-# The sub-key to enable/disable trace output of Transport (e.g. H4) module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-HciDebug = false
-
-# The sub-key to enable/disable trace output of upio module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-UpioDebug = false
-
-# The sub-key to enable/disable debugging in BtSnoop module
-# The key is masked off if EnableDebug is false
-# valid value : true, false
-BtSnoopDebug = false