From 5883f2fb3fff54e3d308e64108b634eb85e43c62 Mon Sep 17 00:00:00 2001 From: Andre Eisenbach Date: Thu, 5 Apr 2012 09:46:34 -0700 Subject: Added crespo4g configuration files Change-Id: Ieb8df86f8a284f7a65eb3057d96003e72c32fb84 --- conf/Android.mk | 3 + conf/samsung/crespo4g/Android.mk | 14 +++ conf/samsung/crespo4g/bt_vendor.conf | 48 ++++++++ include/bdroid_crespo4g.txt | 198 ++++++++++++++++++++++++++++++ main/Android.mk | 6 +- vendor/libvendor/include/vnd_buildcfg.h | 14 +++ vendor/libvendor/include/vnd_crespo4g.txt | 11 ++ 7 files changed, 293 insertions(+), 1 deletion(-) create mode 100644 conf/samsung/crespo4g/Android.mk create mode 100644 conf/samsung/crespo4g/bt_vendor.conf create mode 100644 include/bdroid_crespo4g.txt create mode 100644 vendor/libvendor/include/vnd_buildcfg.h create mode 100644 vendor/libvendor/include/vnd_crespo4g.txt diff --git a/conf/Android.mk b/conf/Android.mk index 1d613f6..c590724 100644 --- a/conf/Android.mk +++ b/conf/Android.mk @@ -19,6 +19,9 @@ 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/samsung/crespo4g/Android.mk b/conf/samsung/crespo4g/Android.mk new file mode 100644 index 0000000..974e213 --- /dev/null +++ b/conf/samsung/crespo4g/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/crespo4g/bt_vendor.conf b/conf/samsung/crespo4g/bt_vendor.conf new file mode 100644 index 0000000..5bfc8a5 --- /dev/null +++ b/conf/samsung/crespo4g/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/include/bdroid_crespo4g.txt b/include/bdroid_crespo4g.txt new file mode 100644 index 0000000..65532a5 --- /dev/null +++ b/include/bdroid_crespo4g.txt @@ -0,0 +1,198 @@ +AVCT_INCLUDED = TRUE +AVRC_INCLUDED = TRUE +AVRC_METADATA_INCLUDED = FALSE +AVRC_ADV_CTRL_INCLUDED = FALSE +AVDT_INCLUDED = TRUE +UNV_INCLUDED = FALSE +A2D_INCLUDED = TRUE +A2D_SBC_INCLUDED = TRUE +A2D_M12_INCLUDED = FALSE +A2D_M24_INCLUDED = FALSE +VDP_INCLUDED = FALSE +VDP_H263_INCLUDED = FALSE +VDP_MPEG_INCLUDED = FALSE +VDP_VEND_INCLUDED = FALSE +BIP_INCLUDED = FALSE +BIP_INITR_INCLUDED = FALSE +BIP_RSPDR_INCLUDED = FALSE +BIP_PUSH_INCLUDED = FALSE +BIP_PULL_INCLUDED = FALSE +BIP_PRINTING_INCLUDED = FALSE +BIP_ARCHIVE_INCLUDED = FALSE +BIP_CAMERA_INCLUDED = FALSE +BIP_DISPLAY_INCLUDED = FALSE +BPP_INCLUDED = FALSE +BPP_SND_INCLUDED = FALSE +DUN_INCLUDED = FALSE +GAP_INCLUDED = FALSE +GOEP_INCLUDED = FALSE +GOEP_FS_INCLUDED = FALSE +GATT_PTS = FALSE +BTM_SEC_MAX_SERVICE_RECORDS = 32 +L2CAP_INCLUDED = TRUE +L2CAP_LINK_INACTIVITY_TOUT = 4 +L2CAP_FCR_INCLUDED = TRUE +L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS) +OBX_INCLUDED = TRUE +OBX_SERVER_INCLUDED = TRUE +OBX_CLIENT_INCLUDED = TRUE +OBX_MD5_INCLUDED = FALSE +OBX_MD5_TEST_INCLUDED = FALSE +OBX_14_INCLUDED = FALSE +BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) +BTA_OPC_SENDING_ABORT = TRUE +RFCOMM_INCLUDED = TRUE +MAX_RFC_PORTS = 30 +MAX_BD_CONNECTIONS = 7 +BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD) +PORT_TX_BUF_HIGH_WM = 10 +PORT_RX_BUF_HIGH_WM = 10 +PORT_RX_BUF_LOW_WM = 4 +PORT_RX_BUF_CRITICAL_WM = 15 +PORT_TX_BUF_CRITICAL_WM = 15 +PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM) +PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM) +PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM) +PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM) +PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM) +BTA_DUN_MTU = BTA_RFC_MTU_SIZE +BTA_SPP_MTU = BTA_RFC_MTU_SIZE +BTA_FAX_MTU = BTA_RFC_MTU_SIZE +SDP_DI_INCLUDED = TRUE +SDP_RAW_DATA_INCLUDED = TRUE +SDP_RAW_PDU_INCLUDED = TRUE +SDP_POOL_ID = 3 +SDP_MAX_REC_ATTR = 25 +SDP_MAX_ATTR_LEN = 400 +SDP_MAX_PAD_LEN = 600 +BNEP_INCLUDED = FALSE +PAN_INCLUDED = FALSE +SAP_SERVER_INCLUDED = FALSE +HID_DEV_INCLUDED = FALSE +HID_HOST_INCLUDED = TRUE +BLE_INCLUDED = FALSE +BTM_BLE_CONFORMANCE_TESTING = FALSE +ATT_INCLUDED = FALSE +ATT_DEBUG = FALSE +GATTS_APPU_USE_GATT_TRACE = FALSE +GATT_CLIENT_ENABLED = FALSE +GATT_SERVER_ENABLED = FALSE +SMP_INCLUDED = FALSE +SMP_HOST_ENCRYPT_INCLUDED = FALSE +SER_INCLUDED = FALSE +RPC_INCLUDED = FALSE +MMI_INCLUDED = FALSE +SAP_INCLUDED = FALSE +SBC_NO_PCM_CPY_OPTION = FALSE +SBC_IPAQ_OPT = FALSE +SBC_IS_64_MULT_IN_QUANTIZER = FALSE +BTE_HCIUTILS_HOOK_INCLUDED = FALSE +BTA_INCLUDED = TRUE +BTA_AG_INCLUDED = TRUE +BTA_CT_INCLUDED = FALSE +BTA_CG_INCLUDED = FALSE +BTA_DG_INCLUDED = FALSE +BTA_FT_INCLUDED = FALSE +BTA_OP_INCLUDED = FALSE +BTA_PR_INCLUDED = FALSE +BTA_SS_INCLUDED = FALSE +BTA_DM_INCLUDED = TRUE +BTA_DI_INCLUDED = FALSE +BTA_BI_INCLUDED = FALSE +BTA_SC_INCLUDED = FALSE +BTA_PAN_INCLUDED = FALSE +BTA_FS_INCLUDED = TRUE +BTA_AC_INCLUDED = FALSE +BTA_HD_INCLUDED = FALSE +BTA_HH_INCLUDED = TRUE +BTA_AR_INCLUDED = TRUE +BTA_AV_INCLUDED = TRUE +BTA_AV_VDP_INCLUDED = FALSE +BTA_AVK_INCLUDED = FALSE +BTA_PBS_INCLUDED = FALSE +BTA_PBC_INCLUDED = FALSE +BTA_FM_INCLUDED = FALSE +BTA_FM_DEBUG = FALSE +BTA_FMTX_INCLUDED = FALSE +BTA_FMTX_DEBUG = FALSE +BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE +BTA_FMTX_US_FCC_RULES = FALSE +BTA_HS_INCLUDED = FALSE +BTA_MSE_INCLUDED = FALSE +BTA_MCE_INCLUDED = FALSE +BTA_PLAYBACK_INCLUDED = FALSE +BTA_SSR_INCLUDED = FALSE +BTA_JV_INCLUDED = FALSE +BTA_EIR_CANNED_UUID_LIST = FALSE +BTA_GATT_INCLUDED = FALSE +RSI_INCLUDED = TRUE +RPC_TRACE_ONLY = FALSE +ANDROID_APP_INCLUDED = TRUE +ANDROID_USE_LOGCAT = TRUE +LINUX_GKI_INCLUDED = TRUE +TICKS_PER_SEC = 100 +QUICK_TIMER_TICKS_PER_SEC = 10 +BTA_SYS_TIMER_PERIOD = 100 +GKI_BUF1_SIZE = 288 +GKI_BUF3_MAX = 200 +GKI_BUF3_SIZE = (4096+16) +GKI_BUF4_SIZE = (8080+26) +GKI_SHUTDOWN_EVT = APPL_EVT_7 +GKI_PTHREAD_JOINABLE = TRUE +LINUX_DRV_INCLUDED = TRUE +LINUX_OS = TRUE +BTU_TASK = 0 +BTIF_TASK = 1 +A2DP_MEDIA_TASK = 2 +GKI_MAX_TASKS = 3 +BTM_APP_DEV_INIT = bte_main_post_reset_init +BTE_IDLE_TASK_INCLUDED = FALSE +APPL_INCLUDED = TRUE +BTU_BTA_INCLUDED = TRUE +SBC_FOR_EMBEDDED_LINUX = TRUE +BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248 +BTM_MAX_REM_BD_NAME_LEN = 248 +BTM_MAX_LOC_BD_NAME_LEN = 248 +BTM_USE_DEF_LOCAL_NAME = TRUE +BTM_DEF_LOCAL_NAME = "Nexus S 2" +BTM_INQ_DB_SIZE = 40 +BTM_SEC_MAX_DEVICE_RECORDS = 100 +BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE +BTM_AUTOMATIC_HCI_RESET = FALSE +AVDT_VERSION = 0x0102 +BTA_AG_AT_MAX_LEN = 512 +BTA_AVRCP_FF_RW_SUPPORT = TRUE +BTM_MAX_SCO_LINKS = 2 +BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5) +BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE) +BTA_AV_MAX_A2DP_MTU = 668 +BTA_AV_RET_TOUT = 15 +PORCHE_PAIRING_CONFLICT = TRUE +BTA_AV_CO_CP_SCMS_T = FALSE +AVDT_CONNECT_CP_ONLY = FALSE +BTL_CFG_USE_CONF_FILE = FALSE +BTAPP_AHF_API_SUPPORT = TRUE +HCILP_INCLUDED = TRUE +HCISU_H4_INCLUDED = TRUE +BT_TRACE_PROTOCOL = TRUE +BT_USE_TRACES = TRUE +BT_TRACE_BTIF = TRUE +BTTRC_INCLUDED = FALSE +BT_TRACE_VERBOSE = FALSE +BTTRC_PARSER_INCLUDED = FALSE +MAX_TRACE_RAM_SIZE = 10000 +OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR +BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE +BTAPP_FM_USE_HW_POKE_VOLUME = FALSE +BTAPP_FM_AUDIO_PATH = BTA_FM_AUDIO_DAC +BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK | BTA_NAP_SERVICE_MASK | BTA_PANU_SERVICE_MASK | BTA_HL_SERVICE_MASK) +PBAP_ZERO_VCARD_IN_DB = FALSE +BTA_DM_SDP_DB_SIZE = 4096 +MAX_L2CAP_CLIENTS = 15 +FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE +HID_HOST_MAX_CONN_RETRY = (3) +BTM_DISC_DURING_RS = TRUE +BTM_WBS_INCLUDED = FALSE +HL_INCLUDED = TRUE +NO_GKI_RUN_RETURN = TRUE +AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS diff --git a/main/Android.mk b/main/Android.mk index 0de4afc..cc19aa8 100755 --- a/main/Android.mk +++ b/main/Android.mk @@ -94,7 +94,11 @@ LOCAL_CFLAGS += -DBUILDCFG -Werror ifeq ($(TARGET_PRODUCT), full_crespo) LOCAL_CFLAGS += -DTARGET_CRESPO -else +endif +ifeq ($(TARGET_PRODUCT), full_crespo4g) + LOCAL_CFLAGS += -DTARGET_CRESPO +endif +ifeq ($(TARGET_PRODUCT), full_maguro) LOCAL_CFLAGS += -DTARGET_MAGURO endif diff --git a/vendor/libvendor/include/vnd_buildcfg.h b/vendor/libvendor/include/vnd_buildcfg.h new file mode 100644 index 0000000..4842872 --- /dev/null +++ b/vendor/libvendor/include/vnd_buildcfg.h @@ -0,0 +1,14 @@ +#ifndef VND_BUILDCFG_H +#define VND_BUILDCFG_H +#define BLUETOOTH_UART_DEVICE_PORT "/dev/s3c2410_serial0" +#define BT_WAKE_VIA_USERIAL_IOCTL TRUE +#define LPM_IDLE_TIMEOUT_MULTIPLE 5 +#define BTSNOOPDISP_INCLUDED TRUE +#define BTSNOOP_FILENAME "/data/misc/bluedroid/btsnoop_hci.log" +#define BTVND_DBG TRUE +#define BTHW_DBG TRUE +#define USERIAL_DBG TRUE +#define HCIH4_DBG TRUE +#define UPIO_DBG TRUE +#define BTSNOOP_DBG FALSE +#endif diff --git a/vendor/libvendor/include/vnd_crespo4g.txt b/vendor/libvendor/include/vnd_crespo4g.txt new file mode 100644 index 0000000..9296738 --- /dev/null +++ b/vendor/libvendor/include/vnd_crespo4g.txt @@ -0,0 +1,11 @@ +BLUETOOTH_UART_DEVICE_PORT = "/dev/s3c2410_serial0" +BT_WAKE_VIA_USERIAL_IOCTL = TRUE +LPM_IDLE_TIMEOUT_MULTIPLE = 5 +BTSNOOPDISP_INCLUDED = TRUE +BTSNOOP_FILENAME = "/data/misc/bluedroid/btsnoop_hci.log" +BTVND_DBG = TRUE +BTHW_DBG = TRUE +USERIAL_DBG = TRUE +HCIH4_DBG = TRUE +UPIO_DBG = TRUE +BTSNOOP_DBG = FALSE -- cgit v1.1