[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6578 - gnuradio/branches/developers/matt/u2f/eth/rtl/
|
From: |
matt |
|
Subject: |
[Commit-gnuradio] r6578 - gnuradio/branches/developers/matt/u2f/eth/rtl/verilog |
|
Date: |
Tue, 2 Oct 2007 22:58:52 -0600 (MDT) |
Author: matt
Date: 2007-10-02 22:58:51 -0600 (Tue, 02 Oct 2007)
New Revision: 6578
Modified:
gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_rx.v
gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_top.v
gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_tx.v
Log:
fuck it, just compile em all in, and disable them through settings
Modified: gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_rx.v
===================================================================
--- gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_rx.v
2007-10-03 04:33:38 UTC (rev 6577)
+++ gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_rx.v
2007-10-03 04:58:51 UTC (rev 6578)
@@ -54,10 +54,8 @@
//
module MAC_rx
- #(parameter RX_FF_DEPTH = 9,
- parameter BROADCAST_FILTER = 0,
- parameter TARGET_CHECK = 0)
- (
+ #(parameter RX_FF_DEPTH = 9)
+ (
input Reset ,
input Clk_user,
input Clk ,
@@ -196,26 +194,17 @@
.Rx_mac_eop (Rx_mac_eop )
);
- generate
- if(BROADCAST_FILTER)
- begin : broadcast_filter
- Broadcast_filter U_Broadcast_filter
- (.Reset (Reset ),
- .Clk (Clk ),
- //MAC_rx_ctrl (//MAC_rx_ctrl ),
- .broadcast_ptr (broadcast_ptr ),
- .broadcast_drop (broadcast_drop ),
- //FromCPU (//FromCPU ),
- .broadcast_filter_en (broadcast_filter_en ),
- .broadcast_bucket_depth (broadcast_bucket_depth ),
- .broadcast_bucket_interval (broadcast_bucket_interval )
- );
- end // block: broadcast_filter
- else
- begin : no_broadcast_filter
- assign broadcast_drop=0;
- end
- endgenerate
+ Broadcast_filter U_Broadcast_filter
+ (.Reset (Reset ),
+ .Clk (Clk ),
+ //MAC_rx_ctrl (//MAC_rx_ctrl ),
+ .broadcast_ptr (broadcast_ptr ),
+ .broadcast_drop (broadcast_drop ),
+ //FromCPU (//FromCPU ),
+ .broadcast_filter_en (broadcast_filter_en ),
+ .broadcast_bucket_depth (broadcast_bucket_depth ),
+ .broadcast_bucket_interval (broadcast_bucket_interval )
+ );
CRC_chk U_CRC_chk(
.Reset (Reset ),
@@ -228,27 +217,18 @@
.CRC_err (CRC_err )
);
- generate
- if(TARGET_CHECK)
- begin : target_check
- MAC_rx_add_chk U_MAC_rx_add_chk
- (.Reset (Reset ),
- .Clk (Clk ),
- .Init (CRC_init ),
- .data (MAC_add_data ),
- .MAC_add_en (MAC_add_en ),
- .MAC_rx_add_chk_err (MAC_rx_add_chk_err ),
- //From CPU (//From CPU ),
- .MAC_rx_add_chk_en (MAC_rx_add_chk_en ),
- .MAC_add_prom_data (MAC_add_prom_data ),
- .MAC_add_prom_add (MAC_add_prom_add ),
- .MAC_add_prom_wr (MAC_add_prom_wr )
- );
- end // block: target_check
- else
- begin : no_target_check
- assign MAC_rx_add_chk_err=0;
- end
- endgenerate
+ MAC_rx_add_chk U_MAC_rx_add_chk
+ (.Reset (Reset ),
+ .Clk (Clk ),
+ .Init (CRC_init ),
+ .data (MAC_add_data ),
+ .MAC_add_en (MAC_add_en ),
+ .MAC_rx_add_chk_err (MAC_rx_add_chk_err ),
+ //From CPU (//From CPU ),
+ .MAC_rx_add_chk_en (MAC_rx_add_chk_en ),
+ .MAC_add_prom_data (MAC_add_prom_data ),
+ .MAC_add_prom_add (MAC_add_prom_add ),
+ .MAC_add_prom_wr (MAC_add_prom_wr )
+ );
endmodule // MAC_rx
Modified: gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_top.v
===================================================================
--- gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_top.v
2007-10-03 04:33:38 UTC (rev 6577)
+++ gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_top.v
2007-10-03 04:58:51 UTC (rev 6578)
@@ -52,10 +52,7 @@
module MAC_top
#(parameter TX_FF_DEPTH = 9,
- parameter RX_FF_DEPTH = 9,
- parameter SOURCE_REPLACE = 1,
- parameter BROADCAST_FILTER = 1,
- parameter TARGET_CHECK = 1)
+ parameter RX_FF_DEPTH = 9)
(
// System signals
input Clk_125M,
@@ -208,9 +205,7 @@
// Instantiation of sub-modules
//-------------------------------------------------------------------------
- MAC_rx #(.RX_FF_DEPTH(RX_FF_DEPTH),
- .BROADCAST_FILTER(BROADCAST_FILTER),
- .TARGET_CHECK(TARGET_CHECK))
+ MAC_rx #(.RX_FF_DEPTH(RX_FF_DEPTH))
U_MAC_rx(
.Reset ( Reset ),
.Clk_user ( Clk_user ),
@@ -258,8 +253,7 @@
.Rx_pkt_type_rmon ( Rx_pkt_type_rmon )
);
- MAC_tx #(.TX_FF_DEPTH(TX_FF_DEPTH),
- .SOURCE_REPLACE(SOURCE_REPLACE))
+ MAC_tx #(.TX_FF_DEPTH(TX_FF_DEPTH))
U_MAC_tx(
.Reset ( Reset ),
.Clk ( MAC_tx_clk_div ),
Modified: gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_tx.v
===================================================================
--- gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_tx.v
2007-10-03 04:33:38 UTC (rev 6577)
+++ gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_tx.v
2007-10-03 04:58:51 UTC (rev 6578)
@@ -54,9 +54,8 @@
//
module MAC_tx
- #(parameter TX_FF_DEPTH = 9,
- parameter SOURCE_REPLACE = 0)
- (
+ #(parameter TX_FF_DEPTH = 9)
+ (
input Reset ,
input Clk ,
input Clk_user ,
@@ -217,26 +216,17 @@
.xon_gen_complete (xon_gen_complete )
);
- generate
- if(SOURCE_REPLACE)
- begin : source_replace
- MAC_tx_addr_add U_MAC_tx_addr_add
- (.Reset (Reset ),
- .Clk (Clk ),
- .MAC_tx_addr_rd (MAC_tx_addr_rd ),
- .MAC_tx_addr_init (MAC_tx_addr_init ),
- .MAC_tx_addr_data (MAC_tx_addr_data ),
- //CPU (//CPU ),
- .MAC_add_prom_data (MAC_add_prom_data ),
- .MAC_add_prom_add (MAC_add_prom_add ),
- .MAC_add_prom_wr (MAC_add_prom_wr )
- );
- end // block: source_replace
- else
- begin : no_source_replace
- assign MAC_tx_addr_data=0;
- end
- endgenerate
+ MAC_tx_addr_add U_MAC_tx_addr_add
+ (.Reset (Reset ),
+ .Clk (Clk ),
+ .MAC_tx_addr_rd (MAC_tx_addr_rd ),
+ .MAC_tx_addr_init (MAC_tx_addr_init ),
+ .MAC_tx_addr_data (MAC_tx_addr_data ),
+ //CPU (//CPU ),
+ .MAC_add_prom_data (MAC_add_prom_data ),
+ .MAC_add_prom_add (MAC_add_prom_add ),
+ .MAC_add_prom_wr (MAC_add_prom_wr )
+ );
MAC_tx_FF #(.TX_FF_DEPTH(TX_FF_DEPTH)) U_MAC_tx_FF(
.Reset (Reset ),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6578 - gnuradio/branches/developers/matt/u2f/eth/rtl/verilog,
matt <=