From c458230f2adc497dc1cb291934e75fe5a97a4450 Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Mon, 5 Mar 2007 05:00:02 +0000
Subject: Refactored FPGA *.vh files.  Moved common pieces to toplevel/include.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4713 221aa14e-8319-0410-a670-987f0aec2ac5
---
 usrp/fpga/sdr_lib/master_control_multi.v | 2 +-
 usrp/fpga/sdr_lib/rx_chain.v             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'usrp/fpga/sdr_lib')

diff --git a/usrp/fpga/sdr_lib/master_control_multi.v b/usrp/fpga/sdr_lib/master_control_multi.v
index 95c4ec17e5..cab96a79fe 100644
--- a/usrp/fpga/sdr_lib/master_control_multi.v
+++ b/usrp/fpga/sdr_lib/master_control_multi.v
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
 //
-`include "usrp_multi.vh"
+`include "config.vh"
 `include "../../../firmware/include/fpga_regs_common.v"
 `include "../../../firmware/include/fpga_regs_standard.v"
 // Clock, enable, and reset controls for whole system
diff --git a/usrp/fpga/sdr_lib/rx_chain.v b/usrp/fpga/sdr_lib/rx_chain.v
index 73c0c26eaa..bc4336e416 100644
--- a/usrp/fpga/sdr_lib/rx_chain.v
+++ b/usrp/fpga/sdr_lib/rx_chain.v
@@ -21,7 +21,8 @@
 
 // Following defines conditionally include RX path circuitry
 
-`include "usrp_std.vh"
+`include "config.vh"	// resolved relative to project root
+
 module rx_chain
   (input clock,
    input reset,
-- 
cgit v1.2.3