[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6572 - gnuradio/branches/developers/matt/u2f/eth/rtl/
|
From: |
matt |
|
Subject: |
[Commit-gnuradio] r6572 - gnuradio/branches/developers/matt/u2f/eth/rtl/verilog |
|
Date: |
Tue, 2 Oct 2007 02:47:55 -0600 (MDT) |
Author: matt
Date: 2007-10-02 02:47:54 -0600 (Tue, 02 Oct 2007)
New Revision: 6572
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:
parameterized remaining ifdefs
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-02 07:55:40 UTC (rev 6571)
+++ gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_rx.v
2007-10-02 08:47:54 UTC (rev 6572)
@@ -53,10 +53,10 @@
// no message
//
-`include "header.vh"
-
module MAC_rx
-#(parameter RX_FF_DEPTH = 9)
+ #(parameter RX_FF_DEPTH = 9,
+ parameter BROADCAST_FILTER = 0,
+ parameter TARGET_CHECK = 0)
(
input Reset ,
input Clk_user,
@@ -196,22 +196,27 @@
.Rx_mac_eop (Rx_mac_eop )
);
-`ifdef MAC_BROADCAST_FILTER_EN
-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 )
-);
-`else
-assign broadcast_drop=0;
-`endif
-
+ 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
+
CRC_chk U_CRC_chk(
.Reset (Reset ),
.Clk (Clk ),
@@ -222,25 +227,28 @@
.CRC_chk_en (CRC_chk_en ),
.CRC_err (CRC_err )
);
-
-`ifdef MAC_TARGET_CHECK_EN
-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 )
-);
-`else
-assign MAC_rx_add_chk_err=0;
-`endif
-
-
-
-endmodule
+
+ 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
+
+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-02 07:55:40 UTC (rev 6571)
+++ gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_top.v
2007-10-02 08:47:54 UTC (rev 6572)
@@ -52,7 +52,10 @@
module MAC_top
#(parameter TX_FF_DEPTH = 9,
- parameter RX_FF_DEPTH = 9)
+ parameter RX_FF_DEPTH = 9,
+ parameter SOURCE_REPLACE = 1,
+ parameter BROADCAST_FILTER = 1,
+ parameter TARGET_CHECK = 1)
(
// System signals
input Clk_125M,
@@ -205,7 +208,10 @@
// Instantiation of sub-modules
//-------------------------------------------------------------------------
- MAC_rx U_MAC_rx(
+ MAC_rx #(.RX_FF_DEPTH(RX_FF_DEPTH),
+ .BROADCAST_FILTER(BROADCAST_FILTER),
+ .TARGET_CHECK(TARGET_CHECK))
+ U_MAC_rx(
.Reset ( Reset ),
.Clk_user ( Clk_user ),
.Clk ( MAC_rx_clk_div ),
@@ -252,7 +258,9 @@
.Rx_pkt_type_rmon ( Rx_pkt_type_rmon )
);
- MAC_tx U_MAC_tx(
+ MAC_tx #(.TX_FF_DEPTH(TX_FF_DEPTH),
+ .SOURCE_REPLACE(SOURCE_REPLACE))
+ U_MAC_tx(
.Reset ( Reset ),
.Clk ( MAC_tx_clk_div ),
.Clk_user ( Clk_user ),
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-02 07:55:40 UTC (rev 6571)
+++ gnuradio/branches/developers/matt/u2f/eth/rtl/verilog/MAC_tx.v
2007-10-02 08:47:54 UTC (rev 6572)
@@ -53,10 +53,9 @@
// no message
//
-`include "header.vh"
-
module MAC_tx
-#(parameter TX_FF_DEPTH = 9)
+ #(parameter TX_FF_DEPTH = 9,
+ parameter SOURCE_REPLACE = 0)
(
input Reset ,
input Clk ,
@@ -218,21 +217,27 @@
.xon_gen_complete (xon_gen_complete )
);
-`ifdef MAC_SOURCE_REPLACE_EN
-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 )
-);
-`else
-assign MAC_tx_addr_data=0;
-`endif
+ 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_FF #(.TX_FF_DEPTH(TX_FF_DEPTH)) U_MAC_tx_FF(
.Reset (Reset ),
.Clk_MAC (Clk ),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6572 - gnuradio/branches/developers/matt/u2f/eth/rtl/verilog,
matt <=