Consolidated patchset for

1) Run-time configuration: configure stack and vendor at run-time using bt_stack.conf and bt_vendor.conf in /etc/bluetooth/
2) Build-time configuration: Auto-generate buildcfg.h header file from the target config bdroid_$(TARGET_DEVICE).txt file

Change-Id: Ieebb71081b7de404eab37f9ff4596d3dc94547a7

8 files changed, 236 insertions, 0 deletions

diff --git a/conf/Android.mk b/conf/Android.mk
new file mode 100644
index 0000000..1d613f6
--- /dev/null
+++ b/conf/Android.mk
@@ -0,0 +1,24 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := bt_stack.conf
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+
+
+LOCAL_MODULE_TAGS := eng
+
+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_wingray)
+    include $(LOCAL_PATH)/moto/wingray/Android.mk
+endif
diff --git a/conf/bt_stack.conf b/conf/bt_stack.conf
new file mode 100644
index 0000000..c64e538
--- /dev/null
+++ b/conf/bt_stack.conf
@@ -0,0 +1,26 @@
+# Enable trace level reconfiguration function
+# Must be present before any TRC_ trace level settings
+TraceConf=true
+
+# Trace level configuration
+#   BT_TRACE_LEVEL_NONE    0    ( No trace messages to be generated )
+#   BT_TRACE_LEVEL_ERROR   1    ( Error condition trace messages )
+#   BT_TRACE_LEVEL_WARNING 2    ( Warning condition trace messages )
+#   BT_TRACE_LEVEL_API     3    ( API traces )
+#   BT_TRACE_LEVEL_EVENT   4    ( Debug messages for events )
+#   BT_TRACE_LEVEL_DEBUG   5    ( Full debug messages )
+TRC_BTM=5
+TRC_HCI=5
+TRC_L2CAP=5
+TRC_RFCOMM=5
+TRC_OBEX=5
+TRC_AVCT=5
+TRC_AVDT=5
+TRC_AVRC=5
+TRC_AVDT_SCB=5
+TRC_AVDT_CCB=5
+TRC_A2D=5
+TRC_SDP=5
+TRC_GATT=5
+TRC_SMP=5
+TRC_BTAPP=5
diff --git a/conf/moto/wingray/Android.mk b/conf/moto/wingray/Android.mk
new file mode 100644
index 0000000..974e213
--- /dev/null
+++ b/conf/moto/wingray/Android.mk
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..a7ec8c7
--- /dev/null
+++ b/conf/moto/wingray/bt_vendor.conf
@@ -0,0 +1,48 @@
+# 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 = true
+
+# BtSnoop log output file
+BtSnoopFileName = /data/misc/bluedroid/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
new file mode 100644
index 0000000..974e213
--- /dev/null
+++ b/conf/samsung/crespo/Android.mk
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..5bfc8a5
--- /dev/null
+++ b/conf/samsung/crespo/bt_vendor.conf
@@ -0,0 +1,48 @@
+# 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 = true
+
+# BtSnoop log output file
+BtSnoopFileName = /data/misc/bluedroid/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
new file mode 100644
index 0000000..974e213
--- /dev/null
+++ b/conf/samsung/maguro/Android.mk
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..fe75246
--- /dev/null
+++ b/conf/samsung/maguro/bt_vendor.conf
@@ -0,0 +1,48 @@
+# 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 = true
+
+# BtSnoop log output file
+BtSnoopFileName = /data/misc/bluedroid/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