summaryrefslogtreecommitdiffstats
path: root/sdr_lib
diff options
context:
space:
mode:
authoreb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2007-03-05 05:00:02 +0000
committereb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2007-03-05 05:00:02 +0000
commita67127dcd59dd7f7d58323f05ed8504faafe8c63 (patch)
treea7de20164cf9e33788f8644f6edae8584e2f7005 /sdr_lib
parent2a732b0122279fc795203e176c430d6f9974c66d (diff)
downloaduhd-a67127dcd59dd7f7d58323f05ed8504faafe8c63.tar.gz
uhd-a67127dcd59dd7f7d58323f05ed8504faafe8c63.tar.bz2
uhd-a67127dcd59dd7f7d58323f05ed8504faafe8c63.zip
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
Diffstat (limited to 'sdr_lib')
-rw-r--r--sdr_lib/master_control_multi.v2
-rw-r--r--sdr_lib/rx_chain.v3
2 files changed, 3 insertions, 2 deletions
diff --git a/sdr_lib/master_control_multi.v b/sdr_lib/master_control_multi.v
index 95c4ec17e..cab96a79f 100644
--- a/sdr_lib/master_control_multi.v
+++ b/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/sdr_lib/rx_chain.v b/sdr_lib/rx_chain.v
index 73c0c26ea..bc4336e41 100644
--- a/sdr_lib/rx_chain.v
+++ b/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,