Merge branch 'master' into sync

Conflicts:
	gr-utils/src/python/gr_plot_qt.py
	gr-utils/src/python/pyqt_plot.py
	gr-utils/src/python/pyqt_plot.ui

1 files changed, 0 insertions, 31 deletions

diff --git a/usrp2/fpga/control_lib/fifo_writer.v b/usrp2/fpga/control_lib/fifo_writer.v
deleted file mode 100644
index 064ad3cb9..000000000
--- a/usrp2/fpga/control_lib/fifo_writer.v
+++ /dev/null
@@ -1,31 +0,0 @@
-
-module fifo_writer
-  #(parameter rate=4)
-    (input clk,
-     output [31:0] data_out,
-     output write_o,
-     input ready_i,
-     input done_i
-     );
-   
-   reg [7:0] state = 0;
-
-
-   // FIXME change this to write
-   always @(posedge clk)
-     if(ready)
-       if(state == rate)
-	 state <= 0;
-       else
-	 state <= state + 1;
-     else
-       state <= 0;
-
-   assign    read = (state == rate);
-
-   initial $monitor(data_in);
-   
-endmodule // fifo_writer
-
-
-