From 50684991ff115aae8e20acf81d50eeef6f069bd4 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 4 Aug 2010 11:05:38 -0700 Subject: [PATCH 1/2] Fix unitialized variable pointed to by compiler warning --- host/lib/db_wbxng_adf4350_regs.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/lib/db_wbxng_adf4350_regs.cc b/host/lib/db_wbxng_adf4350_regs.cc index aa13d50..997f6e1 100644 --- a/host/lib/db_wbxng_adf4350_regs.cc +++ b/host/lib/db_wbxng_adf4350_regs.cc @@ -82,7 +82,7 @@ adf4350_regs::_reg_shift(uint32_t data, uint32_t shift){ uint32_t adf4350_regs::compute_register(uint8_t addr){ - uint32_t data; + uint32_t data = 0; switch (addr){ case 0: data = ( _reg_shift(d_int, 15) | From d2529be51be464b0cfad3be4db2c4d4a5befbb92 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 4 Aug 2010 11:08:11 -0700 Subject: [PATCH 2/2] formatting change: move break statements --- host/lib/db_wbxng_adf4350_regs.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/host/lib/db_wbxng_adf4350_regs.cc b/host/lib/db_wbxng_adf4350_regs.cc index 997f6e1..c9707c3 100644 --- a/host/lib/db_wbxng_adf4350_regs.cc +++ b/host/lib/db_wbxng_adf4350_regs.cc @@ -86,11 +86,13 @@ adf4350_regs::compute_register(uint8_t addr){ switch (addr){ case 0: data = ( _reg_shift(d_int, 15) | - _reg_shift(d_frac, 3)); break; + _reg_shift(d_frac, 3)); + break; case 1: data = ( _reg_shift(d_prescaler, 27) | _reg_shift(s_phase, 15) | - _reg_shift(d_mod, 3)); break; + _reg_shift(d_mod, 3)); + break; case 2: data = ( _reg_shift(s_low_noise_and_low_spur_modes, 29) | _reg_shift(s_muxout, 26) | @@ -104,11 +106,13 @@ adf4350_regs::compute_register(uint8_t addr){ _reg_shift(s_pd_polarity, 6) | _reg_shift(s_power_down, 5) | _reg_shift(s_cp_three_state, 4) | - _reg_shift(s_counter_reset, 3)); break; + _reg_shift(s_counter_reset, 3)); + break; case 3: data = ( _reg_shift(s_csr, 18) | _reg_shift(s_clk_div_mode, 15) | - _reg_shift(s_12_bit_clock_divider_value, 3)); break; + _reg_shift(s_12_bit_clock_divider_value, 3)); + break; case 4: data = ( _reg_shift(s_feedback_select, 23) | _reg_shift(d_divider_select, 20) | @@ -119,9 +123,11 @@ adf4350_regs::compute_register(uint8_t addr){ _reg_shift(s_aux_output_enable, 8) | _reg_shift(s_aux_output_power, 6) | _reg_shift(s_rf_output_enable, 5) | - _reg_shift(s_output_power, 3)); break; + _reg_shift(s_output_power, 3)); + break; case 5: data = ( - _reg_shift(s_ld_pin_mode, 22)); break; + _reg_shift(s_ld_pin_mode, 22)); + break; default: return data; } /* return the data to write out to spi */