diff options
author | Nick Foster <nick@nerdnetworks.org> | 2012-01-12 11:14:10 -0800 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2012-01-12 11:44:38 -0800 |
commit | 3f7ff03c098b5bdbc1134a33c1ea14953f1c2f6f (patch) | |
tree | bc9667cdfb1dfb1de3482f346fb4b96fd3c6d18a /usrp2/top/B100/B100.v | |
parent | a5a18788a7dbf230f2df396c8706d06d17c9be8b (diff) | |
download | uhd-3f7ff03c098b5bdbc1134a33c1ea14953f1c2f6f.tar.gz uhd-3f7ff03c098b5bdbc1134a33c1ea14953f1c2f6f.tar.bz2 uhd-3f7ff03c098b5bdbc1134a33c1ea14953f1c2f6f.zip |
Squashed slave mode changes onto master.
Diffstat (limited to 'usrp2/top/B100/B100.v')
-rw-r--r-- | usrp2/top/B100/B100.v | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usrp2/top/B100/B100.v b/usrp2/top/B100/B100.v index f2d75c54e..b5691d1c3 100644 --- a/usrp2/top/B100/B100.v +++ b/usrp2/top/B100/B100.v @@ -23,8 +23,8 @@ module B100 output [2:0] debug_led, output [31:0] debug, output [1:0] debug_clk, // GPIF - inout [15:0] GPIF_D, input [3:0] GPIF_CTL, output [3:0] GPIF_RDY, - input [1:0] GPIF_ADR, output GPIF_CS, output GPIF_SLOE, output GPIF_PKTEND, + inout [15:0] GPIF_D, input [3:0] GPIF_CTL, output GPIF_SLOE, + output [1:0] GPIF_ADR, output GPIF_SLWR, output GPIF_SLRD, output GPIF_PKTEND, input IFCLK, inout SDA_FPGA, inout SCL_FPGA, // I2C @@ -156,9 +156,10 @@ module B100 u1plus_core u1p_c(.clk_fpga(clk_fpga), .rst_fpga(reset), .debug_led(debug_led), .debug(debug), .debug_clk(debug_clk), .debug_txd(), .debug_rxd(1'b1), - .gpif_d(GPIF_D), .gpif_ctl(GPIF_CTL), .gpif_rdy(GPIF_RDY), - .gpif_misc({GPIF_CS,GPIF_SLOE,GPIF_PKTEND}), - .gpif_clk(IFCLK), + + .gpif_d(GPIF_D), .gpif_ctl(GPIF_CTL), .gpif_pktend(GPIF_PKTEND), + .gpif_sloe(GPIF_SLOE), .gpif_slwr(GPIF_SLWR), .gpif_slrd(GPIF_SLRD), + .gpif_fifoadr(GPIF_ADR), .gpif_clk(IFCLK), .db_sda(SDA_FPGA), .db_scl(SCL_FPGA), .sclk(sclk), .sen({SEN_CODEC,SEN_TX_DB,SEN_RX_DB}), .mosi(mosi), .miso(miso), |