[Commit-gnuradio] r4706 - in gnuradio/branches/developers/n4hy/ofdm: config gr-qtgui usrp/doc usrp/fpga/toplevel/usrp_std

[n4hy]

Author: n4hy
Date: 2007-03-03 09:00:45 -0700 (Sat, 03 Mar 2007)
New Revision: 4706

Added:
   gnuradio/branches/developers/n4hy/ofdm/usrp/doc/inband-signaling-gigethernet
   
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std_config_1rxhb_1tx.vh
Modified:
   gnuradio/branches/developers/n4hy/ofdm/config/grc_gr_qtgui.m4
   gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/README
   
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
   gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.v
   
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.vh
Log:
Merge 4689:4705 from trunk staying current with inband signaling for usrp

Modified: gnuradio/branches/developers/n4hy/ofdm/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm/config/grc_gr_qtgui.m4       
2007-03-03 05:50:52 UTC (rev 4705)
+++ gnuradio/branches/developers/n4hy/ofdm/config/grc_gr_qtgui.m4       
2007-03-03 16:00:45 UTC (rev 4706)
@@ -36,8 +36,8 @@
        [passed=no;AC_MSG_RESULT([gr-qtgui requires qt, not found. Checking for 
qt-mt])])
     fi
 
-    PKG_CHECK_MODULES(QWT, qwt >= 5.0.0, [],
-    [passed=no;AC_MSG_RESULT([gr-qtgui requires qwt, not found.])])
+    AC_HAVE_LIBRARY(qwt, [],
+       [passed=no;AC_MSG_RESULT([gr-qtgui requires qwt, not found.])])
 
     
     GRC_BUILD_CONDITIONAL([gr-qtgui], [

Modified: gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/README
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/README      2007-03-03 
05:50:52 UTC (rev 4705)
+++ gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/README      2007-03-03 
16:00:45 UTC (rev 4706)
@@ -5,13 +5,10 @@
 
 For Linux, this may be obtained from:
 
-  http://n4hy.org/Qwt/qwt.spec
-  http://n4hy.org/Qwt/qwt.pc
   http://n4hy.org/Qwt/qwt-5.0.0.tar.bz2
-  http://n4hy.org/Qwt/qwt-5.0.0-1.src.rpm
 
 On NetBSD or other pkgsrc systems, pkgsrc/x11/qwt exists and seems to
-be a much older version linked against qt2.
+be a much older version linked against qt2.  You need qt3!
 
 
 QTDIR is an environment variable that must be set for
@@ -26,12 +23,31 @@
 
 /usr/lib/qt-3.3
 
-by Qt install
+by Qt install from the Fedora Core software setup.
 
-Qwt probably needs to be built and installed for now using
+If you are building from source from n4hy.org, the untar the bz2 ball,
+cd into the qwt-5.0.0 directory and run
 
-rpmbuild --rebuild qwt-5.0.0-1.src.rpm
+qmake
 
+Now edit the file  qwtconfig.pri
+
+and make the INSTALLBASE = /usr/local
+
+
+run 
+
+make
+sudo make install
+
+and qwt will be loaded into /usr/local/lib and the includes will be in
+/usr/local/include
+
+gr-qtgui will now make.
+
+
+
+
 which must be run as root (as in sudo) so that files are
 installed in the proper place for the gnuradio build
 (such as qwt.pc).  

Copied: 
gnuradio/branches/developers/n4hy/ofdm/usrp/doc/inband-signaling-gigethernet 
(from rev 4705, gnuradio/trunk/usrp/doc/inband-signaling-gigethernet)
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/usrp/doc/inband-signaling-gigethernet    
                            (rev 0)
+++ 
gnuradio/branches/developers/n4hy/ofdm/usrp/doc/inband-signaling-gigethernet    
    2007-03-03 16:00:45 UTC (rev 4706)
@@ -0,0 +1,34 @@
+Gigabit Ethernet Interconnect for the USRP2
+
+At this point, this is a place to summarize design requirements,
+possible solutions, point-counterpoint, etc.
+
+
+Requirements:
+
+(R1) High throughput and low latency between USRP h/w and user-space.
+One of the primary reasons for switching from USB to gigabit ethernet
+is to increase throughput.  Many users want to be be able to build
+WLAN type systems, and are thwarted by the relatively low throughput
+available over the USB.  Eric thinks we should shoot for at least
+100MB/s full-duplex into user space, using packets with payloads on
+the order of 256 to 512 bytes.  The small packet size is to reduce the
+latency.  This is important for many MACs that people want to build on
+the host side.
+
+(R2) Non-priviledged user programs should be able to access the USRP.
+This could be implemented by a priviledged daemon that actually handles the
+low level communication with the USRP2.  This daemon may be desirable
+for other reasons, including central point of control for
+arbitrating/muxing/demuxing between multiple concurrent users (e.g.,
+Tx, Rx, requests, replies, various logical channels).
+
+(R3) Some way to flow control the host to USRP2 stream.  This is
+required in case the user connects an unthrottled signal generator to
+the USRP. (This is not uncommon.)  The USRP2 to host direction
+shouldn't be a problem, since the USRP2 throughput is controlled by
+its configuration.  It is an error to configure the USRP2 to transmit
+data at a higher rate than the transport or host can consume.
+
+One solution to this requirement could be having the USRP2 emit GigE
+"pause" frames.  We'll need to confirm that this works.

Modified: 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.qsf 
    2007-03-03 05:50:52 UTC (rev 4705)
+++ 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.qsf 
    2007-03-03 16:00:45 UTC (rev 4706)
@@ -223,7 +223,7 @@
 set_global_assignment -name TOP_LEVEL_ENTITY usrp_std
 set_global_assignment -name VHDL_SHOW_LMF_MAPPING_MESSAGES OFF
 set_global_assignment -name USER_LIBRARIES "e:\\usrp\\fpga\\megacells"
-set_global_assignment -name AUTO_ENABLE_SMART_COMPILE On
+set_global_assignment -name AUTO_ENABLE_SMART_COMPILE ON
 
 # Fitter Assignments
 # ==================
@@ -314,7 +314,7 @@
 # ========================
 set_global_assignment -name HUB_ENTITY_NAME SLD_HUB
 set_global_assignment -name HUB_INSTANCE_NAME SLD_HUB_INST
-set_global_assignment -name ENABLE_SIGNALTAP Off
+set_global_assignment -name ENABLE_SIGNALTAP OFF
 
 # LogicLock Region Assignments
 # ============================
@@ -326,8 +326,8 @@
        # Timing Assignments
        # ==================
 set_global_assignment -name DUTY_CYCLE 50 -section_id SCLK
-       set_global_assignment -name FMAX_REQUIREMENT "1.0 MHz" -section_id SCLK
-       set_global_assignment -name 
INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF -section_id SCLK
+set_global_assignment -name FMAX_REQUIREMENT "1 MHz" -section_id SCLK
+set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS 
OFF -section_id SCLK
 
 # end CLOCK(SCLK)
 # ---------------
@@ -338,8 +338,8 @@
        # Timing Assignments
        # ==================
 set_global_assignment -name DUTY_CYCLE 50 -section_id master_clk
-       set_global_assignment -name FMAX_REQUIREMENT "64.0 MHz" -section_id 
master_clk
-       set_global_assignment -name 
INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF -section_id master_clk
+set_global_assignment -name FMAX_REQUIREMENT "64 MHz" -section_id master_clk
+set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS 
OFF -section_id master_clk
 
 # end CLOCK(master_clk)
 # ---------------------
@@ -350,8 +350,8 @@
        # Timing Assignments
        # ==================
 set_global_assignment -name DUTY_CYCLE 50 -section_id usbclk
-       set_global_assignment -name FMAX_REQUIREMENT "48.0 MHz" -section_id 
usbclk
-       set_global_assignment -name 
INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF -section_id usbclk
+set_global_assignment -name FMAX_REQUIREMENT "48 MHz" -section_id usbclk
+set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS 
OFF -section_id usbclk
 
 # end CLOCK(usbclk)
 # -----------------
@@ -361,9 +361,9 @@
 
        # Timing Assignments
        # ==================
-       set_instance_assignment -name CLOCK_SETTINGS SCLK -to SCLK
-       set_instance_assignment -name CLOCK_SETTINGS usbclk -to usbclk
-       set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk
+set_instance_assignment -name CLOCK_SETTINGS SCLK -to SCLK
+set_instance_assignment -name CLOCK_SETTINGS usbclk -to usbclk
+set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk
 
 # end ENTITY(usrp_std)
 # --------------------

Modified: 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.v
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.v   
    2007-03-03 05:50:52 UTC (rev 4705)
+++ 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.v   
    2007-03-03 16:00:45 UTC (rev 4706)
@@ -124,7 +124,7 @@
    
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
    // Transmit Side
 `ifdef TX_ON
-   assign     bb_tx_i0 = ch0tx;
+   assign      bb_tx_i0 = ch0tx;
    assign      bb_tx_q0 = ch1tx;
    assign      bb_tx_i1 = ch2tx;
    assign      bb_tx_q1 = ch3tx;
@@ -142,17 +142,27 @@
        .tx_empty(tx_empty),
        .debugbus(tx_debugbus) );
 
+ `ifdef TX_EN_0
    tx_chain tx_chain_0
      ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
        .interp_rate(interp_rate),.sample_strobe(tx_sample_strobe),
        .interpolator_strobe(strobe_interp),.freq(),
        .i_in(bb_tx_i0),.q_in(bb_tx_q0),.i_out(i_out_0),.q_out(q_out_0) );
+ `else
+   assign      i_out_0=16'd0;
+   assign      q_out_0=16'd0;
+ `endif
 
+ `ifdef TX_EN_1
    tx_chain tx_chain_1
      ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
        .interp_rate(interp_rate),.sample_strobe(tx_sample_strobe),
        .interpolator_strobe(strobe_interp),.freq(),
        .i_in(bb_tx_i1),.q_in(bb_tx_q1),.i_out(i_out_1),.q_out(q_out_1) );
+ `else
+   assign      i_out_1=16'd0;
+   assign      q_out_1=16'd0;
+ `endif
 
    setting_reg #(`FR_TX_MUX) 
      
sr_txmux(.clock(clk64),.reset(tx_dsp_reset),.strobe(serial_strobe),.addr(serial_addr),.in(serial_data),

Modified: 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.vh
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.vh  
    2007-03-03 05:50:52 UTC (rev 4705)
+++ 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std.vh  
    2007-03-03 16:00:45 UTC (rev 4706)
@@ -26,6 +26,9 @@
 //
 // ====================================================================
 
+// Uncomment this for 1 rx channel (w/ halfband) & 1 transmit channel
+//`include "usrp_std_config_1rxhb_1tx.vh"
+
 // Uncomment this for 2 rx channels (w/ halfband) & 2 transmit channels
   `include "usrp_std_config_2rxhb_2tx.vh"
 

Copied: 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std_config_1rxhb_1tx.vh
 (from rev 4705, 
gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std_config_1rxhb_1tx.vh)
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std_config_1rxhb_1tx.vh
                             (rev 0)
+++ 
gnuradio/branches/developers/n4hy/ofdm/usrp/fpga/toplevel/usrp_std/usrp_std_config_1rxhb_1tx.vh
     2007-03-03 16:00:45 UTC (rev 4706)
@@ -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_DUAL is 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* transmit 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
\ No newline at end of file