diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-31 15:46:38 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-31 15:46:38 -0700 |
| commit | d5ffc2d767d4086aa3f4d88e88034c355d4e9a3b (patch) | |
| tree | 9801480993c4e5fa2783bf09c0a204b2f12aac75 /fpga/usrp2/top/u2_rev3/u2_rev3.v | |
| parent | 02e339cc501eebd38f72b0f172551930106b8634 (diff) | |
| parent | 9fa6105a49f41e39321438086b00ab12d8437828 (diff) | |
| download | uhd-d5ffc2d767d4086aa3f4d88e88034c355d4e9a3b.tar.gz uhd-d5ffc2d767d4086aa3f4d88e88034c355d4e9a3b.tar.bz2 uhd-d5ffc2d767d4086aa3f4d88e88034c355d4e9a3b.zip | |
Merge branch 'ise12' into next
Diffstat (limited to 'fpga/usrp2/top/u2_rev3/u2_rev3.v')
| -rw-r--r-- | fpga/usrp2/top/u2_rev3/u2_rev3.v | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fpga/usrp2/top/u2_rev3/u2_rev3.v b/fpga/usrp2/top/u2_rev3/u2_rev3.v index 3a43e4ffe..4daa66212 100644 --- a/fpga/usrp2/top/u2_rev3/u2_rev3.v +++ b/fpga/usrp2/top/u2_rev3/u2_rev3.v @@ -203,12 +203,13 @@ module u2_rev3 reg [13:0] adc_a_reg1, adc_b_reg1, adc_a_reg2, adc_b_reg2; reg adc_ovf_a_reg1, adc_ovf_a_reg2, adc_ovf_b_reg1, adc_ovf_b_reg2; + // ADC A and B are swapped in schematic to facilitate clean layout always @(posedge dsp_clk) begin - adc_a_reg1 <= adc_a; - adc_b_reg1 <= adc_b; - adc_ovf_a_reg1 <= adc_ovf_a; - adc_ovf_b_reg1 <= adc_ovf_b; + adc_a_reg1 <= adc_b; + adc_b_reg1 <= adc_a; + adc_ovf_a_reg1 <= adc_ovf_b; + adc_ovf_b_reg1 <= adc_ovf_a; end always @(posedge dsp_clk) @@ -327,8 +328,10 @@ module u2_rev3 end wire [15:0] dac_a_int, dac_b_int; - always @(negedge dsp_clk) dac_a <= dac_a_int; - always @(negedge dsp_clk) dac_b <= dac_b_int; + // DAC A and B are swapped in schematic to facilitate clean layout + // DAC A is also inverted in schematic to facilitate clean layout + always @(negedge dsp_clk) dac_a <= ~dac_b_int; + always @(negedge dsp_clk) dac_b <= dac_a_int; /* OFDDRRSE OFDDRRSE_serdes_inst |