uint32_t wrdata;
uint32_t ret;
-#define AGC_CAL_NF (AR9170_PHY_AGC_CONTROL_CAL | AR9170_PHY_AGC_CONTROL_NF);
+#define AGC_CAL_NF (AR9170_PHY_AGC_CONTROL_CAL | AR9170_PHY_AGC_CONTROL_NF)
wrdata = get_async(AR9170_PHY_REG_AGC_CONTROL) | AGC_CAL_NF;
set(AR9170_PHY_REG_AGC_CONTROL, wrdata);
ret = get_async(AR9170_PHY_REG_AGC_CONTROL) & AGC_CAL_NF;
/* sitesurvey : 100 ms / current connected 200 ms */
- while (loop && ret != 0x0) {
- ret = get_async(AR9170_PHY_REG_AGC_CONTROL) & AGC_CAL_NF;
-
- if (ret == 0)
- break;
-
+ while ((ret != 0) && loop--) {
udelay(100);
- loop--;
+
+ ret = get_async(AR9170_PHY_REG_AGC_CONTROL) & AGC_CAL_NF;
}
/* return the AGC/Noise calibration state to the driver */
resp->hdr.len = sizeof(struct carl9170_rf_init_result);
resp->rf_init_res.ret = cpu_to_le32(ret);
-
- resp->rf_init_res.regs[0] = get(AR9170_PHY_REG_CCA);
- resp->rf_init_res.regs[3] = get(AR9170_PHY_REG_EXT_CCA);
-
- resp->rf_init_res.regs[1] = get(AR9170_PHY_REG_CH1_CCA);
- resp->rf_init_res.regs[4] = get(AR9170_PHY_REG_CH1_EXT_CCA);
-
- resp->rf_init_res.regs[2] = get(AR9170_PHY_REG_CH2_CCA);
- resp->rf_init_res.regs[5] = get(AR9170_PHY_REG_CH2_EXT_CCA);
}
#ifdef CONFIG_CARL9170FW_PSM