[Commit-gnuradio] r8833 - usrp2/trunk/fpga/top/u2_rev2

[matt]

Author: matt
Date: 2008-07-08 19:06:11 -0600 (Tue, 08 Jul 2008)
New Revision: 8833

Modified:
   usrp2/trunk/fpga/top/u2_rev2/u2_rev2.v
Log:
more timing whack-a-mole


Modified: usrp2/trunk/fpga/top/u2_rev2/u2_rev2.v
===================================================================
--- usrp2/trunk/fpga/top/u2_rev2/u2_rev2.v      2008-07-09 00:35:35 UTC (rev 
8832)
+++ usrp2/trunk/fpga/top/u2_rev2/u2_rev2.v      2008-07-09 01:06:11 UTC (rev 
8833)
@@ -89,8 +89,8 @@
    output adc_pdn_b,
    
    // DAC
-   output [15:0] dac_a,
-   output [15:0] dac_b,
+   output reg [15:0] dac_a,
+   output reg [15:0] dac_b,
    input dac_lock,     // unused for now
    
    // I2C
@@ -301,7 +301,11 @@
        ser_rklsb_int <= ser_rklsb;
        ser_rkmsb_int <= ser_rkmsb;
      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;
+
    /*
    OFDDRRSE OFDDRRSE_serdes_inst 
      (.Q(ser_tx_clk),      // Data output (connect directly to top-level port)
@@ -366,8 +370,8 @@
                     .adc_ovf_b         (adc_ovf_b_reg2),
                     .adc_on_b          (adc_on_b),
                     .adc_oe_b          (adc_oe_b),
-                    .dac_a             (dac_a[15:0]),
-                    .dac_b             (dac_b[15:0]),
+                    .dac_a             (dac_a_int),
+                    .dac_b             (dac_b_int),
                     .scl_pad_i         (scl_pad_i),
                     .scl_pad_o         (scl_pad_o),
                     .scl_pad_oen_o     (scl_pad_oen_o),