Changeset 9009

Show
Ignore:
Timestamp:
07/24/08 18:02:08
Author:
jcorgan
Message:

Adds alternative integrate and dump decimator to gr-gpio.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/trunk/config/grc_gr_gpio.m4

    r7888 r9009  
    3131        gr-gpio/src/fpga/top/Makefile \ 
    3232        gr-gpio/src/fpga/lib/Makefile \ 
     33        gr-gpio/src/fpga/rbf/Makefile \ 
    3334        gr-gpio/src/lib/Makefile \ 
    3435        gr-gpio/src/python/Makefile \ 

  • gnuradio/trunk/gr-gpio/src/fpga/Makefile.am

    r7618 r9009  
    2020#  
    2121 
    22 SUBDIRS = include lib top 
     22SUBDIRS = include lib top rbf 
     23 

  • gnuradio/trunk/gr-gpio/src/fpga/include/Makefile.am

    r7618 r9009  
    2121 
    2222EXTRA_DIST = \ 
    23     common_config_2rxhb_2txdig.vh \ 
     23    common_config_2rxhb_2tx_dig.vh \ 
     24    common_config_2rxint_2tx_dig.vh \ 
    2425    common_config_bottom.vh 

  • gnuradio/trunk/gr-gpio/src/fpga/lib/Makefile.am

    r7618 r9009  
    2626    io_pins.v           \ 
    2727    rx_chain_dig.v      \ 
    28     tx_chain_dig.v 
     28    tx_chain_dig.v      \ 
     29    integrator.v        \ 
     30    integ_shifter.v     \ 
     31    rx_chain.v 

  • gnuradio/trunk/gr-gpio/src/fpga/top/Makefile.am

    r7740 r9009  
    2222include $(top_srcdir)/Makefile.common 
    2323 
    24 datadir = $(prefix)/share/usrp 
    25  
    26 datarev2dir = $(datadir)/rev2 
    27  
    28 datarev4dir = $(datadir)/rev4 
    29  
    30 datarev2_DATA = usrp_gpio.rbf 
    31  
    32 datarev4_DATA = usrp_gpio.rbf 
    33  
    34 RBFS = usrp_gpio.rbf 
    35  
    3624EXTRA_DIST = \ 
    3725        config.vh    \ 
    …… 
    4129        usrp_gpio.qpf \ 
    4230        usrp_gpio.qsf \ 
    43         usrp_gpio.v   \ 
    44         $(RBFS) 
     31        usrp_gpio.v 
    4532 
    4633MOSTLYCLEANFILES =      \ 

  • gnuradio/trunk/gr-gpio/src/fpga/top/config.vh

    r7618 r9009  
    3636 
    3737// Uncomment this for 2 rx channels (w/ halfband) & 2 transmit channels 
    38 //  `include "../include/common_config_2rxhb_2tx.vh" 
     38//`include "../include/common_config_2rxhb_2tx.vh" 
    3939 
    4040// Uncomment this for 2 rx channels (w/ halfband) & 2 transmit channels with digital output (lsb of I and Q) on gpio pins 
    41   `include "../include/common_config_2rxhb_2txdig.vh" 
     41//`include "../include/common_config_2rxhb_2tx_dig.vh" 
     42 
     43// Uncomment this for 2 rx channels (w/o halfband, but w/integrator) & 2 tx channels, with streaming GPIO 
     44  `include "../include/common_config_2rxint_2tx_dig.vh" 
    4245 
    4346// Uncomment this for 4 rx channels (w/o halfband) & 0 transmit channels 

  • gnuradio/trunk/gr-gpio/src/fpga/top/usrp_gpio.qsf

    r7618 r9009  
    376376set_global_assignment -name VERILOG_FILE ../lib/rx_chain_dig.v 
    377377set_global_assignment -name VERILOG_FILE ../lib/tx_chain_dig.v 
     378set_global_assignment -name VERILOG_FILE ../lib/integrator.v 
     379set_global_assignment -name VERILOG_FILE ../lib/integ_shifter.v 
     380set_global_assignment -name VERILOG_FILE ../lib/rx_chain.v 
    378381set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/atr_delay.v 
    379382set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cic_dec_shifter.v 
    …… 
    395398set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/bidir_reg.v 
    396399set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cic_int_shifter.v 
    397 set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_chain.v 
    398400set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/gen_sync.v 
    399401set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/master_control.v 

  • gnuradio/trunk/gr-gpio/src/python/gpio.py

    r7618 r9009  
    11from gpio_swig import * 
    22 
    3 fpga_filename = 'usrp_gpio.rbf' 
     3fpga_filename = 'std_2rxint_2tx_dig.rbf'