|
|
@@ -254,7 +254,6 @@ int lmx_freq_set_main_band(void *bar1, double freq, double f_pd) {
|
|
|
printf("VCO_CORE = %d\n", vco_core);
|
|
|
printf("VCO_CAP_CTRL_STR = %d\n", vco_cap_ctrl_strt);
|
|
|
printf("VCO_DACISET_STR = %d\n", vco_daciset_strt);
|
|
|
-
|
|
|
// Calibration assist
|
|
|
//Set the VCO_CORE
|
|
|
lmx2594regs[112 - VCO_SEL] = lmx2594regs[112 - VCO_SEL] & (~BITM_LMX2594_R20_VCO_SEL);
|
|
|
@@ -316,6 +315,7 @@ int lmx_freq_set_main_band(void *bar1, double freq, double f_pd) {
|
|
|
// Show the all the upper 16 bits of the register lmx2594regs[PLL_N_S]
|
|
|
// Determine which regs are changed and send only those
|
|
|
uint32_t lmx_change_freq_regs[] = {
|
|
|
+ lmx2594regs[112-CPG_REG] = (lmx2594regs[112-CPG_REG] & (~BITM_LMX2594_R14_CPG)) | ENUM_LMX2594_R14_CPG_TRISTATE,
|
|
|
lmx2594regs[112 - VCO_SEL],
|
|
|
lmx2594regs[112 - CAP_CTRL_START],
|
|
|
lmx2594regs[112 - VCO_DACISET],
|
|
|
@@ -330,6 +330,7 @@ int lmx_freq_set_main_band(void *bar1, double freq, double f_pd) {
|
|
|
lmx2594regs[112 - CHDIV],
|
|
|
lmx2594regs[112 - CHDIV_DIV2],
|
|
|
lmx2594regs[112-OUTA_MUX],
|
|
|
+ lmx2594regs[112-CPG_REG] = (lmx2594regs[112-CPG_REG] & (~BITM_LMX2594_R14_CPG)) | ENUM_LMX2594_R14_CPG_15ma,
|
|
|
lmx2594regs[112-FCAL_ADDR]
|
|
|
};
|
|
|
// Create a header for the LMX2594 with the appropriate number of words
|
|
|
@@ -668,6 +669,7 @@ int lmx_freq_set_out_of_band(void *bar1, double freq, double f_pd) {
|
|
|
lmx2594regs[112 - FCAL_ADDR] = lmx2594regs[112 - FCAL_ADDR] | (LMX2594_R0_FCAL_EN);
|
|
|
|
|
|
uint32_t lmx_change_freq_regs[] = {
|
|
|
+ lmx2594regs[112-CPG_REG] = (lmx2594regs[112-CPG_REG] & (~BITM_LMX2594_R14_CPG)) | ENUM_LMX2594_R14_CPG_TRISTATE,
|
|
|
lmx2594regs[112 - VCO_SEL],
|
|
|
lmx2594regs[112 - CAP_CTRL_START],
|
|
|
lmx2594regs[112 - VCO_DACISET],
|
|
|
@@ -682,6 +684,7 @@ int lmx_freq_set_out_of_band(void *bar1, double freq, double f_pd) {
|
|
|
lmx2594regs[112 - CHDIV],
|
|
|
lmx2594regs[112 - CHDIV_DIV2],
|
|
|
lmx2594regs[112 - OUTA_MUX],
|
|
|
+ lmx2594regs[112-CPG_REG] = (lmx2594regs[112-CPG_REG] & (~BITM_LMX2594_R14_CPG)) | ENUM_LMX2594_R14_CPG_15ma,
|
|
|
lmx2594regs[112 - FCAL_ADDR]
|
|
|
};
|
|
|
// Create a header for the LMX2594 with the appropriate number of words
|