diff options
Diffstat (limited to 'drivers/staging/ti-st/fmdrv_rx.c')
-rw-r--r-- | drivers/staging/ti-st/fmdrv_rx.c | 634 |
1 files changed, 338 insertions, 296 deletions
diff --git a/drivers/staging/ti-st/fmdrv_rx.c b/drivers/staging/ti-st/fmdrv_rx.c index 5fb182f06a35..536f1c8120c5 100644 --- a/drivers/staging/ti-st/fmdrv_rx.c +++ b/drivers/staging/ti-st/fmdrv_rx.c @@ -3,6 +3,7 @@ * This sub-module of FM driver implements FM RX functionality. * * Copyright (C) 2010 Texas Instruments + * Author: Raja Mani <raja_mani@ti.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -23,13 +24,6 @@ #include "fmdrv_common.h" #include "fmdrv_rx.h" -#ifndef DEBUG -#ifdef pr_info -#undef pr_info -#define pr_info(fmt, arg...) -#endif -#endif - void fm_rx_reset_rds_cache(struct fmdrv_ops *fmdev) { fmdev->rx.rds.flag = FM_RDS_DISABLE; @@ -39,7 +33,6 @@ void fm_rx_reset_rds_cache(struct fmdrv_ops *fmdev) if (fmdev->rx.af_mode == FM_RX_RDS_AF_SWITCH_MODE_ON) fmdev->irq_info.mask |= FM_LEV_EVENT; - } void fm_rx_reset_curr_station_info(struct fmdrv_ops *fmdev) @@ -56,90 +49,93 @@ int fm_rx_set_frequency(struct fmdrv_ops *fmdev, unsigned int freq_to_set) unsigned int curr_frq_in_khz; int ret, resp_len; - if (fmdev->curr_fmmode != FM_MODE_RX) { - ret = -EPERM; - goto exit; - } + if (fmdev->curr_fmmode != FM_MODE_RX) + return -EPERM; if (freq_to_set < fmdev->rx.region.bottom_frequency || freq_to_set > fmdev->rx.region.top_frequency) { - pr_err("(fmdrv): Invalid frequency %d", freq_to_set); - ret = -EINVAL; - goto exit; + pr_err("(fmdrv): Invalid frequency %d\n", freq_to_set); + return -EINVAL; } + /* Set audio enable */ - FM_STORE_LE16_TO_BE16(payload, FM_RX_FM_AUDIO_ENABLE_I2S_AND_ANALOG); - ret = fmc_send_cmd(fmdev, AUDIO_ENABLE_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = FM_RX_FM_AUDIO_ENABLE_I2S_AND_ANALOG; + + ret = fmc_send_cmd(fmdev, AUDIO_ENABLE_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Set hilo to automatic selection */ - FM_STORE_LE16_TO_BE16(payload, FM_RX_IFFREQ_HILO_AUTOMATIC); - ret = fmc_send_cmd(fmdev, HILO_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = FM_RX_IFFREQ_HILO_AUTOMATIC; + ret = fmc_send_cmd(fmdev, HILO_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Calculate frequency index to write */ frq_index = (freq_to_set - fmdev->rx.region.bottom_frequency) / FM_FREQ_MUL; /* Set frequency index */ - FM_STORE_LE16_TO_BE16(payload, frq_index); - ret = fmc_send_cmd(fmdev, FREQ_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = frq_index; + ret = fmc_send_cmd(fmdev, FREQ_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Read flags - just to clear any pending interrupts if we had */ - ret = fmc_send_cmd(fmdev, FLAG_GET, NULL, 2, - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + ret = fmc_send_cmd(fmdev, FLAG_GET, REG_RD, NULL, 2, + NULL, NULL); + if (ret < 0) + return ret; /* Enable FR, BL interrupts */ fmdev->irq_info.mask |= (FM_FR_EVENT | FM_BL_EVENT); - FM_STORE_LE16_TO_BE16(payload, fmdev->irq_info.mask); - ret = fmc_send_cmd(fmdev, INT_MASK_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = fmdev->irq_info.mask; + ret = fmc_send_cmd(fmdev, INT_MASK_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Start tune */ - FM_STORE_LE16_TO_BE16(payload, FM_TUNER_PRESET_MODE); - ret = fmc_send_cmd(fmdev, TUNER_MODE_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = FM_TUNER_PRESET_MODE; + ret = fmc_send_cmd(fmdev, TUNER_MODE_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Wait for tune ended interrupt */ init_completion(&fmdev->maintask_completion); timeleft = wait_for_completion_timeout(&fmdev->maintask_completion, FM_DRV_TX_TIMEOUT); if (!timeleft) { - pr_err("(fmdrv): Timeout(%d sec),didn't get tune ended int", + pr_err("(fmdrv): Timeout(%d sec),didn't get tune ended int\n", jiffies_to_msecs(FM_DRV_TX_TIMEOUT) / 1000); - ret = -ETIMEDOUT; - goto exit; + return -ETIMEDOUT; } /* Read freq back to confirm */ - ret = fmc_send_cmd(fmdev, FREQ_GET, NULL, 2, - &fmdev->maintask_completion, &curr_frq, &resp_len); - FM_CHECK_SEND_CMD_STATUS(ret); + ret = fmc_send_cmd(fmdev, FREQ_SET, REG_RD, NULL, 2, + &curr_frq, &resp_len); + if (ret < 0) + return ret; - curr_frq = FM_BE16_TO_LE16(curr_frq); + curr_frq = be16_to_cpu(curr_frq); curr_frq_in_khz = (fmdev->rx.region.bottom_frequency + ((unsigned int)curr_frq * FM_FREQ_MUL)); /* Re-enable default FM interrupts */ fmdev->irq_info.mask &= ~(FM_FR_EVENT | FM_BL_EVENT); - FM_STORE_LE16_TO_BE16(payload, fmdev->irq_info.mask); - ret = fmc_send_cmd(fmdev, INT_MASK_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); - - /* Gap BTW two consecutive frequency must be 50KHz, if the requested - * frequency is odd value then driver will tune to the next higher freq. - */ + payload = fmdev->irq_info.mask; + ret = fmc_send_cmd(fmdev, INT_MASK_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; + if (curr_frq_in_khz != freq_to_set) { - pr_err("(fmdrv): Current chip frequency(%d) is not matching" - " with requested frequency(%d)", curr_frq_in_khz, + pr_info("(fmdrv): Frequency is set to (%d) but" + " requested frequency is (%d)\n", curr_frq_in_khz, freq_to_set); } @@ -151,129 +147,175 @@ int fm_rx_set_frequency(struct fmdrv_ops *fmdev, unsigned int freq_to_set) fm_rx_reset_curr_station_info(fmdev); /* Do we need to reset anything else? */ -exit: + return ret; } +/* TODO: Enable this once the kernel moves to 2.6.36 or above*/ +#if 0 +static int fm_rx_set_channel_spacing(struct fmdrv_ops *fmdev, + unsigned int spacing) +{ + unsigned short payload; + int ret; + + if (spacing == 0) + spacing = FM_CHANNEL_SPACING_50KHZ; + else if (spacing > 0 && spacing <= 50000) + spacing = FM_CHANNEL_SPACING_50KHZ; + else if (spacing > 50000 && spacing <= 100000) + spacing = FM_CHANNEL_SPACING_100KHZ; + else + spacing = FM_CHANNEL_SPACING_200KHZ; + + /* set channel spacing */ + payload = spacing; + ret = fmc_send_cmd(fmdev, CHANL_BW_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; + + fmdev->rx.region.channel_spacing = spacing * FM_FREQ_MUL; + + return ret; +} +#endif int fm_rx_seek(struct fmdrv_ops *fmdev, unsigned int seek_upward, - unsigned int wrap_around) + unsigned int wrap_around) { int resp_len; unsigned short curr_frq, next_frq, last_frq; unsigned short payload, int_reason; - char offset, spacing; + char offset, spacing_index; unsigned long timeleft; - int ret, band_lmt_reach = 0; + int ret; - if (fmdev->curr_fmmode != FM_MODE_RX) { - ret = -EPERM; - goto exit; - } + if (fmdev->curr_fmmode != FM_MODE_RX) + return -EPERM; + /* TODO: Enable this once the kernel moves to 2.6.36 or above*/ +#if 0 + /* Set channel spacing */ + ret = fm_rx_set_channel_spacing(fmdev, spacing); + if (ret < 0) { + pr_err("(fmdrv): Failed to set channel spacing\n"); + return ret; + } +#endif /* Read the current frequency from chip */ - ret = fmc_send_cmd(fmdev, FREQ_GET, NULL, sizeof(curr_frq), - &fmdev->maintask_completion, &curr_frq, &resp_len); - FM_CHECK_SEND_CMD_STATUS(ret); - - curr_frq = FM_BE16_TO_LE16(curr_frq); + ret = fmc_send_cmd(fmdev, FREQ_SET, REG_RD, NULL, + sizeof(curr_frq), &curr_frq, &resp_len); + if (ret < 0) + return ret; + curr_frq = be16_to_cpu(curr_frq); last_frq = (fmdev->rx.region.top_frequency - - fmdev->rx.region.bottom_frequency) / FM_FREQ_MUL; + fmdev->rx.region.bottom_frequency) / FM_FREQ_MUL; /* Check the offset in order to be aligned to the channel spacing*/ - spacing = fmdev->rx.region.channel_spacing / FM_FREQ_MUL; - offset = curr_frq % spacing; - - next_frq = seek_upward ? curr_frq + spacing /* Seek Up */ : - curr_frq - spacing /* Seek Down */ ; + spacing_index = fmdev->rx.region.channel_spacing / FM_FREQ_MUL; + offset = curr_frq % spacing_index; - /* Add or subtract offset in order to stay aligned to the channel - * spacing. - */ + next_frq = seek_upward ? curr_frq + spacing_index /* Seek Up */ : + curr_frq - spacing_index /* Seek Down */ ; + /* + * Add or subtract offset in order to stay aligned to the channel + * spacing. + */ if ((short)next_frq < 0) next_frq = last_frq - offset; else if (next_frq > last_frq) next_frq = 0 + offset; +again: /* Set calculated next frequency to perform seek */ - FM_STORE_LE16_TO_BE16(payload, next_frq); - ret = fmc_send_cmd(fmdev, FREQ_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = next_frq; + ret = fmc_send_cmd(fmdev, FREQ_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Set search direction (0:Seek Down, 1:Seek Up) */ - FM_STORE_LE16_TO_BE16(payload, (seek_upward ? FM_SEARCH_DIRECTION_UP : - FM_SEARCH_DIRECTION_DOWN)); - ret = fmc_send_cmd(fmdev, SEARCH_DIR_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = (seek_upward ? FM_SEARCH_DIRECTION_UP : + FM_SEARCH_DIRECTION_DOWN); + ret = fmc_send_cmd(fmdev, SEARCH_DIR_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Read flags - just to clear any pending interrupts if we had */ - ret = fmc_send_cmd(fmdev, FLAG_GET, NULL, 2, - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + ret = fmc_send_cmd(fmdev, FLAG_GET, REG_RD, NULL, 2, + NULL, NULL); + if (ret < 0) + return ret; /* Enable FR, BL interrupts */ fmdev->irq_info.mask |= (FM_FR_EVENT | FM_BL_EVENT); - FM_STORE_LE16_TO_BE16(payload, fmdev->irq_info.mask); - ret = fmc_send_cmd(fmdev, INT_MASK_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = fmdev->irq_info.mask; + ret = fmc_send_cmd(fmdev, INT_MASK_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Start seek */ - FM_STORE_LE16_TO_BE16(payload, FM_TUNER_AUTONOMOUS_SEARCH_MODE); - ret = fmc_send_cmd(fmdev, TUNER_MODE_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = FM_TUNER_AUTONOMOUS_SEARCH_MODE; + ret = fmc_send_cmd(fmdev, TUNER_MODE_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Wait for tune ended/band limit reached interrupt */ init_completion(&fmdev->maintask_completion); timeleft = wait_for_completion_timeout(&fmdev->maintask_completion, FM_DRV_RX_SEEK_TIMEOUT); if (!timeleft) { - pr_err("(fmdrv): Timeout(%d sec),didn't get tune ended int", + pr_err("(fmdrv): Timeout(%d sec),didn't get tune ended int\n", jiffies_to_msecs(FM_DRV_RX_SEEK_TIMEOUT) / 1000); - ret = -ETIMEDOUT; - goto exit; + return -ETIMEDOUT; } - int_reason = fmdev->irq_info.flag & 0x3; - if (fmdev->irq_info.flag & FM_BL_EVENT) - band_lmt_reach = 1; + int_reason = fmdev->irq_info.flag & (FM_TUNE_COMPLETE | FM_BAND_LIMIT); /* Re-enable default FM interrupts */ fmdev->irq_info.mask &= ~(FM_FR_EVENT | FM_BL_EVENT); - FM_STORE_LE16_TO_BE16(payload, fmdev->irq_info.mask); - ret = fmc_send_cmd(fmdev, INT_MASK_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); - - if (band_lmt_reach == 1) - fmdev->rx.curr_freq = seek_upward ? - fmdev->rx.region.top_frequency : - fmdev->rx.region.bottom_frequency; - else { - /* Read freq to know where operation tune operation stopped */ - ret = fmc_send_cmd(fmdev, FREQ_GET, NULL, 2, - &fmdev->maintask_completion, &curr_frq, &resp_len); - FM_CHECK_SEND_CMD_STATUS(ret); - - curr_frq = FM_BE16_TO_LE16(curr_frq); - fmdev->rx.curr_freq = (fmdev->rx.region.bottom_frequency + - ((unsigned int)curr_frq * FM_FREQ_MUL)); + payload = fmdev->irq_info.mask; + ret = fmc_send_cmd(fmdev, INT_MASK_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; + + if (int_reason & FM_BL_EVENT) { + if (wrap_around == 0) { + fmdev->rx.curr_freq = seek_upward ? + fmdev->rx.region.top_frequency : + fmdev->rx.region.bottom_frequency; + } else { + fmdev->rx.curr_freq = seek_upward ? + fmdev->rx.region.bottom_frequency : + fmdev->rx.region.top_frequency; + /* Calculate frequency index to write */ + next_frq = (fmdev->rx.curr_freq - + fmdev->rx.region.bottom_frequency) / + FM_FREQ_MUL; + goto again; + } + } else { + /* Read freq to know where operation tune operation stopped */ + ret = fmc_send_cmd(fmdev, FREQ_SET, REG_RD, NULL, 2, + &curr_frq, &resp_len); + if (ret < 0) + return ret; + + curr_frq = be16_to_cpu(curr_frq); + fmdev->rx.curr_freq = (fmdev->rx.region.bottom_frequency + + ((unsigned int)curr_frq * FM_FREQ_MUL)); } /* Reset RDS cache and current station pointers */ fm_rx_reset_rds_cache(fmdev); fm_rx_reset_curr_station_info(fmdev); - /* Return error if band limit is reached */ - if (int_reason & FM_BL_EVENT) { - pr_info("(fmdrv): band limit reached\n"); - ret = -EAGAIN; - } -exit: return ret; } @@ -285,17 +327,18 @@ int fm_rx_set_volume(struct fmdrv_ops *fmdev, unsigned short vol_to_set) if (fmdev->curr_fmmode != FM_MODE_RX) return -EPERM; - if (vol_to_set > FM_RX_VOLUME_MAX) { - pr_err("(fmdrv): Volume is not within(%d-%d) range", + if (vol_to_set < FM_RX_VOLUME_MIN || vol_to_set > FM_RX_VOLUME_MAX) { + pr_err("(fmdrv): Volume is not within(%d-%d) range\n", FM_RX_VOLUME_MIN, FM_RX_VOLUME_MAX); return -EINVAL; } vol_to_set *= FM_RX_VOLUME_GAIN_STEP; - FM_STORE_LE16_TO_BE16(payload, vol_to_set); - ret = fmc_send_cmd(fmdev, VOLUME_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = vol_to_set; + ret = fmc_send_cmd(fmdev, VOLUME_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; fmdev->rx.curr_volume = vol_to_set; return ret; @@ -308,15 +351,17 @@ int fm_rx_get_volume(struct fmdrv_ops *fmdev, unsigned short *curr_vol) return -EPERM; if (curr_vol == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } + *curr_vol = fmdev->rx.curr_volume / FM_RX_VOLUME_GAIN_STEP; + return 0; } /* To get current band's bottom and top frequency */ -int fm_rx_get_currband_lowhigh_freq(struct fmdrv_ops *fmdev, +int fm_rx_get_currband_freq_range(struct fmdrv_ops *fmdev, unsigned int *bottom_frequency, unsigned int *top_frequency) { @@ -329,54 +374,60 @@ int fm_rx_get_currband_lowhigh_freq(struct fmdrv_ops *fmdev, return 0; } +/* Returns current band index (0-Europe/US; 1-Japan) */ +void fm_rx_get_region(struct fmdrv_ops *fmdev, unsigned char *region) +{ + *region = fmdev->rx.region.region_index; +} + /* Sets band (0-Europe/US; 1-Japan) */ int fm_rx_set_region(struct fmdrv_ops *fmdev, unsigned char region_to_set) { unsigned short payload; - unsigned int new_frq; + unsigned int new_frq = 0; int ret = -EPERM; if (fmdev->curr_fmmode != FM_MODE_RX) - goto exit; + return ret; if (region_to_set != FM_BAND_EUROPE_US && region_to_set != FM_BAND_JAPAN) { pr_err("(fmdrv): Invalid band\n"); - ret = -EINVAL; - goto exit; + return -EINVAL; } + if (fmdev->rx.region.region_index == region_to_set) { pr_err("(fmdrv): Requested band is already configured\n"); - goto exit; + return ret; } + /* Send cmd to set the band */ - FM_STORE_LE16_TO_BE16(payload, (unsigned short)region_to_set); - ret = fmc_send_cmd(fmdev, RX_BAND_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = (unsigned short)region_to_set; + ret = fmc_send_cmd(fmdev, BAND_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; fmc_update_region_info(fmdev, region_to_set); /* Check whether current RX frequency is within band boundary */ - if (fmdev->curr_fmmode == FM_MODE_RX) { - new_frq = 0; - if (fmdev->rx.curr_freq < fmdev->rx.region.bottom_frequency) - new_frq = fmdev->rx.region.bottom_frequency; - else if (fmdev->rx.curr_freq > fmdev->rx.region.top_frequency) - new_frq = fmdev->rx.region.top_frequency; - - if (new_frq) { - pr_info("(fmdrv): " - "Current freq is not within band limit boundary," - "switching to %d KHz", new_frq); - /* Current RX frequency is not - * within boundary. So, update it - */ - ret = fm_rx_set_frequency(fmdev, new_frq); - } + if (fmdev->rx.curr_freq < fmdev->rx.region.bottom_frequency) + new_frq = fmdev->rx.region.bottom_frequency; + else if (fmdev->rx.curr_freq > fmdev->rx.region.top_frequency) + new_frq = fmdev->rx.region.top_frequency; + + if (new_frq) { + pr_debug("(fmdrv): " + "Current freq is not within band limit boundary," + "switching to %d KHz\n", new_frq); + /* + * Current RX frequency is not within boundary. So, + * update it. + */ + ret = fm_rx_set_frequency(fmdev, new_frq); } -exit: + return ret; } @@ -388,10 +439,12 @@ int fm_rx_get_mute_mode(struct fmdrv_ops *fmdev, return -EPERM; if (curr_mute_mode == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } + *curr_mute_mode = fmdev->rx.curr_mute_mode; + return 0; } @@ -405,9 +458,11 @@ static int __fm_config_rx_mute_reg(struct fmdrv_ops *fmdev) case FM_MUTE_ON: muteval = FM_RX_MUTE_AC_MUTE_MODE; break; + case FM_MUTE_OFF: muteval = FM_RX_MUTE_UNMUTE_MODE; break; + case FM_MUTE_ATTENUATE: muteval = FM_RX_MUTE_SOFT_MUTE_FORCE_MODE; break; @@ -417,10 +472,12 @@ static int __fm_config_rx_mute_reg(struct fmdrv_ops *fmdev) else muteval &= ~FM_RX_MUTE_RF_DEP_MODE; - FM_STORE_LE16_TO_BE16(payload, muteval); - ret = fmc_send_cmd(fmdev, MUTE_STATUS_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = muteval; + ret = fmc_send_cmd(fmdev, MUTE_STATUS_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; + return 0; } @@ -445,6 +502,7 @@ int fm_rx_set_mute_mode(struct fmdrv_ops *fmdev, fmdev->rx.curr_mute_mode = org_state; return ret; } + return 0; } @@ -455,12 +513,13 @@ int fm_rx_get_rfdepend_softmute(struct fmdrv_ops *fmdev, if (fmdev->curr_fmmode != FM_MODE_RX) return -EPERM; - if (curr_mute_mode == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } + *curr_mute_mode = fmdev->rx.curr_rf_depend_mute; + return 0; } @@ -474,10 +533,9 @@ int fm_rx_set_rfdepend_softmute(struct fmdrv_ops *fmdev, if (fmdev->curr_fmmode != FM_MODE_RX) return -EPERM; - if (rfdepend_mute != FM_RX_RF_DEPENDENT_MUTE_ON && rfdepend_mute != FM_RX_RF_DEPENDENT_MUTE_OFF) { - pr_err("(fmdrv): Invalid RF dependent soft mute"); + pr_err("(fmdrv): Invalid RF dependent soft mute\n"); return -EINVAL; } if (fmdev->rx.curr_rf_depend_mute == rfdepend_mute) @@ -491,6 +549,7 @@ int fm_rx_set_rfdepend_softmute(struct fmdrv_ops *fmdev, fmdev->rx.curr_rf_depend_mute = org_state; return ret; } + return 0; } @@ -506,20 +565,22 @@ int fm_rx_get_rssi_level(struct fmdrv_ops *fmdev, return -EPERM; if (rssilvl == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } /* Read current RSSI level */ - ret = fmc_send_cmd(fmdev, RSSI_LVL_GET, NULL, 2, - &fmdev->maintask_completion, &curr_rssi_lel, &resp_len); - FM_CHECK_SEND_CMD_STATUS(ret); + ret = fmc_send_cmd(fmdev, RSSI_LVL_GET, REG_RD, NULL, 2, + &curr_rssi_lel, &resp_len); + if (ret < 0) + return ret; - *rssilvl = FM_BE16_TO_LE16(curr_rssi_lel); + *rssilvl = be16_to_cpu(curr_rssi_lel); return 0; } -/* Sets the signal strength level that once reached +/* + * Sets the signal strength level that once reached * will stop the auto search process */ int fm_rx_set_rssi_threshold(struct fmdrv_ops *fmdev, @@ -533,13 +594,14 @@ int fm_rx_set_rssi_threshold(struct fmdrv_ops *fmdev, if (rssi_lvl_toset < FM_RX_RSSI_THRESHOLD_MIN || rssi_lvl_toset > FM_RX_RSSI_THRESHOLD_MAX) { - pr_err("(fmdrv): Invalid RSSI threshold level"); + pr_err("(fmdrv): Invalid RSSI threshold level\n"); return -EINVAL; } - FM_STORE_LE16_TO_BE16(payload, (unsigned short)rssi_lvl_toset); - ret = fmc_send_cmd(fmdev, SEARCH_LVL_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = (unsigned short)rssi_lvl_toset; + ret = fmc_send_cmd(fmdev, SEARCH_LVL_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; fmdev->rx.curr_rssi_threshold = rssi_lvl_toset; return 0; @@ -552,10 +614,12 @@ int fm_rx_get_rssi_threshold(struct fmdrv_ops *fmdev, short *curr_rssi_lvl) return -EPERM; if (curr_rssi_lvl == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } + *curr_rssi_lvl = fmdev->rx.curr_rssi_threshold; + return 0; } @@ -569,20 +633,23 @@ int fm_rx_set_stereo_mono(struct fmdrv_ops *fmdev, unsigned short mode) return -EPERM; if (mode != FM_STEREO_MODE && mode != FM_MONO_MODE) { - pr_err("(fmdrv): Invalid mode"); + pr_err("(fmdrv): Invalid mode\n"); return -EINVAL; } + /* Set stereo/mono mode */ - FM_STORE_LE16_TO_BE16(payload, (unsigned short)mode); - ret = fmc_send_cmd(fmdev, MOST_MODE_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = (unsigned short)mode; + ret = fmc_send_cmd(fmdev, MOST_MODE_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Set stereo blending mode */ - FM_STORE_LE16_TO_BE16(payload, FM_STEREO_SOFT_BLEND); - ret = fmc_send_cmd(fmdev, MOST_BLEND_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = FM_STEREO_SOFT_BLEND; + ret = fmc_send_cmd(fmdev, MOST_BLEND_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; return 0; } @@ -597,14 +664,17 @@ int fm_rx_get_stereo_mono(struct fmdrv_ops *fmdev, unsigned short *mode) return -EPERM; if (mode == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } - ret = fmc_send_cmd(fmdev, MOST_MODE_GET, NULL, 2, - &fmdev->maintask_completion, &curr_mode, &resp_len); - FM_CHECK_SEND_CMD_STATUS(ret); - *mode = FM_BE16_TO_LE16(curr_mode); + ret = fmc_send_cmd(fmdev, MOST_MODE_SET, REG_RD, NULL, 2, + &curr_mode, &resp_len); + if (ret < 0) + return ret; + + *mode = be16_to_cpu(curr_mode); + return 0; } @@ -619,14 +689,17 @@ int fm_rx_set_deemphasis_mode(struct fmdrv_ops *fmdev, unsigned short mode) if (mode != FM_RX_EMPHASIS_FILTER_50_USEC && mode != FM_RX_EMPHASIS_FILTER_75_USEC) { - pr_err("(fmdrv): Invalid rx de-emphasis mode"); + pr_err("(fmdrv): Invalid rx de-emphasis mode (%d)\n", mode); return -EINVAL; } - FM_STORE_LE16_TO_BE16(payload, mode); - ret = fmc_send_cmd(fmdev, DEMPH_MODE_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = mode; + ret = fmc_send_cmd(fmdev, DEMPH_MODE_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; + + fmdev->rx.curr_deemphasis_mode = mode; return 0; } @@ -634,21 +707,16 @@ int fm_rx_set_deemphasis_mode(struct fmdrv_ops *fmdev, unsigned short mode) int fm_rx_get_deemphasis_mode(struct fmdrv_ops *fmdev, unsigned short *curr_deemphasis_mode) { - unsigned short curr_mode; - int ret, resp_len; - if (fmdev->curr_fmmode != FM_MODE_RX) return -EPERM; if (curr_deemphasis_mode == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } - ret = fmc_send_cmd(fmdev, DEMPH_MODE_GET, NULL, 2, - &fmdev->maintask_completion, &curr_mode, &resp_len); - FM_CHECK_SEND_CMD_STATUS(ret); - *curr_deemphasis_mode = FM_BE16_TO_LE16(curr_mode); + *curr_deemphasis_mode = fmdev->rx.curr_deemphasis_mode; + return 0; } @@ -662,44 +730,48 @@ int fm_rx_set_rds_mode(struct fmdrv_ops *fmdev, unsigned char rds_en_dis) return -EPERM; if (rds_en_dis != FM_RDS_ENABLE && rds_en_dis != FM_RDS_DISABLE) { - pr_err("(fmdrv): Invalid rds option"); + pr_err("(fmdrv): Invalid rds option\n"); return -EINVAL; } + if (rds_en_dis == FM_RDS_ENABLE && fmdev->rx.rds.flag == FM_RDS_DISABLE) { - /* Turn on RX RDS */ - /* Turn on RDS circuit */ - FM_STORE_LE16_TO_BE16(payload, - FM_RX_POWET_SET_FM_AND_RDS_BLK_ON); - ret = fmc_send_cmd(fmdev, POWER_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); - - /* Clear and rest RDS FIFO */ - FM_STORE_LE16_TO_BE16(payload, FM_RX_RDS_FLUSH_FIFO); - ret = fmc_send_cmd(fmdev, RDS_CNTRL_SET, &payload, - sizeof(payload), &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); - - /* Read flags - just to clear any - * pending interrupts if we had - */ - ret = fmc_send_cmd(fmdev, FLAG_GET, NULL, 2, - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + /* Turn on RX RDS and RDS circuit */ + payload = FM_RX_POWET_SET_FM_AND_RDS_BLK_ON; + ret = fmc_send_cmd(fmdev, POWER_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; + + /* Clear and reset RDS FIFO */ + payload = FM_RX_RDS_FLUSH_FIFO; + ret = fmc_send_cmd(fmdev, RDS_CNTRL_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; + + /* Read flags - just to clear any pending interrupts. */ + ret = fmc_send_cmd(fmdev, FLAG_GET, REG_RD, NULL, 2, + NULL, NULL); + if (ret < 0) + return ret; /* Set RDS FIFO threshold value */ - FM_STORE_LE16_TO_BE16(payload, FM_RX_RDS_FIFO_THRESHOLD); - ret = fmc_send_cmd(fmdev, RDS_MEM_SET, &payload, - sizeof(payload), &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = FM_RX_RDS_FIFO_THRESHOLD; + ret = fmc_send_cmd(fmdev, RDS_MEM_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Enable RDS interrupt */ fmdev->irq_info.mask |= FM_RDS_EVENT; - FM_STORE_LE16_TO_BE16(payload, fmdev->irq_info.mask); - ret = fmc_send_cmd(fmdev, INT_MASK_SET, &payload, - sizeof(payload), &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = fmdev->irq_info.mask; + ret = fmc_send_cmd(fmdev, INT_MASK_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) { + fmdev->irq_info.mask &= ~FM_RDS_EVENT; + return ret; + } /* Update our local flag */ fmdev->rx.rds.flag = FM_RDS_ENABLE; @@ -707,10 +779,11 @@ int fm_rx_set_rds_mode(struct fmdrv_ops *fmdev, unsigned char rds_en_dis) && fmdev->rx.rds.flag == FM_RDS_ENABLE) { /* Turn off RX RDS */ /* Turn off RDS circuit */ - FM_STORE_LE16_TO_BE16(payload, FM_RX_POWER_SET_FM_ON_RDS_OFF); - ret = fmc_send_cmd(fmdev, POWER_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = FM_RX_POWER_SET_FM_ON_RDS_OFF; + ret = fmc_send_cmd(fmdev, POWER_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; /* Reset RDS pointers */ fmdev->rx.rds.last_block_index = 0; @@ -722,6 +795,7 @@ int fm_rx_set_rds_mode(struct fmdrv_ops *fmdev, unsigned char rds_en_dis) fmdev->irq_info.mask &= ~(FM_RDS_EVENT); fmdev->rx.rds.flag = FM_RDS_DISABLE; } + return 0; } @@ -733,10 +807,12 @@ int fm_rx_get_rds_mode(struct fmdrv_ops *fmdev, return -EPERM; if (curr_rds_en_dis == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } + *curr_rds_en_dis = fmdev->rx.rds.flag; + return 0; } @@ -750,16 +826,18 @@ int fm_rx_set_rds_system(struct fmdrv_ops *fmdev, unsigned char rds_mode) return -EPERM; if (rds_mode != FM_RDS_SYSTEM_RDS && rds_mode != FM_RDS_SYSTEM_RBDS) { - pr_err("(fmdrv): Invalid rds mode"); + pr_err("(fmdrv): Invalid rds mode\n"); return -EINVAL; } /* Set RDS operation mode */ - FM_STORE_LE16_TO_BE16(payload, (unsigned short)rds_mode); - ret = fmc_send_cmd(fmdev, RDS_SYSTEM_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = (unsigned short)rds_mode; + ret = fmc_send_cmd(fmdev, RDS_SYSTEM_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; fmdev->rx.rds_mode = rds_mode; + return 0; } @@ -771,10 +849,12 @@ int fm_rx_get_rds_system(struct fmdrv_ops *fmdev, return -EPERM; if (rds_mode == NULL) { - pr_err("(fmdrv): Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } + *rds_mode = fmdev->rx.rds_mode; + return 0; } @@ -789,7 +869,7 @@ int fm_rx_set_af_switch(struct fmdrv_ops *fmdev, unsigned char af_mode) if (af_mode != FM_RX_RDS_AF_SWITCH_MODE_ON && af_mode != FM_RX_RDS_AF_SWITCH_MODE_OFF) { - pr_err("(fmdrv): Invalid af mode"); + pr_err("(fmdrv): Invalid af mode\n"); return -EINVAL; } /* Enable/disable low RSSI interrupt based on af_mode */ @@ -798,12 +878,14 @@ int fm_rx_set_af_switch(struct fmdrv_ops *fmdev, unsigned char af_mode) else fmdev->irq_info.mask &= ~FM_LEV_EVENT; - FM_STORE_LE16_TO_BE16(payload, fmdev->irq_info.mask); - ret = fmc_send_cmd(fmdev, INT_MASK_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - FM_CHECK_SEND_CMD_STATUS(ret); + payload = fmdev->irq_info.mask; + ret = fmc_send_cmd(fmdev, INT_MASK_SET, REG_WR, &payload, + sizeof(payload), NULL, NULL); + if (ret < 0) + return ret; fmdev->rx.af_mode = af_mode; + return 0; } @@ -814,51 +896,11 @@ int fm_rx_get_af_switch(struct fmdrv_ops *fmdev, unsigned char *af_mode) return -EPERM; if (af_mode == NULL) { - pr_err("(fmdrv): Invalid memory"); - return -ENOMEM; - } - *af_mode = fmdev->rx.af_mode; - return 0; -} - -/* Set desired channel spacing */ -int fm_rx_set_chanl_spacing(struct fmdrv_ops *fmdev, unsigned char spacing) -{ - unsigned short payload; - int ret; - - if (spacing != FM_CHANNEL_SPACING_50KHZ && - spacing != FM_CHANNEL_SPACING_100KHZ && - spacing != FM_CHANNEL_SPACING_200KHZ) { - pr_err("Invalid channel spacing"); - return -EINVAL; - } - - /* set channel spacing */ - FM_STORE_LE16_TO_BE16(payload, spacing); - - ret = fmc_send_cmd(fmdev, CHANL_BW_SET, &payload, sizeof(payload), - &fmdev->maintask_completion, NULL, NULL); - if (ret < 0) - return ret; - - fmdev->rx.region.channel_spacing = spacing * FM_FREQ_MUL; - - return 0; -} - -/* Get channel spacing */ -int fm_rx_get_chanl_spacing(struct fmdrv_ops *fmdev, unsigned char *spacing) -{ - if (fmdev->curr_fmmode != FM_MODE_RX) - return -EPERM; - - if (spacing == NULL) { - pr_err("Invalid memory"); + pr_err("(fmdrv): Invalid memory\n"); return -ENOMEM; } - *spacing = fmdev->rx.region.channel_spacing / FM_FREQ_MUL; + *af_mode = fmdev->rx.af_mode; return 0; } |