Removed copy of FPGA source files.

5 files changed, 0 insertions, 968 deletions

diff --git a/fpga/usrp2/opencores/spi/rtl/verilog/spi_clgen.v b/fpga/usrp2/opencores/spi/rtl/verilog/spi_clgen.v
deleted file mode 100644
index 2d9c34f40..000000000
--- a/fpga/usrp2/opencores/spi/rtl/verilog/spi_clgen.v
+++ /dev/null
@@ -1,105 +0,0 @@
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-////  spi_clgen.v                                                 ////
-////                                                              ////
-////  This file is part of the SPI IP core project                ////
-////  http://www.opencores.org/projects/spi/                      ////
-////                                                              ////
-////  Author(s):                                                  ////
-////      - Simon Srot (simons@opencores.org)                     ////
-////                                                              ////
-////  All additional information is avaliable in the Readme.txt   ////
-////  file.                                                       ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-//// Copyright (C) 2002 Authors                                   ////
-////                                                              ////
-//// This source file may be used and distributed without         ////
-//// restriction provided that this copyright statement is not    ////
-//// removed from the file and that any derivative work contains  ////
-//// the original copyright notice and the associated disclaimer. ////
-////                                                              ////
-//// This source file is free software; you can redistribute it   ////
-//// and/or modify it under the terms of the GNU Lesser General   ////
-//// Public License as published by the Free Software Foundation; ////
-//// either version 2.1 of the License, or (at your option) any   ////
-//// later version.                                               ////
-////                                                              ////
-//// This source is distributed in the hope that it will be       ////
-//// useful, but WITHOUT ANY WARRANTY; without even the implied   ////
-//// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR      ////
-//// PURPOSE.  See the GNU Lesser General Public License for more ////
-//// details.                                                     ////
-////                                                              ////
-//// You should have received a copy of the GNU Lesser General    ////
-//// Public License along with this source; if not, download it   ////
-//// from http://www.opencores.org/lgpl.shtml                     ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-
-`include "spi_defines.v"
-
-module spi_clgen (clk_in, rst, go, enable, last_clk, divider, clk_out, pos_edge, neg_edge); 
-
-  input                            clk_in;   // input clock (system clock)
-  input                            rst;      // reset
-  input                            enable;   // clock enable
-  input                            go;       // start transfer
-  input                            last_clk; // last clock
-  input     [`SPI_DIVIDER_LEN-1:0] divider;  // clock divider (output clock is divided by this value)
-  output                           clk_out;  // output clock
-  output                           pos_edge; // pulse marking positive edge of clk_out
-  output                           neg_edge; // pulse marking negative edge of clk_out
-                            
-  reg                              clk_out;
-  reg                              pos_edge;
-  reg                              neg_edge;
-                            
-  reg       [`SPI_DIVIDER_LEN-1:0] cnt;      // clock counter 
-  wire                             cnt_zero; // conter is equal to zero
-  wire                             cnt_one;  // conter is equal to one
-  
-  
-  assign cnt_zero = cnt == {`SPI_DIVIDER_LEN{1'b0}};
-  assign cnt_one  = cnt == {{`SPI_DIVIDER_LEN-1{1'b0}}, 1'b1};
-  
-  // Counter counts half period
-  always @(posedge clk_in)
-  begin
-    if(rst)
-      cnt <= {`SPI_DIVIDER_LEN{1'b1}};
-    else
-      begin
-        if(!enable || cnt_zero)
-          cnt <= divider;
-        else
-          cnt <= cnt - {{`SPI_DIVIDER_LEN-1{1'b0}}, 1'b1};
-      end
-  end
-  
-  // clk_out is asserted every other half period
-  always @(posedge clk_in)
-  begin
-    if(rst)
-      clk_out <= 1'b0;
-    else
-      clk_out <= (enable && cnt_zero && (!last_clk || clk_out)) ? ~clk_out : clk_out;
-  end
-   
-  // Pos and neg edge signals
-  always @(posedge clk_in)
-  begin
-    if(rst)
-      begin
-        pos_edge  <= 1'b0;
-        neg_edge  <= 1'b0;
-      end
-    else
-      begin
-        pos_edge  <= (enable && !clk_out && cnt_one) || (!(|divider) && clk_out) || (!(|divider) && go && !enable);
-        neg_edge  <= (enable && clk_out && cnt_one) || (!(|divider) && !clk_out && enable);
-      end
-  end
-endmodule
- 
diff --git a/fpga/usrp2/opencores/spi/rtl/verilog/spi_defines.v b/fpga/usrp2/opencores/spi/rtl/verilog/spi_defines.v
deleted file mode 100644
index 3e4dd0e3c..000000000
--- a/fpga/usrp2/opencores/spi/rtl/verilog/spi_defines.v
+++ /dev/null
@@ -1,159 +0,0 @@
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-////  spi_define.v                                                ////
-////                                                              ////
-////  This file is part of the SPI IP core project                ////
-////  http://www.opencores.org/projects/spi/                      ////
-////                                                              ////
-////  Author(s):                                                  ////
-////      - Simon Srot (simons@opencores.org)                     ////
-////                                                              ////
-////  All additional information is avaliable in the Readme.txt   ////
-////  file.                                                       ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-//// Copyright (C) 2002 Authors                                   ////
-////                                                              ////
-//// This source file may be used and distributed without         ////
-//// restriction provided that this copyright statement is not    ////
-//// removed from the file and that any derivative work contains  ////
-//// the original copyright notice and the associated disclaimer. ////
-////                                                              ////
-//// This source file is free software; you can redistribute it   ////
-//// and/or modify it under the terms of the GNU Lesser General   ////
-//// Public License as published by the Free Software Foundation; ////
-//// either version 2.1 of the License, or (at your option) any   ////
-//// later version.                                               ////
-////                                                              ////
-//// This source is distributed in the hope that it will be       ////
-//// useful, but WITHOUT ANY WARRANTY; without even the implied   ////
-//// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR      ////
-//// PURPOSE.  See the GNU Lesser General Public License for more ////
-//// details.                                                     ////
-////                                                              ////
-//// You should have received a copy of the GNU Lesser General    ////
-//// Public License along with this source; if not, download it   ////
-//// from http://www.opencores.org/lgpl.shtml                     ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-
-//
-// Number of bits used for devider register. If used in system with
-// low frequency of system clock this can be reduced.
-// Use SPI_DIVIDER_LEN for fine tuning theexact number.
-//
-`define SPI_DIVIDER_LEN_8
-//`define SPI_DIVIDER_LEN_16
-//`define SPI_DIVIDER_LEN_24
-//`define SPI_DIVIDER_LEN_32
-
-`ifdef SPI_DIVIDER_LEN_8
-  `define SPI_DIVIDER_LEN       8    // Can be set from 1 to 8
-`endif                                                          
-`ifdef SPI_DIVIDER_LEN_16                                       
-  `define SPI_DIVIDER_LEN       16   // Can be set from 9 to 16
-`endif                                                          
-`ifdef SPI_DIVIDER_LEN_24                                       
-  `define SPI_DIVIDER_LEN       24   // Can be set from 17 to 24
-`endif                                                          
-`ifdef SPI_DIVIDER_LEN_32                                       
-  `define SPI_DIVIDER_LEN       32   // Can be set from 25 to 32 
-`endif
-
-//
-// Maximum nuber of bits that can be send/received at once. 
-// Use SPI_MAX_CHAR for fine tuning the exact number, when using
-// SPI_MAX_CHAR_32, SPI_MAX_CHAR_24, SPI_MAX_CHAR_16, SPI_MAX_CHAR_8.
-//
-`define SPI_MAX_CHAR_128
-//`define SPI_MAX_CHAR_64
-//`define SPI_MAX_CHAR_32
-//`define SPI_MAX_CHAR_24
-//`define SPI_MAX_CHAR_16
-//`define SPI_MAX_CHAR_8
-
-`ifdef SPI_MAX_CHAR_128
-  `define SPI_MAX_CHAR          128  // Can only be set to 128 
-  `define SPI_CHAR_LEN_BITS     7
-`endif
-`ifdef SPI_MAX_CHAR_64
-  `define SPI_MAX_CHAR          64   // Can only be set to 64 
-  `define SPI_CHAR_LEN_BITS     6
-`endif
-`ifdef SPI_MAX_CHAR_32
-  `define SPI_MAX_CHAR          32   // Can be set from 25 to 32 
-  `define SPI_CHAR_LEN_BITS     5
-`endif
-`ifdef SPI_MAX_CHAR_24
-  `define SPI_MAX_CHAR          24   // Can be set from 17 to 24 
-  `define SPI_CHAR_LEN_BITS     5
-`endif
-`ifdef SPI_MAX_CHAR_16
-  `define SPI_MAX_CHAR          16   // Can be set from 9 to 16 
-  `define SPI_CHAR_LEN_BITS     4
-`endif
-`ifdef SPI_MAX_CHAR_8
-  `define SPI_MAX_CHAR          8    // Can be set from 1 to 8 
-  `define SPI_CHAR_LEN_BITS     3
-`endif
-
-//
-// Number of device select signals. Use SPI_SS_NB for fine tuning the 
-// exact number.
-//
-//`define SPI_SS_NB_8
-`define SPI_SS_NB_16
-//`define SPI_SS_NB_24
-//`define SPI_SS_NB_32
-
-`ifdef SPI_SS_NB_8
-  `define SPI_SS_NB             8    // Can be set from 1 to 8
-`endif
-`ifdef SPI_SS_NB_16
-  `define SPI_SS_NB             16   // Can be set from 9 to 16
-`endif
-`ifdef SPI_SS_NB_24
-  `define SPI_SS_NB             24   // Can be set from 17 to 24
-`endif
-`ifdef SPI_SS_NB_32
-  `define SPI_SS_NB             32   // Can be set from 25 to 32
-`endif
-
-//
-// Bits of WISHBONE address used for partial decoding of SPI registers.
-//
-`define SPI_OFS_BITS	          4:2
-
-//
-// Register offset
-//
-`define SPI_RX_0                0
-`define SPI_RX_1                1
-`define SPI_RX_2                2
-`define SPI_RX_3                3
-`define SPI_TX_0                0
-`define SPI_TX_1                1
-`define SPI_TX_2                2
-`define SPI_TX_3                3
-`define SPI_CTRL                4
-`define SPI_DIVIDE              5
-`define SPI_SS                  6
-
-//
-// Number of bits in ctrl register
-//
-`define SPI_CTRL_BIT_NB         14
-
-//
-// Control register bit position
-//
-`define SPI_CTRL_ASS            13
-`define SPI_CTRL_IE             12
-`define SPI_CTRL_LSB            11
-`define SPI_CTRL_TX_NEGEDGE     10
-`define SPI_CTRL_RX_NEGEDGE     9
-`define SPI_CTRL_GO             8
-`define SPI_CTRL_RES_1          7
-`define SPI_CTRL_CHAR_LEN       6:0
-
diff --git a/fpga/usrp2/opencores/spi/rtl/verilog/spi_shift.v b/fpga/usrp2/opencores/spi/rtl/verilog/spi_shift.v
deleted file mode 100644
index ac3bb3f48..000000000
--- a/fpga/usrp2/opencores/spi/rtl/verilog/spi_shift.v
+++ /dev/null
@@ -1,235 +0,0 @@
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-////  spi_shift.v                                                 ////
-////                                                              ////
-////  This file is part of the SPI IP core project                ////
-////  http://www.opencores.org/projects/spi/                      ////
-////                                                              ////
-////  Author(s):                                                  ////
-////      - Simon Srot (simons@opencores.org)                     ////
-////                                                              ////
-////  All additional information is avaliable in the Readme.txt   ////
-////  file.                                                       ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-//// Copyright (C) 2002 Authors                                   ////
-////                                                              ////
-//// This source file may be used and distributed without         ////
-//// restriction provided that this copyright statement is not    ////
-//// removed from the file and that any derivative work contains  ////
-//// the original copyright notice and the associated disclaimer. ////
-////                                                              ////
-//// This source file is free software; you can redistribute it   ////
-//// and/or modify it under the terms of the GNU Lesser General   ////
-//// Public License as published by the Free Software Foundation; ////
-//// either version 2.1 of the License, or (at your option) any   ////
-//// later version.                                               ////
-////                                                              ////
-//// This source is distributed in the hope that it will be       ////
-//// useful, but WITHOUT ANY WARRANTY; without even the implied   ////
-//// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR      ////
-//// PURPOSE.  See the GNU Lesser General Public License for more ////
-//// details.                                                     ////
-////                                                              ////
-//// You should have received a copy of the GNU Lesser General    ////
-//// Public License along with this source; if not, download it   ////
-//// from http://www.opencores.org/lgpl.shtml                     ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-
-`include "spi_defines.v"
-
-module spi_shift (clk, rst, latch, byte_sel, len, lsb, go,
-                  pos_edge, neg_edge, rx_negedge, tx_negedge,
-                  tip, last, 
-                  p_in, p_out, s_clk, s_in, s_out);
-
-  input                          clk;          // system clock
-  input                          rst;          // reset
-  input                    [3:0] latch;        // latch signal for storing the data in shift register
-  input                    [3:0] byte_sel;     // byte select signals for storing the data in shift register
-  input [`SPI_CHAR_LEN_BITS-1:0] len;          // data len in bits (minus one)
-  input                          lsb;          // lbs first on the line
-  input                          go;           // start stansfer
-  input                          pos_edge;     // recognize posedge of sclk
-  input                          neg_edge;     // recognize negedge of sclk
-  input                          rx_negedge;   // s_in is sampled on negative edge 
-  input                          tx_negedge;   // s_out is driven on negative edge
-  output                         tip;          // transfer in progress
-  output                         last;         // last bit
-  input                   [31:0] p_in;         // parallel in
-  output     [`SPI_MAX_CHAR-1:0] p_out;        // parallel out
-  input                          s_clk;        // serial clock
-  input                          s_in;         // serial in
-  output                         s_out;        // serial out
-                                               
-  reg                            s_out;        
-  reg                            tip;
-                              
-  reg     [`SPI_CHAR_LEN_BITS:0] cnt;          // data bit count
-  reg        [`SPI_MAX_CHAR-1:0] data;         // shift register
-  wire    [`SPI_CHAR_LEN_BITS:0] tx_bit_pos;   // next bit position
-  wire    [`SPI_CHAR_LEN_BITS:0] rx_bit_pos;   // next bit position
-  wire                           rx_clk;       // rx clock enable
-  wire                           tx_clk;       // tx clock enable
-  
-  assign p_out = data;
-  
-  assign tx_bit_pos = lsb ? {!(|len), len} - cnt : cnt - {{`SPI_CHAR_LEN_BITS{1'b0}},1'b1};
-  assign rx_bit_pos = lsb ? {!(|len), len} - (rx_negedge ? cnt + {{`SPI_CHAR_LEN_BITS{1'b0}},1'b1} : cnt) : 
-                            (rx_negedge ? cnt : cnt - {{`SPI_CHAR_LEN_BITS{1'b0}},1'b1});
-  
-  assign last = !(|cnt);
-  
-  assign rx_clk = (rx_negedge ? neg_edge : pos_edge) && (!last || s_clk);
-  assign tx_clk = (tx_negedge ? neg_edge : pos_edge) && !last;
-  
-  // Character bit counter
-  always @(posedge clk)
-  begin
-    if(rst)
-      cnt <= {`SPI_CHAR_LEN_BITS+1{1'b0}};
-    else
-      begin
-        if(tip)
-          cnt <= pos_edge ? (cnt - {{`SPI_CHAR_LEN_BITS{1'b0}}, 1'b1}) : cnt;
-        else
-          cnt <= !(|len) ? {1'b1, {`SPI_CHAR_LEN_BITS{1'b0}}} : {1'b0, len};
-      end
-  end
-  
-  // Transfer in progress
-  always @(posedge clk)
-  begin
-    if(rst)
-      tip <= 1'b0;
-  else if(go && ~tip)
-    tip <= 1'b1;
-  else if(tip && last && pos_edge)
-    tip <= 1'b0;
-  end
-  
-  // Sending bits to the line
-  always @(posedge clk)
-  begin
-    if (rst)
-      s_out   <= 1'b0;
-    else
-      s_out <= (tx_clk || !tip) ? data[tx_bit_pos[`SPI_CHAR_LEN_BITS-1:0]] : s_out;
-  end
-  
-  // Receiving bits from the line
-  always @(posedge clk)
-  begin
-    if (rst)
-      data   <= {`SPI_MAX_CHAR{1'b0}};
-`ifdef SPI_MAX_CHAR_128
-    else if (latch[0] && !tip)
-      begin
-        if (byte_sel[3])
-          data[31:24] <= p_in[31:24];
-        if (byte_sel[2])
-          data[23:16] <= p_in[23:16];
-        if (byte_sel[1])
-          data[15:8] <= p_in[15:8];
-        if (byte_sel[0])
-          data[7:0] <= p_in[7:0];
-      end
-    else if (latch[1] && !tip)
-      begin
-        if (byte_sel[3])
-          data[63:56] <= p_in[31:24];
-        if (byte_sel[2])
-          data[55:48] <= p_in[23:16];
-        if (byte_sel[1])
-          data[47:40] <= p_in[15:8];
-        if (byte_sel[0])
-          data[39:32] <= p_in[7:0];
-      end
-    else if (latch[2] && !tip)
-      begin
-        if (byte_sel[3])
-          data[95:88] <= p_in[31:24];
-        if (byte_sel[2])
-          data[87:80] <= p_in[23:16];
-        if (byte_sel[1])
-          data[79:72] <= p_in[15:8];
-        if (byte_sel[0])
-          data[71:64] <= p_in[7:0];
-      end
-    else if (latch[3] && !tip)
-      begin
-        if (byte_sel[3])
-          data[127:120] <= p_in[31:24];
-        if (byte_sel[2])
-          data[119:112] <= p_in[23:16];
-        if (byte_sel[1])
-          data[111:104] <= p_in[15:8];
-        if (byte_sel[0])
-          data[103:96] <= p_in[7:0];
-      end
-`else
-`ifdef SPI_MAX_CHAR_64
-    else if (latch[0] && !tip)
-      begin
-        if (byte_sel[3])
-          data[31:24] <= p_in[31:24];
-        if (byte_sel[2])
-          data[23:16] <= p_in[23:16];
-        if (byte_sel[1])
-          data[15:8] <= p_in[15:8];
-        if (byte_sel[0])
-          data[7:0] <= p_in[7:0];
-      end
-    else if (latch[1] && !tip)
-      begin
-        if (byte_sel[3])
-          data[63:56] <= p_in[31:24];
-        if (byte_sel[2])
-          data[55:48] <= p_in[23:16];
-        if (byte_sel[1])
-          data[47:40] <= p_in[15:8];
-        if (byte_sel[0])
-          data[39:32] <= p_in[7:0];
-      end
-`else
-    else if (latch[0] && !tip)
-      begin
-      `ifdef SPI_MAX_CHAR_8
-        if (byte_sel[0])
-          data[`SPI_MAX_CHAR-1:0] <= p_in[`SPI_MAX_CHAR-1:0];
-      `endif
-      `ifdef SPI_MAX_CHAR_16
-        if (byte_sel[0])
-          data[7:0] <= p_in[7:0];
-        if (byte_sel[1])
-          data[`SPI_MAX_CHAR-1:8] <= p_in[`SPI_MAX_CHAR-1:8];
-      `endif
-      `ifdef SPI_MAX_CHAR_24
-        if (byte_sel[0])
-          data[7:0] <= p_in[7:0];
-        if (byte_sel[1])
-          data[15:8] <= p_in[15:8];
-        if (byte_sel[2])
-          data[`SPI_MAX_CHAR-1:16] <= p_in[`SPI_MAX_CHAR-1:16];
-      `endif
-      `ifdef SPI_MAX_CHAR_32
-        if (byte_sel[0])
-          data[7:0] <= p_in[7:0];
-        if (byte_sel[1])
-          data[15:8] <= p_in[15:8];
-        if (byte_sel[2])
-          data[23:16] <= p_in[23:16];
-        if (byte_sel[3])
-          data[`SPI_MAX_CHAR-1:24] <= p_in[`SPI_MAX_CHAR-1:24];
-      `endif
-      end
-`endif
-`endif
-    else
-      data[rx_bit_pos[`SPI_CHAR_LEN_BITS-1:0]] <= rx_clk ? s_in : data[rx_bit_pos[`SPI_CHAR_LEN_BITS-1:0]];
-  end
-  
-endmodule
-
diff --git a/fpga/usrp2/opencores/spi/rtl/verilog/spi_top.v b/fpga/usrp2/opencores/spi/rtl/verilog/spi_top.v
deleted file mode 100644
index 8289449a9..000000000
--- a/fpga/usrp2/opencores/spi/rtl/verilog/spi_top.v
+++ /dev/null
@@ -1,287 +0,0 @@
-
-// Modified 2010 by Matt Ettus to remove old verilog style
-
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-////  spi_top.v                                                   ////
-////                                                              ////
-////  This file is part of the SPI IP core project                ////
-////  http://www.opencores.org/projects/spi/                      ////
-////                                                              ////
-////  Author(s):                                                  ////
-////      - Simon Srot (simons@opencores.org)                     ////
-////                                                              ////
-////  All additional information is avaliable in the Readme.txt   ////
-////  file.                                                       ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-//// Copyright (C) 2002 Authors                                   ////
-////                                                              ////
-//// This source file may be used and distributed without         ////
-//// restriction provided that this copyright statement is not    ////
-//// removed from the file and that any derivative work contains  ////
-//// the original copyright notice and the associated disclaimer. ////
-////                                                              ////
-//// This source file is free software; you can redistribute it   ////
-//// and/or modify it under the terms of the GNU Lesser General   ////
-//// Public License as published by the Free Software Foundation; ////
-//// either version 2.1 of the License, or (at your option) any   ////
-//// later version.                                               ////
-////                                                              ////
-//// This source is distributed in the hope that it will be       ////
-//// useful, but WITHOUT ANY WARRANTY; without even the implied   ////
-//// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR      ////
-//// PURPOSE.  See the GNU Lesser General Public License for more ////
-//// details.                                                     ////
-////                                                              ////
-//// You should have received a copy of the GNU Lesser General    ////
-//// Public License along with this source; if not, download it   ////
-//// from http://www.opencores.org/lgpl.shtml                     ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-
-
-`include "spi_defines.v"
-
-module spi_top
-(
-  // Wishbone signals
-  wb_clk_i, wb_rst_i, wb_adr_i, wb_dat_i, wb_dat_o, wb_sel_i,
-  wb_we_i, wb_stb_i, wb_cyc_i, wb_ack_o, wb_err_o, wb_int_o,
-
-  // SPI signals
-  ss_pad_o, sclk_pad_o, mosi_pad_o, miso_pad_i
-);
-
-  // Wishbone signals
-  input                            wb_clk_i;         // master clock input
-  input                            wb_rst_i;         // synchronous active high reset
-  input                      [4:0] wb_adr_i;         // lower address bits
-  input                   [32-1:0] wb_dat_i;         // databus input
-  output                  [32-1:0] wb_dat_o;         // databus output
-  input                      [3:0] wb_sel_i;         // byte select inputs
-  input                            wb_we_i;          // write enable input
-  input                            wb_stb_i;         // stobe/core select signal
-  input                            wb_cyc_i;         // valid bus cycle input
-  output                           wb_ack_o;         // bus cycle acknowledge output
-  output                           wb_err_o;         // termination w/ error
-  output                           wb_int_o;         // interrupt request signal output
-                                                     
-  // SPI signals                                     
-  output          [`SPI_SS_NB-1:0] ss_pad_o;         // slave select
-  output                           sclk_pad_o;       // serial clock
-  output                           mosi_pad_o;       // master out slave in
-  input                            miso_pad_i;       // master in slave out
-                                                     
-  reg                     [32-1:0] wb_dat_o;
-  reg                              wb_ack_o;
-  reg                              wb_int_o;
-                                               
-  // Internal signals
-  reg       [`SPI_DIVIDER_LEN-1:0] divider;          // Divider register
-  reg       [`SPI_CTRL_BIT_NB-1:0] ctrl;             // Control and status register
-  reg             [`SPI_SS_NB-1:0] ss;               // Slave select register
-  reg                     [32-1:0] wb_dat;           // wb data out
-  wire         [`SPI_MAX_CHAR-1:0] rx;               // Rx register
-  wire                             rx_negedge;       // miso is sampled on negative edge
-  wire                             tx_negedge;       // mosi is driven on negative edge
-  wire    [`SPI_CHAR_LEN_BITS-1:0] char_len;         // char len
-  wire                             go;               // go
-  wire                             lsb;              // lsb first on line
-  wire                             ie;               // interrupt enable
-  wire                             ass;              // automatic slave select
-  wire                             spi_divider_sel;  // divider register select
-  wire                             spi_ctrl_sel;     // ctrl register select
-  wire                       [3:0] spi_tx_sel;       // tx_l register select
-  wire                             spi_ss_sel;       // ss register select
-  wire                             tip;              // transfer in progress
-  wire                             pos_edge;         // recognize posedge of sclk
-  wire                             neg_edge;         // recognize negedge of sclk
-  wire                             last_bit;         // marks last character bit
-  
-  // Address decoder
-  assign spi_divider_sel = wb_cyc_i & wb_stb_i & (wb_adr_i[`SPI_OFS_BITS] == `SPI_DIVIDE);
-  assign spi_ctrl_sel    = wb_cyc_i & wb_stb_i & (wb_adr_i[`SPI_OFS_BITS] == `SPI_CTRL);
-  assign spi_tx_sel[0]   = wb_cyc_i & wb_stb_i & (wb_adr_i[`SPI_OFS_BITS] == `SPI_TX_0);
-  assign spi_tx_sel[1]   = wb_cyc_i & wb_stb_i & (wb_adr_i[`SPI_OFS_BITS] == `SPI_TX_1);
-  assign spi_tx_sel[2]   = wb_cyc_i & wb_stb_i & (wb_adr_i[`SPI_OFS_BITS] == `SPI_TX_2);
-  assign spi_tx_sel[3]   = wb_cyc_i & wb_stb_i & (wb_adr_i[`SPI_OFS_BITS] == `SPI_TX_3);
-  assign spi_ss_sel      = wb_cyc_i & wb_stb_i & (wb_adr_i[`SPI_OFS_BITS] == `SPI_SS);
-  
-  // Read from registers
-  always @(wb_adr_i or rx or ctrl or divider or ss)
-  begin
-    case (wb_adr_i[`SPI_OFS_BITS])
-`ifdef SPI_MAX_CHAR_128
-      `SPI_RX_0:    wb_dat = rx[31:0];
-      `SPI_RX_1:    wb_dat = rx[63:32];
-      `SPI_RX_2:    wb_dat = rx[95:64];
-      `SPI_RX_3:    wb_dat = {{128-`SPI_MAX_CHAR{1'b0}}, rx[`SPI_MAX_CHAR-1:96]};
-`else
-`ifdef SPI_MAX_CHAR_64
-      `SPI_RX_0:    wb_dat = rx[31:0];
-      `SPI_RX_1:    wb_dat = {{64-`SPI_MAX_CHAR{1'b0}}, rx[`SPI_MAX_CHAR-1:32]};
-      `SPI_RX_2:    wb_dat = 32'b0;
-      `SPI_RX_3:    wb_dat = 32'b0;
-`else
-      `SPI_RX_0:    wb_dat = {{32-`SPI_MAX_CHAR{1'b0}}, rx[`SPI_MAX_CHAR-1:0]};
-      `SPI_RX_1:    wb_dat = 32'b0;
-      `SPI_RX_2:    wb_dat = 32'b0;
-      `SPI_RX_3:    wb_dat = 32'b0;
-`endif
-`endif
-      `SPI_CTRL:    wb_dat = {{32-`SPI_CTRL_BIT_NB{1'b0}}, ctrl};
-      `SPI_DIVIDE:  wb_dat = {{32-`SPI_DIVIDER_LEN{1'b0}}, divider};
-      `SPI_SS:      wb_dat = {{32-`SPI_SS_NB{1'b0}}, ss};
-      default:      wb_dat = 32'bx;
-    endcase
-  end
-  
-  // Wb data out
-  always @(posedge wb_clk_i)
-  begin
-    if (wb_rst_i)
-      wb_dat_o <= 32'b0;
-    else
-      wb_dat_o <= wb_dat;
-  end
-  
-  // Wb acknowledge
-  always @(posedge wb_clk_i)
-  begin
-    if (wb_rst_i)
-      wb_ack_o <= 1'b0;
-    else
-      wb_ack_o <= wb_cyc_i & wb_stb_i & ~wb_ack_o;
-  end
-  
-  // Wb error
-  assign wb_err_o = 1'b0;
-  
-  // Interrupt
-  always @(posedge wb_clk_i)
-  begin
-    if (wb_rst_i)
-      wb_int_o <= 1'b0;
-    else if (ie && tip && last_bit && pos_edge)
-      wb_int_o <= 1'b1;
-    else if (wb_ack_o)
-      wb_int_o <= 1'b0;
-  end
-  
-  // Divider register
-  always @(posedge wb_clk_i)
-  begin
-    if (wb_rst_i)
-        divider <= {`SPI_DIVIDER_LEN{1'b0}};
-    else if (spi_divider_sel && wb_we_i && !tip)
-      begin
-      `ifdef SPI_DIVIDER_LEN_8
-        if (wb_sel_i[0])
-          divider <= wb_dat_i[`SPI_DIVIDER_LEN-1:0];
-      `endif
-      `ifdef SPI_DIVIDER_LEN_16
-        if (wb_sel_i[0])
-          divider[7:0] <= wb_dat_i[7:0];
-        if (wb_sel_i[1])
-          divider[`SPI_DIVIDER_LEN-1:8] <= wb_dat_i[`SPI_DIVIDER_LEN-1:8];
-      `endif
-      `ifdef SPI_DIVIDER_LEN_24
-        if (wb_sel_i[0])
-          divider[7:0] <= wb_dat_i[7:0];
-        if (wb_sel_i[1])
-          divider[15:8] <= wb_dat_i[15:8];
-        if (wb_sel_i[2])
-          divider[`SPI_DIVIDER_LEN-1:16] <= wb_dat_i[`SPI_DIVIDER_LEN-1:16];
-      `endif
-      `ifdef SPI_DIVIDER_LEN_32
-        if (wb_sel_i[0])
-          divider[7:0] <= wb_dat_i[7:0];
-        if (wb_sel_i[1])
-          divider[15:8] <= wb_dat_i[15:8];
-        if (wb_sel_i[2])
-          divider[23:16] <= wb_dat_i[23:16];
-        if (wb_sel_i[3])
-          divider[`SPI_DIVIDER_LEN-1:24] <= wb_dat_i[`SPI_DIVIDER_LEN-1:24];
-      `endif
-      end
-  end
-  
-  // Ctrl register
-  always @(posedge wb_clk_i)
-  begin
-    if (wb_rst_i)
-      ctrl <= {`SPI_CTRL_BIT_NB{1'b0}};
-    else if(spi_ctrl_sel && wb_we_i && !tip)
-      begin
-        if (wb_sel_i[0])
-          ctrl[7:0] <= wb_dat_i[7:0] | {7'b0, ctrl[0]};
-        if (wb_sel_i[1])
-          ctrl[`SPI_CTRL_BIT_NB-1:8] <= wb_dat_i[`SPI_CTRL_BIT_NB-1:8];
-      end
-    else if(tip && last_bit && pos_edge)
-      ctrl[`SPI_CTRL_GO] <= 1'b0;
-  end
-  
-  assign rx_negedge = ctrl[`SPI_CTRL_RX_NEGEDGE];
-  assign tx_negedge = ctrl[`SPI_CTRL_TX_NEGEDGE];
-  assign go         = ctrl[`SPI_CTRL_GO];
-  assign char_len   = ctrl[`SPI_CTRL_CHAR_LEN];
-  assign lsb        = ctrl[`SPI_CTRL_LSB];
-  assign ie         = ctrl[`SPI_CTRL_IE];
-  assign ass        = ctrl[`SPI_CTRL_ASS];
-  
-  // Slave select register
-  always @(posedge wb_clk_i)
-  begin
-    if (wb_rst_i)
-      ss <= {`SPI_SS_NB{1'b0}};
-    else if(spi_ss_sel && wb_we_i && !tip)
-      begin
-      `ifdef SPI_SS_NB_8
-        if (wb_sel_i[0])
-          ss <= wb_dat_i[`SPI_SS_NB-1:0];
-      `endif
-      `ifdef SPI_SS_NB_16
-        if (wb_sel_i[0])
-          ss[7:0] <= wb_dat_i[7:0];
-        if (wb_sel_i[1])
-          ss[`SPI_SS_NB-1:8] <= wb_dat_i[`SPI_SS_NB-1:8];
-      `endif
-      `ifdef SPI_SS_NB_24
-        if (wb_sel_i[0])
-          ss[7:0] <= wb_dat_i[7:0];
-        if (wb_sel_i[1])
-          ss[15:8] <= wb_dat_i[15:8];
-        if (wb_sel_i[2])
-          ss[`SPI_SS_NB-1:16] <= wb_dat_i[`SPI_SS_NB-1:16];
-      `endif
-      `ifdef SPI_SS_NB_32
-        if (wb_sel_i[0])
-          ss[7:0] <= wb_dat_i[7:0];
-        if (wb_sel_i[1])
-          ss[15:8] <= wb_dat_i[15:8];
-        if (wb_sel_i[2])
-          ss[23:16] <= wb_dat_i[23:16];
-        if (wb_sel_i[3])
-          ss[`SPI_SS_NB-1:24] <= wb_dat_i[`SPI_SS_NB-1:24];
-      `endif
-      end
-  end
-  
-  assign ss_pad_o = ~((ss & {`SPI_SS_NB{tip & ass}}) | (ss & {`SPI_SS_NB{!ass}}));
-  
-  spi_clgen clgen (.clk_in(wb_clk_i), .rst(wb_rst_i), .go(go), .enable(tip), .last_clk(last_bit),
-                   .divider(divider), .clk_out(sclk_pad_o), .pos_edge(pos_edge), 
-                   .neg_edge(neg_edge));
-  
-  spi_shift shift (.clk(wb_clk_i), .rst(wb_rst_i), .len(char_len[`SPI_CHAR_LEN_BITS-1:0]),
-                   .latch(spi_tx_sel[3:0] & {4{wb_we_i}}), .byte_sel(wb_sel_i), .lsb(lsb), 
-                   .go(go), .pos_edge(pos_edge), .neg_edge(neg_edge), 
-                   .rx_negedge(rx_negedge), .tx_negedge(tx_negedge),
-                   .tip(tip), .last(last_bit), 
-                   .p_in(wb_dat_i), .p_out(rx), 
-                   .s_clk(sclk_pad_o), .s_in(miso_pad_i), .s_out(mosi_pad_o));
-endmodule
-  
diff --git a/fpga/usrp2/opencores/spi/rtl/verilog/spi_top16.v b/fpga/usrp2/opencores/spi/rtl/verilog/spi_top16.v
deleted file mode 100644
index ee808a8ab..000000000
--- a/fpga/usrp2/opencores/spi/rtl/verilog/spi_top16.v
+++ /dev/null
@@ -1,182 +0,0 @@
-
-// Modified 2010 by Matt Ettus to remove old verilog style and
-// allow 16-bit operation
-
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-////  spi_top.v                                                   ////
-////                                                              ////
-////  This file is part of the SPI IP core project                ////
-////  http://www.opencores.org/projects/spi/                      ////
-////                                                              ////
-////  Author(s):                                                  ////
-////      - Simon Srot (simons@opencores.org)                     ////
-////                                                              ////
-////  All additional information is avaliable in the Readme.txt   ////
-////  file.                                                       ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-////                                                              ////
-//// Copyright (C) 2002 Authors                                   ////
-////                                                              ////
-//// This source file may be used and distributed without         ////
-//// restriction provided that this copyright statement is not    ////
-//// removed from the file and that any derivative work contains  ////
-//// the original copyright notice and the associated disclaimer. ////
-////                                                              ////
-//// This source file is free software; you can redistribute it   ////
-//// and/or modify it under the terms of the GNU Lesser General   ////
-//// Public License as published by the Free Software Foundation; ////
-//// either version 2.1 of the License, or (at your option) any   ////
-//// later version.                                               ////
-////                                                              ////
-//// This source is distributed in the hope that it will be       ////
-//// useful, but WITHOUT ANY WARRANTY; without even the implied   ////
-//// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR      ////
-//// PURPOSE.  See the GNU Lesser General Public License for more ////
-//// details.                                                     ////
-////                                                              ////
-//// You should have received a copy of the GNU Lesser General    ////
-//// Public License along with this source; if not, download it   ////
-//// from http://www.opencores.org/lgpl.shtml                     ////
-////                                                              ////
-//////////////////////////////////////////////////////////////////////
-
-
-`include "spi_defines.v"
-
-module spi_top16
-  (input wb_clk_i, input wb_rst_i, 
-   input [4:0] wb_adr_i, 
-   input [15:0] wb_dat_i, 
-   output reg [15:0] wb_dat_o, 
-   input [1:0] wb_sel_i,
-   input wb_we_i, input wb_stb_i, input wb_cyc_i, 
-   output reg wb_ack_o, output wb_err_o, output reg wb_int_o,
-   
-   // SPI signals
-   output [15:0] ss_pad_o, output sclk_pad_o, output mosi_pad_o, input miso_pad_i);
-   
-   // Internal signals
-   reg [15:0] divider;          // Divider register
-   reg [`SPI_CTRL_BIT_NB-1:0] ctrl;             // Control and status register
-   reg [15:0] 		      ss;               // Slave select register
-   reg [31:0] 		      wb_dat;           // wb data out
-   wire [31:0] 		      rx;               // Rx register
-   wire 		      rx_negedge;       // miso is sampled on negative edge
-   wire 		      tx_negedge;       // mosi is driven on negative edge
-   wire [`SPI_CHAR_LEN_BITS-1:0] char_len;         // char len
-   wire 			 go;               // go
-   wire 			 lsb;              // lsb first on line
-   wire 			 ie;               // interrupt enable
-   wire 			 ass;              // automatic slave select
-   wire 			 spi_divider_sel;  // divider register select
-   wire 			 spi_ctrl_sel;     // ctrl register select
-   wire [3:0] 			 spi_tx_sel;       // tx_l register select
-   wire 			 spi_ss_sel;       // ss register select
-   wire 			 tip;              // transfer in progress
-   wire 			 pos_edge;         // recognize posedge of sclk
-   wire 			 neg_edge;         // recognize negedge of sclk
-   wire 			 last_bit;         // marks last character bit
-   
-   // Address decoder
-   assign spi_divider_sel = wb_cyc_i & wb_stb_i & (wb_adr_i[4:2] == `SPI_DIVIDE);
-   assign spi_ctrl_sel    = wb_cyc_i & wb_stb_i & (wb_adr_i[4:2] == `SPI_CTRL);
-   assign spi_tx_sel[0]   = wb_cyc_i & wb_stb_i & (wb_adr_i[4:2] == `SPI_TX_0);
-   assign spi_tx_sel[1]   = wb_cyc_i & wb_stb_i & (wb_adr_i[4:2] == `SPI_TX_1);
-   assign spi_tx_sel[2]   = wb_cyc_i & wb_stb_i & (wb_adr_i[4:2] == `SPI_TX_2);
-   assign spi_tx_sel[3]   = wb_cyc_i & wb_stb_i & (wb_adr_i[4:2] == `SPI_TX_3);
-   assign spi_ss_sel      = wb_cyc_i & wb_stb_i & (wb_adr_i[4:2] == `SPI_SS);
-   
-   always @(wb_adr_i or rx or ctrl or divider or ss)
-     case (wb_adr_i[4:2])   
-       `SPI_RX_0:    wb_dat = rx[31:0];
-       `SPI_CTRL:    wb_dat = {{32-`SPI_CTRL_BIT_NB{1'b0}}, ctrl};
-       `SPI_DIVIDE:  wb_dat = {16'b0, divider};
-       `SPI_SS:      wb_dat = {16'b0, ss};
-       default : wb_dat = 32'd0;
-     endcase // case (wb_adr_i[4:2])
-   
-   always @(posedge wb_clk_i)
-     if (wb_rst_i)
-       wb_dat_o <= 32'b0;
-     else
-       wb_dat_o <= wb_adr_i[1] ? wb_dat[31:16] : wb_dat[15:0];
-   
-   always @(posedge wb_clk_i)
-     if (wb_rst_i)
-       wb_ack_o <= 1'b0;
-     else
-       wb_ack_o <= wb_cyc_i & wb_stb_i & ~wb_ack_o;
-   
-   assign wb_err_o = 1'b0;
-   
-   // Interrupt
-   always @(posedge wb_clk_i)
-     if (wb_rst_i)
-       wb_int_o <= 1'b0;
-     else if (ie && tip && last_bit && pos_edge)
-       wb_int_o <= 1'b1;
-     else if (wb_ack_o)
-       wb_int_o <= 1'b0;
-   
-   // Divider register
-   always @(posedge wb_clk_i)
-     if (wb_rst_i)
-       divider <= 16'b0;
-     else if (spi_divider_sel && wb_we_i && !tip && ~wb_adr_i[1])
-       divider <= wb_dat_i;
-   
-   // Ctrl register
-   always @(posedge wb_clk_i)
-     if (wb_rst_i)
-       ctrl <= {`SPI_CTRL_BIT_NB{1'b0}};
-     else if(spi_ctrl_sel && wb_we_i && !tip && ~wb_adr_i[1])
-       begin
-          if (wb_sel_i[0])
-            ctrl[7:0] <= wb_dat_i[7:0] | {7'b0, ctrl[0]};
-          if (wb_sel_i[1])
-            ctrl[`SPI_CTRL_BIT_NB-1:8] <= wb_dat_i[`SPI_CTRL_BIT_NB-1:8];
-       end
-     else if(tip && last_bit && pos_edge)
-       ctrl[`SPI_CTRL_GO] <= 1'b0;
-   
-   assign rx_negedge = ctrl[`SPI_CTRL_RX_NEGEDGE];
-   assign tx_negedge = ctrl[`SPI_CTRL_TX_NEGEDGE];
-   assign go         = ctrl[`SPI_CTRL_GO];
-   assign char_len   = ctrl[`SPI_CTRL_CHAR_LEN];
-   assign lsb        = ctrl[`SPI_CTRL_LSB];
-   assign ie         = ctrl[`SPI_CTRL_IE];
-   assign ass        = ctrl[`SPI_CTRL_ASS];
-   
-   // Slave select register
-   always @(posedge wb_clk_i)
-     if (wb_rst_i)
-       ss <= 16'b0;
-     else if(spi_ss_sel && wb_we_i && !tip & ~wb_adr_i[1])
-       begin
-          if (wb_sel_i[0])
-            ss[7:0] <= wb_dat_i[7:0];
-          if (wb_sel_i[1])
-            ss[15:8] <= wb_dat_i[15:8];
-       end
-   
-   assign ss_pad_o = ~((ss & {16{tip & ass}}) | (ss & {16{!ass}}));
-   
-   spi_clgen clgen (.clk_in(wb_clk_i), .rst(wb_rst_i), .go(go), .enable(tip), .last_clk(last_bit),
-                    .divider(divider[`SPI_DIVIDER_LEN-1:0]), .clk_out(sclk_pad_o), .pos_edge(pos_edge), 
-                    .neg_edge(neg_edge));
-
-   wire [3:0] new_sels = { (wb_adr_i[1] & wb_sel_i[1]), (wb_adr_i[1] & wb_sel_i[0]), 
-			   (~wb_adr_i[1] & wb_sel_i[1]), (~wb_adr_i[1] & wb_sel_i[0]) };
-   
-   
-   spi_shift shift (.clk(wb_clk_i), .rst(wb_rst_i), .len(char_len[`SPI_CHAR_LEN_BITS-1:0]),
-                    .latch(spi_tx_sel[3:0] & {4{wb_we_i}}), .byte_sel(new_sels), .lsb(lsb), 
-                    .go(go), .pos_edge(pos_edge), .neg_edge(neg_edge), 
-                    .rx_negedge(rx_negedge), .tx_negedge(tx_negedge),
-                    .tip(tip), .last(last_bit), 
-                    .p_in({wb_dat_i,wb_dat_i}), .p_out(rx), 
-                    .s_clk(sclk_pad_o), .s_in(miso_pad_i), .s_out(mosi_pad_o));
-
-endmodule // spi_top16