[Commit-gnuradio] r7166 - usrp2/trunk/fpga/models

[matt]

Author: matt
Date: 2007-12-13 20:41:15 -0700 (Thu, 13 Dec 2007)
New Revision: 7166

Modified:
   usrp2/trunk/fpga/models/adc_model.v
Log:
reflect reality


Modified: usrp2/trunk/fpga/models/adc_model.v
===================================================================
--- usrp2/trunk/fpga/models/adc_model.v 2007-12-14 03:37:32 UTC (rev 7165)
+++ usrp2/trunk/fpga/models/adc_model.v 2007-12-14 03:41:15 UTC (rev 7166)
@@ -15,10 +15,10 @@
    reg [13:0] adc_a_int = 0;
    reg [13:0] adc_b_int = 0;
    
-   assign     adc_a = (adc_oen_a & ~adc_pdn_a) ? adc_a_int : 14'bz;
-   assign     adc_ovf_a = (adc_oen_a & ~adc_pdn_a) ? 1'b0 : 1'bz;
-   assign     adc_b = (adc_oen_b & ~adc_pdn_b) ? adc_b_int : 14'bz;
-   assign     adc_ovf_b = (adc_oen_b & ~adc_pdn_b) ? 1'b0 : 1'bz;
+   assign     adc_a = (~adc_oen_a & ~adc_pdn_a) ? adc_a_int : 14'bz;
+   assign     adc_ovf_a = (~adc_oen_a & ~adc_pdn_a) ? 1'b0 : 1'bz;
+   assign     adc_b = (~adc_oen_b & ~adc_pdn_b) ? adc_b_int : 14'bz;
+   assign     adc_ovf_b = (~adc_oen_b & ~adc_pdn_b) ? 1'b0 : 1'bz;
    
    real phase = 0;
 
@@ -28,7 +28,7 @@
    real freq = 330000/sample_rate;     // 330 kHz
    
    always @(posedge clk)
-     if(~adc_pdn_a & adc_oen_a)
+     if(~adc_pdn_a & ~adc_oen_a)
        begin
          adc_a_int <= 
$rtoi(math.round(math.sin(phase*math.MATH_2_PI)*(math.pow(2,13)-1))) ;
          adc_b_int <= 
$rtoi(math.round(math.cos(phase*math.MATH_2_PI)*(math.pow(2,13)-1))) ;