diff options
| author | Mahesh Kumar Sharma <smahesh@codeaurora.org> | 2015-06-26 20:40:45 -0700 |
|---|---|---|
| committer | Chiou-Hao Hsu <chsu@codeaurora.org> | 2015-07-07 18:41:55 -0700 |
| commit | bca65c15ea927182356773a82ebaa4b14f1e9449 (patch) | |
| tree | 6870a405d9be1e44b91128d810e561faed0663c7 | |
| parent | c314f3136eb5c5b8cd6cac5dbb6043e7fdd3ce7e (diff) | |
| download | android_hardware_qcom_bt-bca65c15ea927182356773a82ebaa4b14f1e9449.tar.gz android_hardware_qcom_bt-bca65c15ea927182356773a82ebaa4b14f1e9449.tar.bz2 android_hardware_qcom_bt-bca65c15ea927182356773a82ebaa4b14f1e9449.zip | |
Bluetooth: ANT disabled
Macro to resolve ANT related compilation issues.
Change-Id: Icfb03688308e82bddc86a68f1eed2333b87d88c2
Conflicts:
libbt-vendor/src/bt_vendor_qcom.c
| -rw-r--r-- | libbt-vendor/src/bt_vendor_qcom.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c index 1f69814..5d88442 100644 --- a/libbt-vendor/src/bt_vendor_qcom.c +++ b/libbt-vendor/src/bt_vendor_qcom.c @@ -691,11 +691,14 @@ static int op(bt_vendor_opcode_t opcode, void *param) } break; #ifdef BT_SOC_TYPE_ROME +#ifdef ENABLE_ANT case BT_VND_OP_ANT_USERIAL_OPEN: ALOGI("bt-vendor : BT_VND_OP_ANT_USERIAL_OPEN"); is_ant_req = true; //fall through #endif + +#endif case BT_VND_OP_USERIAL_OPEN: { int (*fd_array)[] = (int (*)[]) param; @@ -868,6 +871,7 @@ static int op(bt_vendor_opcode_t opcode, void *param) } break; #ifdef BT_SOC_TYPE_ROME +#ifdef ENABLE_ANT case BT_VND_OP_ANT_USERIAL_CLOSE: { ALOGI("bt-vendor : BT_VND_OP_ANT_USERIAL_CLOSE"); @@ -880,6 +884,7 @@ static int op(bt_vendor_opcode_t opcode, void *param) } break; #endif +#endif case BT_VND_OP_USERIAL_CLOSE: { ALOGI("bt-vendor : BT_VND_OP_USERIAL_CLOSE btSocType: %d", btSocType); @@ -1037,6 +1042,7 @@ static void ssr_cleanup(void) { if (btSocType == BT_SOC_ROME) { #ifdef BT_SOC_TYPE_ROME +#ifdef ENABLE_ANT //Indicate to filter by sending //special byte trig_ssr = 0xEE; @@ -1045,11 +1051,14 @@ static void ssr_cleanup(void) { /*Close both ANT channel*/ op(BT_VND_OP_ANT_USERIAL_CLOSE, NULL); #endif +#endif /*Close both ANT channel*/ op(BT_VND_OP_USERIAL_CLOSE, NULL); /*CTRL OFF twice to make sure hw * turns off*/ +#ifdef ENABLE_ANT op(BT_VND_OP_POWER_CTRL, &pwr_state); +#endif } else { //pronto case |