LineageOS/android_vendor_qcom_opensource_libfmjni
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FM: Fix the issue with patchdownloader

Browse Source 
- Avoid patchdownloader for Silabs based targets.
- Make changes to treat only negative return values as errors.
- Change the calibration data path.

Change-Id: I611d5f6d64734e2a3a41456bb18b1e612862e0ed
This commit is contained in:
Venkateshwarlu Domakonda
2015-07-24 12:58:48 +05:30
parent 6ff7436b7e
commit f8378e9a0e
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FM_Const.h
View File

@@ -121,7 +121,7 @@ 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";
const char *const CALIB_DATA_NAME = "/data/app/Riva_fm_cal";
const char *const CALIB_DATA_NAME = "/data/misc/fm/Riva_fm_cal";
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";

28
FmIoctlsInterface.cpp
View File

@@ -119,7 +119,7 @@ int FmIoctlsInterface :: get_cur_freq
channel.type = V4L2_TUNER_RADIO;
ret = ioctl(fd, VIDIOC_G_FREQUENCY, &channel);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
freq = (channel.frequency / TUNE_MULT);
@@ -139,7 +139,7 @@ int FmIoctlsInterface :: set_freq
channel.frequency = (freq * TUNE_MULT);
ret = ioctl(fd, VIDIOC_S_FREQUENCY, &channel);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
return FM_SUCCESS;
@@ -158,7 +158,7 @@ int FmIoctlsInterface :: set_control
control.id = id;
ret = ioctl(fd, VIDIOC_S_CTRL, &control);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
return FM_SUCCESS;
@@ -190,7 +190,7 @@ int FmIoctlsInterface :: set_calibration
v4l2_ctls.count = 1;
v4l2_ctls.controls = &ext_ctl;
ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, &v4l2_ctls);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
return FM_SUCCESS;
@@ -210,7 +210,7 @@ int FmIoctlsInterface :: get_control
control.id = id;
ret = ioctl(fd, VIDIOC_G_CTRL, &control);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
val = control.value;
@@ -230,7 +230,7 @@ int FmIoctlsInterface :: start_search
hw_seek.type = V4L2_TUNER_RADIO;
ret = ioctl(fd, VIDIOC_S_HW_FREQ_SEEK, &hw_seek);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
return FM_SUCCESS;
@@ -252,7 +252,7 @@ int FmIoctlsInterface :: set_band
ret = ioctl(fd, VIDIOC_S_TUNER, &tuner);
ret = set_control(fd, V4L2_CID_PRV_REGION, 0);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
return FM_SUCCESS;
@@ -270,8 +270,8 @@ int FmIoctlsInterface :: get_rmssi
tuner.index = 0;
tuner.signal = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) {
ret = FM_SUCCESS;
if(ret < IOCTL_SUCC) {
ret = FM_FAILURE;
}else {
rmssi = tuner.signal;
ret = FM_SUCCESS;
@@ -289,7 +289,7 @@ int FmIoctlsInterface :: get_upperband_limit
tuner.index = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
freq = (tuner.rangehigh / TUNE_MULT);
@@ -308,7 +308,7 @@ int FmIoctlsInterface :: get_lowerband_limit
tuner.index = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
freq = (tuner.rangelow / TUNE_MULT);
@@ -327,7 +327,7 @@ int FmIoctlsInterface :: set_audio_mode
tuner.index = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
tuner.audmode = mode;
@@ -357,7 +357,7 @@ int FmIoctlsInterface :: get_buffer
v4l2_buf.length = STD_BUF_SIZE;
v4l2_buf.m.userptr = (ULINT)buff;
ret = ioctl(fd, VIDIOC_DQBUF, &v4l2_buf);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
return v4l2_buf.bytesused;
@@ -375,7 +375,7 @@ int FmIoctlsInterface :: set_ext_control
ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, v4l2_ctls);
if(ret != IOCTL_SUCC) {
if(ret < IOCTL_SUCC) {
return FM_FAILURE;
}else {
return FM_SUCCESS;

10
FmRadioController.cpp
View File

@@ -159,8 +159,11 @@ int FmRadioController ::Pwr_Up(int freq)
int ret = FM_SUCCESS;
struct timespec ts;
ConfigFmThs thsObj;
char value[PROPERTY_VALUE_MAX] = {'\0'};
ALOGI("%s,[freq=%d]\n", __func__, freq);
property_get("qcom.bluetooth.soc", value, NULL);
ALOGD("BT soc is %s\n", value);
if (fd_driver < 0) {
ret = open_dev();
if (ret != FM_SUCCESS) {
@@ -171,6 +174,7 @@ int FmRadioController ::Pwr_Up(int freq)
if (cur_fm_state == FM_OFF) {
ALOGE("cur_fm_state = %d\n",cur_fm_state);
if (strcmp(value, "rome") != 0) {
ret = FmIoctlsInterface::start_fm_patch_dl(fd_driver);
if (ret != FM_SUCCESS) {
ALOGE("FM patch downloader failed: %d\n", ret);
@@ -178,6 +182,7 @@ int FmRadioController ::Pwr_Up(int freq)
set_fm_state(FM_OFF);
return FM_FAILURE;
}
}
if (event_listener_thread == 0) {
ret = pthread_create(&event_listener_thread, NULL,
handle_events, this);
@@ -1095,10 +1100,15 @@ void FmRadioController :: handle_enabled_event
void
)
{
char value[PROPERTY_VALUE_MAX] = {'\0'};
ALOGI("FM handle ready Event\n");
FmIoctlsInterface::set_control(fd_driver,
V4L2_CID_PRV_AUDIO_PATH, AUDIO_DIGITAL_PATH);
property_get("qcom.bluetooth.soc", value, NULL);
if (strcmp(value, "rome") != 0) {
FmIoctlsInterface::set_calibration(fd_driver);
}
pthread_mutex_lock(&mutex_turn_on_cond);
set_fm_state(FM_ON);
pthread_cond_broadcast(&turn_on_cond);