diff options
author | Johnathan Corgan | 2009-10-01 11:00:25 -0700 |
---|---|---|
committer | Johnathan Corgan | 2009-10-01 11:07:59 -0700 |
commit | bf76534044a1bbcc665f0400a53d1070cae8caf0 (patch) | |
tree | e8405125fed84c239967b1fc9692d5931a25376d /usrp2/fpga/top/single_u2_sim/single_u2_sim.v | |
parent | e5b76a1b9239f560b3aad21d56a7b417f3c8b0b5 (diff) | |
parent | 4743bf771fed8405b08194d8c7fb72bf8110eab3 (diff) | |
download | gnuradio-bf76534044a1bbcc665f0400a53d1070cae8caf0.tar.gz gnuradio-bf76534044a1bbcc665f0400a53d1070cae8caf0.tar.bz2 gnuradio-bf76534044a1bbcc665f0400a53d1070cae8caf0.zip |
Merge branch 'new_eth' of http://gnuradio.org/git/matt into master
* 'new_eth' of http://gnuradio.org/git/matt: (42 commits)
Fix warnings, mostly from implicitly defined wires or unspecified widths
fullchip sim now compiles again, after moving eth and models over to new simple_gemac
remove unused opencores
remove debugging code
no idea where this came from, it shouldn't be here
Copied wb_1master back from quad radio
Remove old mac. Good riddance.
remove unused port
More xilinx fifos, more clean up of our fifos
might as well use a cascade fifo to help timing and give a little more capacity
fix a typo which caused tx glitches
Untested fixes for getting serdes onto the new fifo system. Compiles, at least
Implement Eth flow control using pause frames
parameterized fifo sizes, some reformatting
remove unused old style fifo
allow control of whether or not to honor flow control, adds some debug lines
debug the rx side
no longer used, replaced by newfifo version
remove special last_line adjustment from ethernet port
Firmware now inserts mac source address value in each frame.
...
Diffstat (limited to 'usrp2/fpga/top/single_u2_sim/single_u2_sim.v')
-rw-r--r-- | usrp2/fpga/top/single_u2_sim/single_u2_sim.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usrp2/fpga/top/single_u2_sim/single_u2_sim.v b/usrp2/fpga/top/single_u2_sim/single_u2_sim.v index 016815ff7..2a7b24849 100644 --- a/usrp2/fpga/top/single_u2_sim/single_u2_sim.v +++ b/usrp2/fpga/top/single_u2_sim/single_u2_sim.v @@ -178,7 +178,7 @@ module single_u2_sim(); .adc_b(adc_b),.adc_ovf_b(adc_ovf_b),.adc_on_b(adc_on_b),.adc_oe_b(adc_oe_b) ); wire [2:0] speed; - Phy_sim phy_model + phy_sim phy_model (.Gtx_clk(GMII_GTX_CLK), . Rx_clk(GMII_RX_CLK), .Tx_clk(GMII_TX_CLK), .Tx_er(GMII_TX_ER), .Tx_en(GMII_TX_EN), .Txd(GMII_TXD), .Rx_er(GMII_RX_ER), .Rx_dv(GMII_RX_DV), .Rxd(GMII_RXD), |