[Commit-gnuradio] r7146 - in usrp2/trunk/fpga/eth/rtl/verilog: MAC_rx MAC_tx TECH

[matt]

Author: matt
Date: 2007-12-12 22:42:52 -0700 (Wed, 12 Dec 2007)
New Revision: 7146

Removed:
   usrp2/trunk/fpga/eth/rtl/verilog/TECH/duram.v
Modified:
   usrp2/trunk/fpga/eth/rtl/verilog/MAC_rx/MAC_rx_FF.v
   usrp2/trunk/fpga/eth/rtl/verilog/MAC_tx/MAC_tx_FF.v
Log:
removed unworking vendor-specific ram wrappers, use inferred rams instead


Modified: usrp2/trunk/fpga/eth/rtl/verilog/MAC_rx/MAC_rx_FF.v
===================================================================
--- usrp2/trunk/fpga/eth/rtl/verilog/MAC_rx/MAC_rx_FF.v 2007-12-13 05:10:13 UTC 
(rev 7145)
+++ usrp2/trunk/fpga/eth/rtl/verilog/MAC_rx/MAC_rx_FF.v 2007-12-13 05:42:52 UTC 
(rev 7146)
@@ -700,20 +700,10 @@
         Rx_mac_sop         <= Rx_mac_sop_tmp_dl1;
       end
 
-  //-------------------------------------------------------------------------
+   // Instantiation of dual-ported RAM
+   ram_2port #(.DWIDTH(36),.AWIDTH(RX_FF_DEPTH)) mac_rx_ff_ram
+     (.clka(Clk_MAC),.ena(1'b1),.wea(Wr_en),.addra(Add_wr),.dia(Din),.doa(),
+      
.clkb(Clk_SYS),.enb(1'b1),.web(1'b0),.addrb(Add_rd),.dib(36'b0),.dob(Dout) );
 
-  // Instantiation of dual-ported RAM
-  duram #(36, RX_FF_DEPTH, "M4K") U_duram(
-    .data_a   ( Din     ),
-    .data_b   ( 36'b0   ),
-    .wren_a   ( Wr_en   ),
-    .wren_b   ( 1'b0    ),
-    .address_a( Add_wr  ),
-    .address_b( Add_rd  ),
-    .clock_a  ( Clk_MAC ),
-    .clock_b  ( Clk_SYS ),
-    .q_a      (),
-    .q_b      ( Dout    )
-  );
+endmodule // MAC_rx_FF
 
-endmodule

Modified: usrp2/trunk/fpga/eth/rtl/verilog/MAC_tx/MAC_tx_FF.v
===================================================================
--- usrp2/trunk/fpga/eth/rtl/verilog/MAC_tx/MAC_tx_FF.v 2007-12-13 05:10:13 UTC 
(rev 7145)
+++ usrp2/trunk/fpga/eth/rtl/verilog/MAC_tx/MAC_tx_FF.v 2007-12-13 05:42:52 UTC 
(rev 7146)
@@ -795,21 +795,10 @@
     Fifo_eop = 1;
   else
     Fifo_eop = 0;
-
-//******************************************************************************
-//******************************************************************************
-
-duram #(36,TX_FF_DEPTH,"M4K") U_duram(           
-  .data_a   ( Din     ),
-  .data_b   ( 36'b0   ),
-  .wren_a   ( Wr_en   ),
-  .wren_b   ( 1'b0    ),
-  .address_a( Add_wr  ),
-  .address_b( Add_rd  ),
-  .clock_a  ( Clk_SYS ),
-  .clock_b  ( Clk_MAC ),
-  .q_a      (),
-  .q_b      ( Dout    )
-);
-
-endmodule
+   
+   // Dual port RAM for FIFO
+   ram_2port #(.DWIDTH(36),.AWIDTH(TX_FF_DEPTH)) mac_tx_ff_ram
+     (.clka(Clk_SYS),.ena(1'b1),.wea(Wr_en),.addra(Add_wr),.dia(Din),.doa(),
+      
.clkb(Clk_MAC),.enb(1'b1),.web(1'b0),.addrb(Add_rd),.dib(36'b0),.dob(Dout) );
+   
+endmodule // MAC_tx_FF

Deleted: usrp2/trunk/fpga/eth/rtl/verilog/TECH/duram.v