[Commit-gnuradio] r11620 - in gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel: include usrp_std

[pcreekmore]

Author: pcreekmore
Date: 2009-08-25 00:13:49 -0600 (Tue, 25 Aug 2009)
New Revision: 11620

Added:
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/include/common_config_4rx_0tx_maxBW.vh
Modified:
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
Log:
Tidied up FPGA config files and added the maximum bandwidth config file.

Added: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/include/common_config_4rx_0tx_maxBW.vh
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/include/common_config_4rx_0tx_maxBW.vh
                              (rev 0)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/include/common_config_4rx_0tx_maxBW.vh
      2009-08-25 06:13:49 UTC (rev 11620)
@@ -0,0 +1,61 @@
+// -*- verilog -*-
+//
+//  USRP - Universal Software Radio Peripheral
+//
+//  Copyright (C) 2006 Matt Ettus
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
+//
+
+// ------------------------------------------------------------
+// If TX_ON is not defined, there is *no* transmit circuitry built
+// `define TX_ON
+
+// ------------------------------------------------------------
+// Define 1 and only one of TX_SINGLE, TX_DUAL and TX_QUAD
+// to respectively enable 1, 2 or 4 transmit channels.
+// [Please note that only TX_SINGLE and TX_DUAL are currently valid]
+//`define TX_SINGLE
+//`define TX_DUAL
+//`define TX_QUAD
+
+// ------------------------------------------------------------
+// Define TX_HB_ON to enable the transmit halfband filter
+// [Not implemented]
+//`define TX_HB_ON
+
+// ------------------------------------------------------------
+// IF RX_ON is not defined, there is *no* receive circuitry built
+  `define RX_ON
+
+// ------------------------------------------------------------
+// Define 1 and only one of RX_SINGLE, RX_DUAL and RX_QUAD
+// to respectively define 1, 2 or 4 receive channels.
+
+//`define RX_SINGLE
+//`define RX_DUAL
+  `define RX_QUAD
+
+// ------------------------------------------------------------
+// Define RX_HB_ON to enable the receive halfband filter
+//`define RX_HB_ON
+
+// ------------------------------------------------------------
+// Define RX_NCO_ON to enable the receive Numerical Controlled Osc
+  `define RX_NCO_ON
+
+// ------------------------------------------------------------
+// Define RX_CIC_ON to enable the receive Cascaded Integrator Comb filter
+//`define RX_CIC_ON

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
  2009-08-20 14:17:04 UTC (rev 11619)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
  2009-08-25 06:13:49 UTC (rev 11620)
@@ -37,7 +37,7 @@
 //`include "../include/common_config_2rxhb_2tx.vh"
 
 // Uncomment this for 4 rx channels (w/o halfband) & 0 transmit channels
-//`include "../include/common_config_4rx_0tx.vh"
+  `include "../include/common_config_4rx_0tx.vh"
 
 // Uncomment this for multi with 2 rx channels (w/ halfband) & 0 transmit 
channels
 //`include "../include/common_config_2rxhb_0tx.vh"
@@ -46,7 +46,7 @@
 //`include "../include/common_config_2rx_0tx.vh"
 
 // Uncomment this for 4 rx channels (w/o halfband or CIC) & 0 transmit channels
-  `include "../include/purdue_config_maxBW.vh"
+//`include "../include/common_config_4rx_0tx_maxBW.vh"
 
 // Add other "known to fit" configurations here...