diff options
| author | Konsta <konsta09@gmail.com> | 2015-10-20 17:55:00 +0300 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-01-02 14:39:45 +0100 |
| commit | 09a9d74b0f911cddff8256add40b3b4c35f14e63 (patch) | |
| tree | bacf74beda4cc05ecf6e54b0c15089faea23cc6e | |
| parent | 4c872ab131c2d700760b03cf993406470b8f1600 (diff) | |
| download | android_hardware_qcom_fm-09a9d74b0f911cddff8256add40b3b4c35f14e63.tar.gz android_hardware_qcom_fm-09a9d74b0f911cddff8256add40b3b4c35f14e63.tar.bz2 android_hardware_qcom_fm-09a9d74b0f911cddff8256add40b3b4c35f14e63.zip | |
jni: fix calibration data path for legacy fm_qsoc_patches
* Set 'TARGET_FM_LEGACY_PATCHLOADER := true' to enable.
Change-Id: Ibfa83ba549b36ad5f93bacf310459bdb0ce33987
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/FmConst.h | 4 | ||||
| -rw-r--r-- | libfm_jni/Android.mk | 4 | ||||
| -rw-r--r-- | libfm_jni/FM_Const.h | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index e7c8340..bb26bfc 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -24,5 +24,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_MODULE := libqcomfm_jni LOCAL_MODULE_TAGS := optional +ifeq ($(TARGET_FM_LEGACY_PATCHLOADER),true) + LOCAL_CFLAGS += -DFM_LEGACY_PATCHLOADER +endif + include $(BUILD_SHARED_LIBRARY) endif # is-vendor-board-platform diff --git a/jni/FmConst.h b/jni/FmConst.h index 26eb616..14884fc 100644 --- a/jni/FmConst.h +++ b/jni/FmConst.h @@ -44,7 +44,11 @@ const UINT CAL_DATA_SIZE = 23; #define STD_BUF_SIZE 256 const char *const FM_PERFORMANCE_PARAMS = "/etc/fm/fm_srch_af_th.conf"; +#ifdef FM_LEGACY_PATCHLOADER +const char *const CALIB_DATA_NAME = "/data/app/Riva_fm_cal"; +#else const char *const CALIB_DATA_NAME = "/data/misc/fm/Riva_fm_cal"; +#endif #define V4L2_CTRL_CLASS_USER 0x00980000 #define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) diff --git a/libfm_jni/Android.mk b/libfm_jni/Android.mk index f62e3f1..8016c73 100644 --- a/libfm_jni/Android.mk +++ b/libfm_jni/Android.mk @@ -23,6 +23,10 @@ LOCAL_SHARED_LIBRARIES := \ #LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include #LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +ifeq ($(TARGET_FM_LEGACY_PATCHLOADER),true) + LOCAL_CFLAGS += -DFM_LEGACY_PATCHLOADER +endif + LOCAL_MODULE := libfmjni #include $(BUILD_SHARED_LIBRARY) diff --git a/libfm_jni/FM_Const.h b/libfm_jni/FM_Const.h index b0cc684..2f850d2 100644 --- a/libfm_jni/FM_Const.h +++ b/libfm_jni/FM_Const.h @@ -121,7 +121,11 @@ const char *const FM_INIT_PROP = "hw.fm.init"; const char *const SCRIPT_START_PROP = "ctl.start"; const char *const FM_SOC_DL_SCRIPT = "fm_dl"; const char *const SCRIPT_STOP_PROP = "ctl.stOP"; +#ifdef FM_LEGACY_PATCHLOADER +const char *const CALIB_DATA_NAME = "/data/app/Riva_fm_cal"; +#else const char *const CALIB_DATA_NAME = "/data/misc/fm/Riva_fm_cal"; +#endif const char *const SOC_PATCH_DL_SCRPT = "fm_dl"; const char *const FM_DEVICE_PATH = "/dev/radio0"; const char *const FM_PERFORMANCE_PARAMS = "/etc/fm/fm_srch_af_th.conf"; |