Merge branch 'fpga_patch_release' into patch_release

3 files changed, 3 insertions, 3 deletions

diff --git a/fpga/usrp2/sdr_lib/rx_dcoffset.v b/fpga/usrp2/sdr_lib/rx_dcoffset.v
index e43461261..9840e9e1f 100644
--- a/fpga/usrp2/sdr_lib/rx_dcoffset.v
+++ b/fpga/usrp2/sdr_lib/rx_dcoffset.v
@@ -20,7 +20,7 @@
 module rx_dcoffset 
   #(parameter WIDTH=16,
     parameter ADDR=8'd0,
-    parameter alpha_shift=16)
+    parameter alpha_shift=20)
    (input clk, input rst, 
     input set_stb, input [7:0] set_addr, input [31:0] set_data,
     input [WIDTH-1:0] in, output [WIDTH-1:0] out);
diff --git a/fpga/usrp2/sdr_lib/rx_frontend.v b/fpga/usrp2/sdr_lib/rx_frontend.v
index edfbe62df..5b64737b2 100644
--- a/fpga/usrp2/sdr_lib/rx_frontend.v
+++ b/fpga/usrp2/sdr_lib/rx_frontend.v
@@ -1,7 +1,7 @@
 
 module rx_frontend
   #(parameter BASE = 0,
-    parameter IQCOMP_EN = 0)
+    parameter IQCOMP_EN = 1)
    (input clk, input rst,
     input set_stb, input [7:0] set_addr, input [31:0] set_data,
 
diff --git a/fpga/usrp2/sdr_lib/tx_frontend.v b/fpga/usrp2/sdr_lib/tx_frontend.v
index 1e7f0bf31..17a6e35e0 100644
--- a/fpga/usrp2/sdr_lib/tx_frontend.v
+++ b/fpga/usrp2/sdr_lib/tx_frontend.v
@@ -2,7 +2,7 @@
 module tx_frontend
   #(parameter BASE=0,
     parameter WIDTH_OUT=16,
-    parameter IQCOMP_EN=0)
+    parameter IQCOMP_EN=1)
    (input clk, input rst,
     input set_stb, input [7:0] set_addr, input [31:0] set_data,
     input [23:0] tx_i, input [23:0] tx_q, input run,