summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRockchip2015-03-04 09:27:14 +0800
committerRockchip2015-03-04 09:27:14 +0800
commit519ecb3384d025aec3ecdb6d9842942b0ed5d702 (patch)
treee792d31db9580d4c42a6458227e64a7d7d92bab6
parent467bd42a8b62e4283f74dafb3b6e9efcf094e910 (diff)
libbt_rtk8723bs, libbt_rtk_usb: direct use vnd_buildcfg.h, not us tools generate from vnd_generic.txt
-rwxr-xr-xbluetooth/libbt_rtk8723bs/Android.mk2
-rw-r--r--bluetooth/libbt_rtk8723bs/include/vnd_buildcfg.h12
-rwxr-xr-xbluetooth/libbt_rtk8723bs/include/vnd_cardhu.txt9
-rwxr-xr-xbluetooth/libbt_rtk8723bs/include/vnd_generic.txt8
-rwxr-xr-xbluetooth/libbt_rtk_usb/Android.mk2
-rw-r--r--bluetooth/libbt_rtk_usb/include/vnd_buildcfg.h12
-rwxr-xr-xbluetooth/libbt_rtk_usb/include/vnd_dalmore.txt3
-rwxr-xr-xbluetooth/libbt_rtk_usb/include/vnd_generic.txt8
-rwxr-xr-xbluetooth/libbt_rtk_usb/include/vnd_generic_x86.txt8
9 files changed, 26 insertions, 38 deletions
diff --git a/bluetooth/libbt_rtk8723bs/Android.mk b/bluetooth/libbt_rtk8723bs/Android.mk
index 881dea1..e48b16d 100755
--- a/bluetooth/libbt_rtk8723bs/Android.mk
+++ b/bluetooth/libbt_rtk8723bs/Android.mk
@@ -34,7 +34,7 @@ endif
LOCAL_MODULE_RELATIVE_PATH :=
endif
-include $(LOCAL_PATH)/vnd_buildcfg.mk
+#include $(LOCAL_PATH)/vnd_buildcfg.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/bluetooth/libbt_rtk8723bs/include/vnd_buildcfg.h b/bluetooth/libbt_rtk8723bs/include/vnd_buildcfg.h
new file mode 100644
index 0000000..f43a128
--- /dev/null
+++ b/bluetooth/libbt_rtk8723bs/include/vnd_buildcfg.h
@@ -0,0 +1,12 @@
+/* Auto-generated from device/common/bluetooth/libbt_rtk8723bs/include/vnd_generic.txt on Wed Mar 4 09:06:21 CST 2015 */
+#ifndef _VND_BUILDCFG_H
+#define _VND_BUILDCFG_H
+#define BLUETOOTH_UART_DEVICE_PORT "/dev/ttyS0"
+#define FW_PATCHFILE_LOCATION "/system/etc/firmware/rtlbt/"
+#define LPM_IDLE_TIMEOUT_MULTIPLE 5
+#define SCO_USE_I2S_INTERFACE TRUE
+#define BTVND_DBG TRUE
+#define BTHW_DBG TRUE
+#define VNDUSERIAL_DBG TRUE
+#define UPIO_DBG TRUE
+#endif
diff --git a/bluetooth/libbt_rtk8723bs/include/vnd_cardhu.txt b/bluetooth/libbt_rtk8723bs/include/vnd_cardhu.txt
deleted file mode 100755
index 4d4261c..0000000
--- a/bluetooth/libbt_rtk8723bs/include/vnd_cardhu.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS2"
-FW_PATCHFILE_LOCATION = "/etc/firmware/"
-BT_WAKE_VIA_PROC = TRUE
-LPM_IDLE_TIMEOUT_MULTIPLE = 5
-BTVND_DBG = TRUE
-BTHW_DBG = TRUE
-VNDUSERIAL_DBG = TRUE
-UPIO_DBG = TRUE
-SCO_PCM_IF_CLOCK_RATE = 2
diff --git a/bluetooth/libbt_rtk8723bs/include/vnd_generic.txt b/bluetooth/libbt_rtk8723bs/include/vnd_generic.txt
deleted file mode 100755
index ebc2807..0000000
--- a/bluetooth/libbt_rtk8723bs/include/vnd_generic.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyS0"
-FW_PATCHFILE_LOCATION = "/system/etc/firmware/rtlbt/"
-LPM_IDLE_TIMEOUT_MULTIPLE = 5
-SCO_USE_I2S_INTERFACE = TRUE
-BTVND_DBG = TRUE
-BTHW_DBG = TRUE
-VNDUSERIAL_DBG = TRUE
-UPIO_DBG = TRUE
diff --git a/bluetooth/libbt_rtk_usb/Android.mk b/bluetooth/libbt_rtk_usb/Android.mk
index 47a6dd3..4165194 100755
--- a/bluetooth/libbt_rtk_usb/Android.mk
+++ b/bluetooth/libbt_rtk_usb/Android.mk
@@ -31,7 +31,7 @@ endif
LOCAL_MODULE_RELATIVE_PATH :=
endif
-include $(LOCAL_PATH)/vnd_buildcfg.mk
+#include $(LOCAL_PATH)/vnd_buildcfg.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/bluetooth/libbt_rtk_usb/include/vnd_buildcfg.h b/bluetooth/libbt_rtk_usb/include/vnd_buildcfg.h
new file mode 100644
index 0000000..ee6c9bf
--- /dev/null
+++ b/bluetooth/libbt_rtk_usb/include/vnd_buildcfg.h
@@ -0,0 +1,12 @@
+/* Auto-generated from device/common/bluetooth/libbt_rtk_usb/include/vnd_generic.txt on Tue Mar 3 11:42:41 CST 2015 */
+#ifndef _VND_BUILDCFG_H
+#define _VND_BUILDCFG_H
+#define BLUETOOTH_UART_DEVICE_PORT "/dev/rtk_btusb"
+#define FW_PATCHFILE_LOCATION "/etc/firmware/"
+#define LPM_IDLE_TIMEOUT_MULTIPLE 5
+#define SCO_USE_I2S_INTERFACE TRUE
+#define BTVND_DBG FALSE
+#define BTHW_DBG TRUE
+#define VNDUSERIAL_DBG FALSE
+#define UPIO_DBG FALSE
+#endif
diff --git a/bluetooth/libbt_rtk_usb/include/vnd_dalmore.txt b/bluetooth/libbt_rtk_usb/include/vnd_dalmore.txt
deleted file mode 100755
index 5ed16e9..0000000
--- a/bluetooth/libbt_rtk_usb/include/vnd_dalmore.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/rtk_btusb"
-BTVND_DBG = TRUE
-LPM_SLEEP_MODE = FALSE
diff --git a/bluetooth/libbt_rtk_usb/include/vnd_generic.txt b/bluetooth/libbt_rtk_usb/include/vnd_generic.txt
deleted file mode 100755
index 771f607..0000000
--- a/bluetooth/libbt_rtk_usb/include/vnd_generic.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/rtk_btusb"
-FW_PATCHFILE_LOCATION = "/etc/firmware/"
-LPM_IDLE_TIMEOUT_MULTIPLE = 5
-SCO_USE_I2S_INTERFACE = TRUE
-BTVND_DBG = FALSE
-BTHW_DBG = TRUE
-VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE
diff --git a/bluetooth/libbt_rtk_usb/include/vnd_generic_x86.txt b/bluetooth/libbt_rtk_usb/include/vnd_generic_x86.txt
deleted file mode 100755
index 18964f2..0000000
--- a/bluetooth/libbt_rtk_usb/include/vnd_generic_x86.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyO1"
-FW_PATCHFILE_LOCATION = "/vendor/firmware/"
-LPM_IDLE_TIMEOUT_MULTIPLE = 5
-SCO_USE_I2S_INTERFACE = TRUE
-BTVND_DBG = FALSE
-BTHW_DBG = TRUE
-VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE