diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-09-24 19:08:33 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-09-24 19:08:33 -0700 |
| commit | adb88dbd1f996ed26bab654a9a059ea4f3ede823 (patch) | |
| tree | 1d97095091c8f4815c5aab6bebff1679d5b2a646 /fpga/usrp3/lib/xge_interface | |
| parent | 3cfb643100d0b44da5a37d672680d1c5b8990ece (diff) | |
| parent | 17c507c89b30285e777017ba56ea539c63dafded (diff) | |
| download | uhd-adb88dbd1f996ed26bab654a9a059ea4f3ede823.tar.gz uhd-adb88dbd1f996ed26bab654a9a059ea4f3ede823.tar.bz2 uhd-adb88dbd1f996ed26bab654a9a059ea4f3ede823.zip | |
Merge branch 'maint'
Diffstat (limited to 'fpga/usrp3/lib/xge_interface')
| -rw-r--r-- | fpga/usrp3/lib/xge_interface/xge_mac_wrapper.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpga/usrp3/lib/xge_interface/xge_mac_wrapper.v b/fpga/usrp3/lib/xge_interface/xge_mac_wrapper.v index 21c71ba37..c05682111 100644 --- a/fpga/usrp3/lib/xge_interface/xge_mac_wrapper.v +++ b/fpga/usrp3/lib/xge_interface/xge_mac_wrapper.v @@ -151,7 +151,7 @@ module xge_mac_wrapper /////////////////////////////////////////////////////////////////////////////////////// wire [63:0] rx_tdata_int; wire [3:0] rx_tuser_int; - wire rx_talst_int; + wire rx_tlast_int; wire rx_tvalid_int; wire rx_tready_int; @@ -194,7 +194,7 @@ module xge_mac_wrapper // Large FIFO must be able to run input side at 64b@156MHz to sustain 10Gb Rx. // - axi64_8k_2clk_fifo rxfifo_2clk + axi64_4k_2clk_fifo rxfifo_2clk ( .s_aresetn(~xgmii_reset), .s_aclk(xgmii_clk), @@ -235,7 +235,7 @@ module xge_mac_wrapper wire tx_sof_int3; - axi64_8k_2clk_fifo txfifo_2clk_1x + axi64_4k_2clk_fifo txfifo_2clk_1x ( .s_aresetn(~xgmii_reset), .s_aclk(sys_clk), |