[Discuss-gnuradio] More CVS updates to usrp and gr-usrp

[Eric Blossom]

The usrp / gr-usrp hacking continues...

If you're tracking CVS, please update usrp and gr-usrp.

Prior to building usrp, you'll probably want to do a
"rm -fr PREFIX/share/usrp" to avoid possible confusion down the road.

I've added provisions that allow code to specify the
firmware and fpga files that are to be loaded.  In addition, we are now
shipping *two* standard fpga images, one that contains 2 Rx paths with
halfband filters and 2 tx paths (the default) and one that contains 4 Rx paths
without halfbands and 0 tx paths.

The names of the fpga and firmware files have also be reworked.
Now after updating and installing you get something like this:


    address@hidden multi-antenna]$ ls -lR /usr/local/share/usrp/
    /usr/local/share/usrp/:
    total 8
    drwxrwsr-x  2 eb wheel 4096 Feb 18 19:53 rev2
    drwxrwsr-x  2 eb wheel 4096 Feb 18 19:53 rev4

    /usr/local/share/usrp/rev2:
    total 368
    -rw-r--r--  1 eb wheel  19840 Feb 18 19:53 std.ihx
    -rw-r--r--  1 eb wheel 175896 Feb 18 19:53 std_2rxhb_2tx.rbf
    -rw-r--r--  1 eb wheel 171213 Feb 18 19:53 std_4rx_0tx.rbf

    /usr/local/share/usrp/rev4:
    total 368
    -rw-r--r--  1 eb wheel  19840 Feb 18 19:53 std.ihx
    -rw-r--r--  1 eb wheel 175896 Feb 18 19:53 std_2rxhb_2tx.rbf
    -rw-r--r--  1 eb wheel 171213 Feb 18 19:53 std_4rx_0tx.rbf


std.ihx is the FX2 firmware.  [Previously called usrp_firmware.ihx]
std_2rxhb_2tx.rbf is the FPGA image with 2 Rx paths with halfbands & 2 tx paths
std_4rx_0tx.rbf is the FPGA image with 4 Rx paths w/o halfbands & no tx paths

The default default is to load std_2rxhb_2tx.rbf.

You can specify the fpga filename to load in the constructor like this:

    address@hidden usrp]$ python
    Python 2.4.1 (#2, Nov 11 2005, 12:26:27)
    [GCC 4.0.1 (4.0.1-5mdk for Mandriva Linux release 2006.0)] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>> from gnuradio import usrp
    >>> u=usrp.source_c(0, fpga_filename="std_2rxhb_2tx.rbf")
    >>> u.nddc()
    2
    >>> u.nduc()
    2
    >>> del u
    >>> u=usrp.source_c(0, fpga_filename="std_4rx_0tx.rbf")
    >>> u.nddc()
    4
    >>> u.nduc()
    0
    >>>

In addition, these environment variables override the default defaults:

  USRP_FPGA=my_fpga_file.rbf
  USRP_FIRMWARE=my_firmware.ihx

Also, if USRP_VERBOSE=1, you'll get chatty messages giving the
fully resolved pathnames to the firmware and fpga files.

That's it for now!
Eric