API tools faq
paste
Guest User

Untitled

a guest
May 9th, 2018
79
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
VeriLog 19.11 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/boards/altera/de0_nano/rtl/verilog/arbiter/arbiter_dbus.v b/boards/altera/de0_nano/rtl/verilog/arbiter/arbiter_dbus.v
  2. index 09c4c60..b5578d8 100644
  3. --- a/boards/altera/de0_nano/rtl/verilog/arbiter/arbiter_dbus.v
  4. +++ b/boards/altera/de0_nano/rtl/verilog/arbiter/arbiter_dbus.v
  5. @@ -353,7 +353,7 @@ module arbiter_dbus
  6.  
  7.     parameter wb_addr_match_width = 8;
  8.  
  9. -   parameter wb_num_slaves = 2; // must also (un)comment things if changing
  10. +   parameter wb_num_slaves = 5; // must also (un)comment things if changing
  11.  
  12.     // Slave addresses - these should be defparam'd from top level
  13.     // Declare them as you need them
  14. @@ -855,12 +855,6 @@ module arbiter_dbus
  15.    
  16.     // Slave select wire
  17.     wire [wb_num_slaves-1:0]  wb_slave_sel;
  18. -   reg [wb_num_slaves-1:0]   wb_slave_sel_r;
  19. -
  20. -   // Register wb_slave_sel_r to break combinatorial loop when selecting default
  21. -   // slave
  22. -   always @(posedge wb_clk)
  23. -     wb_slave_sel_r <= wb_slave_sel;
  24.    
  25.     // Slave out mux in wires  
  26.     wire [wb_dat_width-1:0]   wbs_dat_o_mux_i [0:wb_num_slaves-1];
  27. @@ -871,15 +865,15 @@ module arbiter_dbus
  28.     //
  29.     // Slave selects
  30.     //
  31. -   assign wb_slave_sel[0] = wbm_adr_o[31:28] == slave0_adr | wbm_adr_o[31:28] == 4'hf; // Special case, point all reads to ROM address to here
  32. -   assign wb_slave_sel[1] = wbm_adr_o[`WB_ARB_ADDR_MATCH_SEL] == slave1_adr;
  33. -   assign wb_slave_sel[2] = wbm_adr_o[`WB_ARB_ADDR_MATCH_SEL] == slave2_adr;
  34. -   assign wb_slave_sel[3] = wbm_adr_o[`WB_ARB_ADDR_MATCH_SEL] == slave3_adr;  
  35. -
  36. -   // Auto select last slave when others are not selected
  37. -   assign wb_slave_sel[4] = !(wb_slave_sel_r[0] | wb_slave_sel_r[1] |
  38. -                 wb_slave_sel_r[2] | wb_slave_sel_r[3]);
  39. -
  40. +   assign wb_slave_sel = (wbm_adr_o[31:28] == slave0_adr | wbm_adr_o[31:28] == 4'hf) ?
  41. +            5'b00001 :
  42. +            wbm_adr_o[`WB_ARB_ADDR_MATCH_SEL] == slave1_adr ?
  43. +            5'b00010 :
  44. +            wbm_adr_o[`WB_ARB_ADDR_MATCH_SEL] == slave2_adr ?
  45. +            5'b00100 :
  46. +            wbm_adr_o[`WB_ARB_ADDR_MATCH_SEL] == slave3_adr ?
  47. +            5'b01000 :
  48. +            5'b10000;
  49.  /*
  50.  
  51.     assign wb_slave_sel[4] = wbm_adr_o[`WB_ARB_ADDR_MATCH_SEL] == slave4_adr;
  52. @@ -934,277 +928,277 @@ module arbiter_dbus
  53.     assign wbs0_adr_i = wbm_adr_o;
  54.     assign wbs0_dat_i = wbm_dat_o;
  55.     assign wbs0_sel_i = wbm_sel_o;
  56. -   assign wbs0_cyc_i = wbm_cyc_o & wb_slave_sel_r[0];
  57. -   assign wbs0_stb_i = wbm_stb_o & wb_slave_sel_r[0];  
  58. +   assign wbs0_cyc_i = wbm_cyc_o & wb_slave_sel[0];
  59. +   assign wbs0_stb_i = wbm_stb_o & wb_slave_sel[0];  
  60.     assign wbs0_we_i =  wbm_we_o;
  61.     assign wbs0_cti_i = wbm_cti_o;
  62.     assign wbs0_bte_i = wbm_bte_o;
  63.     assign wbs_dat_o_mux_i[0] = wbs0_dat_o;
  64. -   assign wbs_ack_o_mux_i[0] = wbs0_ack_o & wb_slave_sel_r[0];
  65. -   assign wbs_err_o_mux_i[0] = wbs0_err_o & wb_slave_sel_r[0];
  66. -   assign wbs_rty_o_mux_i[0] = wbs0_rty_o & wb_slave_sel_r[0];
  67. +   assign wbs_ack_o_mux_i[0] = wbs0_ack_o & wb_slave_sel[0];
  68. +   assign wbs_err_o_mux_i[0] = wbs0_err_o & wb_slave_sel[0];
  69. +   assign wbs_rty_o_mux_i[0] = wbs0_rty_o & wb_slave_sel[0];
  70.  
  71.  
  72.     // Slave 1 inputs
  73.     assign wbs1_adr_i = wbm_adr_o;
  74.     assign wbs1_dat_i = wbm_dat_o;
  75.     assign wbs1_sel_i = wbm_sel_o;
  76. -   assign wbs1_cyc_i = wbm_cyc_o & wb_slave_sel_r[1];
  77. -   assign wbs1_stb_i = wbm_stb_o & wb_slave_sel_r[1];  
  78. +   assign wbs1_cyc_i = wbm_cyc_o & wb_slave_sel[1];
  79. +   assign wbs1_stb_i = wbm_stb_o & wb_slave_sel[1];  
  80.     assign wbs1_we_i =  wbm_we_o;
  81.     assign wbs1_cti_i = wbm_cti_o;
  82.     assign wbs1_bte_i = wbm_bte_o;
  83.     assign wbs_dat_o_mux_i[1] = wbs1_dat_o;
  84. -   assign wbs_ack_o_mux_i[1] = wbs1_ack_o & wb_slave_sel_r[1];
  85. -   assign wbs_err_o_mux_i[1] = wbs1_err_o & wb_slave_sel_r[1];
  86. -   assign wbs_rty_o_mux_i[1] = wbs1_rty_o & wb_slave_sel_r[1];
  87. +   assign wbs_ack_o_mux_i[1] = wbs1_ack_o & wb_slave_sel[1];
  88. +   assign wbs_err_o_mux_i[1] = wbs1_err_o & wb_slave_sel[1];
  89. +   assign wbs_rty_o_mux_i[1] = wbs1_rty_o & wb_slave_sel[1];
  90.  
  91.  
  92.     // Slave 2 inputs
  93.     assign wbs2_adr_i = wbm_adr_o;
  94.     assign wbs2_dat_i = wbm_dat_o;
  95.     assign wbs2_sel_i = wbm_sel_o;
  96. -   assign wbs2_cyc_i = wbm_cyc_o & wb_slave_sel_r[2];
  97. -   assign wbs2_stb_i = wbm_stb_o & wb_slave_sel_r[2];  
  98. +   assign wbs2_cyc_i = wbm_cyc_o & wb_slave_sel[2];
  99. +   assign wbs2_stb_i = wbm_stb_o & wb_slave_sel[2];  
  100.     assign wbs2_we_i =  wbm_we_o;
  101.     assign wbs2_cti_i = wbm_cti_o;
  102.     assign wbs2_bte_i = wbm_bte_o;
  103.     assign wbs_dat_o_mux_i[2] = wbs2_dat_o;
  104. -   assign wbs_ack_o_mux_i[2] = wbs2_ack_o & wb_slave_sel_r[2];
  105. -   assign wbs_err_o_mux_i[2] = wbs2_err_o & wb_slave_sel_r[2];
  106. -   assign wbs_rty_o_mux_i[2] = wbs2_rty_o & wb_slave_sel_r[2];
  107. +   assign wbs_ack_o_mux_i[2] = wbs2_ack_o & wb_slave_sel[2];
  108. +   assign wbs_err_o_mux_i[2] = wbs2_err_o & wb_slave_sel[2];
  109. +   assign wbs_rty_o_mux_i[2] = wbs2_rty_o & wb_slave_sel[2];
  110.  
  111.  
  112.     // Slave 3 inputs
  113.     assign wbs3_adr_i = wbm_adr_o;
  114.     assign wbs3_dat_i = wbm_dat_o;
  115.     assign wbs3_sel_i = wbm_sel_o;
  116. -   assign wbs3_cyc_i = wbm_cyc_o & wb_slave_sel_r[3];
  117. -   assign wbs3_stb_i = wbm_stb_o & wb_slave_sel_r[3];  
  118. +   assign wbs3_cyc_i = wbm_cyc_o & wb_slave_sel[3];
  119. +   assign wbs3_stb_i = wbm_stb_o & wb_slave_sel[3];  
  120.     assign wbs3_we_i =  wbm_we_o;
  121.     assign wbs3_cti_i = wbm_cti_o;
  122.     assign wbs3_bte_i = wbm_bte_o;
  123.     assign wbs_dat_o_mux_i[3] = wbs3_dat_o;
  124. -   assign wbs_ack_o_mux_i[3] = wbs3_ack_o & wb_slave_sel_r[3];
  125. -   assign wbs_err_o_mux_i[3] = wbs3_err_o & wb_slave_sel_r[3];
  126. -   assign wbs_rty_o_mux_i[3] = wbs3_rty_o & wb_slave_sel_r[3];
  127. +   assign wbs_ack_o_mux_i[3] = wbs3_ack_o & wb_slave_sel[3];
  128. +   assign wbs_err_o_mux_i[3] = wbs3_err_o & wb_slave_sel[3];
  129. +   assign wbs_rty_o_mux_i[3] = wbs3_rty_o & wb_slave_sel[3];
  130.  
  131.     // Slave 4 inputs
  132.     assign wbs4_adr_i = wbm_adr_o;
  133.     assign wbs4_dat_i = wbm_dat_o;
  134.     assign wbs4_sel_i = wbm_sel_o;
  135. -   assign wbs4_cyc_i = wbm_cyc_o & wb_slave_sel_r[4];
  136. -   assign wbs4_stb_i = wbm_stb_o & wb_slave_sel_r[4];  
  137. +   assign wbs4_cyc_i = wbm_cyc_o & wb_slave_sel[4];
  138. +   assign wbs4_stb_i = wbm_stb_o & wb_slave_sel[4];  
  139.     assign wbs4_we_i =  wbm_we_o;
  140.     assign wbs4_cti_i = wbm_cti_o;
  141.     assign wbs4_bte_i = wbm_bte_o;
  142.     assign wbs_dat_o_mux_i[4] = wbs4_dat_o;
  143. -   assign wbs_ack_o_mux_i[4] = wbs4_ack_o & wb_slave_sel_r[4];
  144. -   assign wbs_err_o_mux_i[4] = wbs4_err_o & wb_slave_sel_r[4];
  145. -   assign wbs_rty_o_mux_i[4] = wbs4_rty_o & wb_slave_sel_r[4];
  146. +   assign wbs_ack_o_mux_i[4] = wbs4_ack_o & wb_slave_sel[4];
  147. +   assign wbs_err_o_mux_i[4] = wbs4_err_o & wb_slave_sel[4];
  148. +   assign wbs_rty_o_mux_i[4] = wbs4_rty_o & wb_slave_sel[4];
  149.  
  150.  /*
  151.     // Slave 5 inputs
  152.     assign wbs5_adr_i = wbm_adr_o;
  153.     assign wbs5_dat_i = wbm_dat_o;
  154.     assign wbs5_sel_i = wbm_sel_o;
  155. -   assign wbs5_cyc_i = wbm_cyc_o & wb_slave_sel_r[5];
  156. -   assign wbs5_stb_i = wbm_stb_o & wb_slave_sel_r[5];  
  157. +   assign wbs5_cyc_i = wbm_cyc_o & wb_slave_sel[5];
  158. +   assign wbs5_stb_i = wbm_stb_o & wb_slave_sel[5];  
  159.     assign wbs5_we_i =  wbm_we_o;
  160.     assign wbs5_cti_i = wbm_cti_o;
  161.     assign wbs5_bte_i = wbm_bte_o;
  162.     assign wbs_dat_o_mux_i[5] = wbs5_dat_o;
  163. -   assign wbs_ack_o_mux_i[5] = wbs5_ack_o & wb_slave_sel_r[5];
  164. -   assign wbs_err_o_mux_i[5] = wbs5_err_o & wb_slave_sel_r[5];
  165. -   assign wbs_rty_o_mux_i[5] = wbs5_rty_o & wb_slave_sel_r[5];
  166. +   assign wbs_ack_o_mux_i[5] = wbs5_ack_o & wb_slave_sel[5];
  167. +   assign wbs_err_o_mux_i[5] = wbs5_err_o & wb_slave_sel[5];
  168. +   assign wbs_rty_o_mux_i[5] = wbs5_rty_o & wb_slave_sel[5];
  169.  
  170.  
  171.     // Slave 6 inputs
  172.     assign wbs6_adr_i = wbm_adr_o;
  173.     assign wbs6_dat_i = wbm_dat_o;
  174.     assign wbs6_sel_i = wbm_sel_o;
  175. -   assign wbs6_cyc_i = wbm_cyc_o & wb_slave_sel_r[6];
  176. -   assign wbs6_stb_i = wbm_stb_o & wb_slave_sel_r[6];  
  177. +   assign wbs6_cyc_i = wbm_cyc_o & wb_slave_sel[6];
  178. +   assign wbs6_stb_i = wbm_stb_o & wb_slave_sel[6];  
  179.     assign wbs6_we_i =  wbm_we_o;
  180.     assign wbs6_cti_i = wbm_cti_o;
  181.     assign wbs6_bte_i = wbm_bte_o;
  182.     assign wbs_dat_o_mux_i[6] = wbs6_dat_o;
  183. -   assign wbs_ack_o_mux_i[6] = wbs6_ack_o & wb_slave_sel_r[6];
  184. -   assign wbs_err_o_mux_i[6] = wbs6_err_o & wb_slave_sel_r[6];
  185. -   assign wbs_rty_o_mux_i[6] = wbs6_rty_o & wb_slave_sel_r[6];
  186. +   assign wbs_ack_o_mux_i[6] = wbs6_ack_o & wb_slave_sel[6];
  187. +   assign wbs_err_o_mux_i[6] = wbs6_err_o & wb_slave_sel[6];
  188. +   assign wbs_rty_o_mux_i[6] = wbs6_rty_o & wb_slave_sel[6];
  189.  
  190.  
  191.     // Slave 7 inputs
  192.     assign wbs7_adr_i = wbm_adr_o;
  193.     assign wbs7_dat_i = wbm_dat_o;
  194.     assign wbs7_sel_i = wbm_sel_o;
  195. -   assign wbs7_cyc_i = wbm_cyc_o & wb_slave_sel_r[7];
  196. -   assign wbs7_stb_i = wbm_stb_o & wb_slave_sel_r[7];  
  197. +   assign wbs7_cyc_i = wbm_cyc_o & wb_slave_sel[7];
  198. +   assign wbs7_stb_i = wbm_stb_o & wb_slave_sel[7];  
  199.     assign wbs7_we_i =  wbm_we_o;
  200.     assign wbs7_cti_i = wbm_cti_o;
  201.     assign wbs7_bte_i = wbm_bte_o;
  202.     assign wbs_dat_o_mux_i[7] = wbs7_dat_o;
  203. -   assign wbs_ack_o_mux_i[7] = wbs7_ack_o & wb_slave_sel_r[7];
  204. -   assign wbs_err_o_mux_i[7] = wbs7_err_o & wb_slave_sel_r[7];
  205. -   assign wbs_rty_o_mux_i[7] = wbs7_rty_o & wb_slave_sel_r[7];
  206. +   assign wbs_ack_o_mux_i[7] = wbs7_ack_o & wb_slave_sel[7];
  207. +   assign wbs_err_o_mux_i[7] = wbs7_err_o & wb_slave_sel[7];
  208. +   assign wbs_rty_o_mux_i[7] = wbs7_rty_o & wb_slave_sel[7];
  209.  
  210.  
  211.     // Slave 8 inputs
  212.     assign wbs8_adr_i = wbm_adr_o;
  213.     assign wbs8_dat_i = wbm_dat_o;
  214.     assign wbs8_sel_i = wbm_sel_o;
  215. -   assign wbs8_cyc_i = wbm_cyc_o & wb_slave_sel_r[8];
  216. -   assign wbs8_stb_i = wbm_stb_o & wb_slave_sel_r[8];  
  217. +   assign wbs8_cyc_i = wbm_cyc_o & wb_slave_sel[8];
  218. +   assign wbs8_stb_i = wbm_stb_o & wb_slave_sel[8];  
  219.     assign wbs8_we_i =  wbm_we_o;
  220.     assign wbs8_cti_i = wbm_cti_o;
  221.     assign wbs8_bte_i = wbm_bte_o;
  222.     assign wbs_dat_o_mux_i[8] = wbs8_dat_o;
  223. -   assign wbs_ack_o_mux_i[8] = wbs8_ack_o & wb_slave_sel_r[8];
  224. -   assign wbs_err_o_mux_i[8] = wbs8_err_o & wb_slave_sel_r[8];
  225. -   assign wbs_rty_o_mux_i[8] = wbs8_rty_o & wb_slave_sel_r[8];
  226. +   assign wbs_ack_o_mux_i[8] = wbs8_ack_o & wb_slave_sel[8];
  227. +   assign wbs_err_o_mux_i[8] = wbs8_err_o & wb_slave_sel[8];
  228. +   assign wbs_rty_o_mux_i[8] = wbs8_rty_o & wb_slave_sel[8];
  229.  
  230.  
  231.     // Slave 9 inputs
  232.     assign wbs9_adr_i = wbm_adr_o;
  233.     assign wbs9_dat_i = wbm_dat_o;
  234.     assign wbs9_sel_i = wbm_sel_o;
  235. -   assign wbs9_cyc_i = wbm_cyc_o & wb_slave_sel_r[9];
  236. -   assign wbs9_stb_i = wbm_stb_o & wb_slave_sel_r[9];  
  237. +   assign wbs9_cyc_i = wbm_cyc_o & wb_slave_sel[9];
  238. +   assign wbs9_stb_i = wbm_stb_o & wb_slave_sel[9];  
  239.     assign wbs9_we_i =  wbm_we_o;
  240.     assign wbs9_cti_i = wbm_cti_o;
  241.     assign wbs9_bte_i = wbm_bte_o;
  242.     assign wbs_dat_o_mux_i[9] = wbs9_dat_o;
  243. -   assign wbs_ack_o_mux_i[9] = wbs9_ack_o & wb_slave_sel_r[9];
  244. -   assign wbs_err_o_mux_i[9] = wbs9_err_o & wb_slave_sel_r[9];
  245. -   assign wbs_rty_o_mux_i[9] = wbs9_rty_o & wb_slave_sel_r[9];
  246. +   assign wbs_ack_o_mux_i[9] = wbs9_ack_o & wb_slave_sel[9];
  247. +   assign wbs_err_o_mux_i[9] = wbs9_err_o & wb_slave_sel[9];
  248. +   assign wbs_rty_o_mux_i[9] = wbs9_rty_o & wb_slave_sel[9];
  249.  
  250.  
  251.     // Slave 10 inputs
  252.     assign wbs10_adr_i = wbm_adr_o;
  253.     assign wbs10_dat_i = wbm_dat_o;
  254.     assign wbs10_sel_i = wbm_sel_o;
  255. -   assign wbs10_cyc_i = wbm_cyc_o & wb_slave_sel_r[10];
  256. -   assign wbs10_stb_i = wbm_stb_o & wb_slave_sel_r[10];  
  257. +   assign wbs10_cyc_i = wbm_cyc_o & wb_slave_sel[10];
  258. +   assign wbs10_stb_i = wbm_stb_o & wb_slave_sel[10];  
  259.     assign wbs10_we_i =  wbm_we_o;
  260.     assign wbs10_cti_i = wbm_cti_o;
  261.     assign wbs10_bte_i = wbm_bte_o;
  262.     assign wbs_dat_o_mux_i[10] = wbs10_dat_o;
  263. -   assign wbs_ack_o_mux_i[10] = wbs10_ack_o & wb_slave_sel_r[10];
  264. -   assign wbs_err_o_mux_i[10] = wbs10_err_o & wb_slave_sel_r[10];
  265. -   assign wbs_rty_o_mux_i[10] = wbs10_rty_o & wb_slave_sel_r[10];
  266. +   assign wbs_ack_o_mux_i[10] = wbs10_ack_o & wb_slave_sel[10];
  267. +   assign wbs_err_o_mux_i[10] = wbs10_err_o & wb_slave_sel[10];
  268. +   assign wbs_rty_o_mux_i[10] = wbs10_rty_o & wb_slave_sel[10];
  269.  
  270.    
  271.     // Slave 11 inputs
  272.     assign wbs11_adr_i = wbm_adr_o;
  273.     assign wbs11_dat_i = wbm_dat_o;
  274.     assign wbs11_sel_i = wbm_sel_o;
  275. -   assign wbs11_cyc_i = wbm_cyc_o & wb_slave_sel_r[11];
  276. -   assign wbs11_stb_i = wbm_stb_o & wb_slave_sel_r[11];  
  277. +   assign wbs11_cyc_i = wbm_cyc_o & wb_slave_sel[11];
  278. +   assign wbs11_stb_i = wbm_stb_o & wb_slave_sel[11];  
  279.     assign wbs11_we_i =  wbm_we_o;
  280.     assign wbs11_cti_i = wbm_cti_o;
  281.     assign wbs11_bte_i = wbm_bte_o;
  282.     assign wbs_dat_o_mux_i[11] = wbs11_dat_o;
  283. -   assign wbs_ack_o_mux_i[11] = wbs11_ack_o & wb_slave_sel_r[11];
  284. -   assign wbs_err_o_mux_i[11] = wbs11_err_o & wb_slave_sel_r[11];
  285. -   assign wbs_rty_o_mux_i[11] = wbs11_rty_o & wb_slave_sel_r[11];
  286. +   assign wbs_ack_o_mux_i[11] = wbs11_ack_o & wb_slave_sel[11];
  287. +   assign wbs_err_o_mux_i[11] = wbs11_err_o & wb_slave_sel[11];
  288. +   assign wbs_rty_o_mux_i[11] = wbs11_rty_o & wb_slave_sel[11];
  289.  
  290.  
  291.     // Slave 12 inputs
  292.     assign wbs12_adr_i = wbm_adr_o;
  293.     assign wbs12_dat_i = wbm_dat_o;
  294.     assign wbs12_sel_i = wbm_sel_o;
  295. -   assign wbs12_cyc_i = wbm_cyc_o & wb_slave_sel_r[12];
  296. -   assign wbs12_stb_i = wbm_stb_o & wb_slave_sel_r[12];  
  297. +   assign wbs12_cyc_i = wbm_cyc_o & wb_slave_sel[12];
  298. +   assign wbs12_stb_i = wbm_stb_o & wb_slave_sel[12];  
  299.     assign wbs12_we_i =  wbm_we_o;
  300.     assign wbs12_cti_i = wbm_cti_o;
  301.     assign wbs12_bte_i = wbm_bte_o;
  302.     assign wbs_dat_o_mux_i[12] = wbs12_dat_o;
  303. -   assign wbs_ack_o_mux_i[12] = wbs12_ack_o & wb_slave_sel_r[12];
  304. -   assign wbs_err_o_mux_i[12] = wbs12_err_o & wb_slave_sel_r[12];
  305. -   assign wbs_rty_o_mux_i[12] = wbs12_rty_o & wb_slave_sel_r[12];
  306. +   assign wbs_ack_o_mux_i[12] = wbs12_ack_o & wb_slave_sel[12];
  307. +   assign wbs_err_o_mux_i[12] = wbs12_err_o & wb_slave_sel[12];
  308. +   assign wbs_rty_o_mux_i[12] = wbs12_rty_o & wb_slave_sel[12];
  309.  
  310.  
  311.     // Slave 13 inputs
  312.     assign wbs13_adr_i = wbm_adr_o;
  313.     assign wbs13_dat_i = wbm_dat_o;
  314.     assign wbs13_sel_i = wbm_sel_o;
  315. -   assign wbs13_cyc_i = wbm_cyc_o & wb_slave_sel_r[13];
  316. -   assign wbs13_stb_i = wbm_stb_o & wb_slave_sel_r[13];  
  317. +   assign wbs13_cyc_i = wbm_cyc_o & wb_slave_sel[13];
  318. +   assign wbs13_stb_i = wbm_stb_o & wb_slave_sel[13];  
  319.     assign wbs13_we_i =  wbm_we_o;
  320.     assign wbs13_cti_i = wbm_cti_o;
  321.     assign wbs13_bte_i = wbm_bte_o;
  322.     assign wbs_dat_o_mux_i[13] = wbs13_dat_o;
  323. -   assign wbs_ack_o_mux_i[13] = wbs13_ack_o & wb_slave_sel_r[13];
  324. -   assign wbs_err_o_mux_i[13] = wbs13_err_o & wb_slave_sel_r[13];
  325. -   assign wbs_rty_o_mux_i[13] = wbs13_rty_o & wb_slave_sel_r[13];
  326. +   assign wbs_ack_o_mux_i[13] = wbs13_ack_o & wb_slave_sel[13];
  327. +   assign wbs_err_o_mux_i[13] = wbs13_err_o & wb_slave_sel[13];
  328. +   assign wbs_rty_o_mux_i[13] = wbs13_rty_o & wb_slave_sel[13];
  329.  
  330.  
  331.     // Slave 14 inputs
  332.     assign wbs14_adr_i = wbm_adr_o;
  333.     assign wbs14_dat_i = wbm_dat_o;
  334.     assign wbs14_sel_i = wbm_sel_o;
  335. -   assign wbs14_cyc_i = wbm_cyc_o & wb_slave_sel_r[14];
  336. -   assign wbs14_stb_i = wbm_stb_o & wb_slave_sel_r[14];  
  337. +   assign wbs14_cyc_i = wbm_cyc_o & wb_slave_sel[14];
  338. +   assign wbs14_stb_i = wbm_stb_o & wb_slave_sel[14];  
  339.     assign wbs14_we_i =  wbm_we_o;
  340.     assign wbs14_cti_i = wbm_cti_o;
  341.     assign wbs14_bte_i = wbm_bte_o;
  342.     assign wbs_dat_o_mux_i[14] = wbs14_dat_o;
  343. -   assign wbs_ack_o_mux_i[14] = wbs14_ack_o & wb_slave_sel_r[14];
  344. -   assign wbs_err_o_mux_i[14] = wbs14_err_o & wb_slave_sel_r[14];
  345. -   assign wbs_rty_o_mux_i[14] = wbs14_rty_o & wb_slave_sel_r[14];
  346. +   assign wbs_ack_o_mux_i[14] = wbs14_ack_o & wb_slave_sel[14];
  347. +   assign wbs_err_o_mux_i[14] = wbs14_err_o & wb_slave_sel[14];
  348. +   assign wbs_rty_o_mux_i[14] = wbs14_rty_o & wb_slave_sel[14];
  349.  
  350.  
  351.     // Slave 15 inputs
  352.     assign wbs15_adr_i = wbm_adr_o;
  353.     assign wbs15_dat_i = wbm_dat_o;
  354.     assign wbs15_sel_i = wbm_sel_o;
  355. -   assign wbs15_cyc_i = wbm_cyc_o & wb_slave_sel_r[15];
  356. -   assign wbs15_stb_i = wbm_stb_o & wb_slave_sel_r[15];  
  357. +   assign wbs15_cyc_i = wbm_cyc_o & wb_slave_sel[15];
  358. +   assign wbs15_stb_i = wbm_stb_o & wb_slave_sel[15];  
  359.     assign wbs15_we_i =  wbm_we_o;
  360.     assign wbs15_cti_i = wbm_cti_o;
  361.     assign wbs15_bte_i = wbm_bte_o;
  362.     assign wbs_dat_o_mux_i[15] = wbs15_dat_o;
  363. -   assign wbs_ack_o_mux_i[15] = wbs15_ack_o & wb_slave_sel_r[15];
  364. -   assign wbs_err_o_mux_i[15] = wbs15_err_o & wb_slave_sel_r[15];
  365. -   assign wbs_rty_o_mux_i[15] = wbs15_rty_o & wb_slave_sel_r[15];
  366. +   assign wbs_ack_o_mux_i[15] = wbs15_ack_o & wb_slave_sel[15];
  367. +   assign wbs_err_o_mux_i[15] = wbs15_err_o & wb_slave_sel[15];
  368. +   assign wbs_rty_o_mux_i[15] = wbs15_rty_o & wb_slave_sel[15];
  369.  
  370.  
  371.     // Slave 16 inputs
  372.     assign wbs16_adr_i = wbm_adr_o;
  373.     assign wbs16_dat_i = wbm_dat_o;
  374.     assign wbs16_sel_i = wbm_sel_o;
  375. -   assign wbs16_cyc_i = wbm_cyc_o & wb_slave_sel_r[16];
  376. -   assign wbs16_stb_i = wbm_stb_o & wb_slave_sel_r[16];  
  377. +   assign wbs16_cyc_i = wbm_cyc_o & wb_slave_sel[16];
  378. +   assign wbs16_stb_i = wbm_stb_o & wb_slave_sel[16];  
  379.     assign wbs16_we_i =  wbm_we_o;
  380.     assign wbs16_cti_i = wbm_cti_o;
  381.     assign wbs16_bte_i = wbm_bte_o;
  382.     assign wbs_dat_o_mux_i[16] = wbs16_dat_o;
  383. -   assign wbs_ack_o_mux_i[16] = wbs16_ack_o & wb_slave_sel_r[16];
  384. -   assign wbs_err_o_mux_i[16] = wbs16_err_o & wb_slave_sel_r[16];
  385. -   assign wbs_rty_o_mux_i[16] = wbs16_rty_o & wb_slave_sel_r[16];
  386. +   assign wbs_ack_o_mux_i[16] = wbs16_ack_o & wb_slave_sel[16];
  387. +   assign wbs_err_o_mux_i[16] = wbs16_err_o & wb_slave_sel[16];
  388. +   assign wbs_rty_o_mux_i[16] = wbs16_rty_o & wb_slave_sel[16];
  389.  
  390.  */
  391.  
  392.  
  393.  
  394.     // Master out mux from slave in data
  395. -   assign wbm_dat_i = wb_slave_sel_r[0] ? wbs_dat_o_mux_i[0] :
  396. -             wb_slave_sel_r[1] ? wbs_dat_o_mux_i[1] :
  397. -             wb_slave_sel_r[2] ? wbs_dat_o_mux_i[2] :
  398. -             wb_slave_sel_r[3] ? wbs_dat_o_mux_i[3] :
  399. -             wb_slave_sel_r[4] ? wbs_dat_o_mux_i[4] :
  400. -/*           wb_slave_sel_r[5] ? wbs_dat_o_mux_i[5] :
  401. -             wb_slave_sel_r[6] ? wbs_dat_o_mux_i[6] :
  402. -             wb_slave_sel_r[7] ? wbs_dat_o_mux_i[7] :
  403. -             wb_slave_sel_r[8] ? wbs_dat_o_mux_i[8] :
  404. -             wb_slave_sel_r[9] ? wbs_dat_o_mux_i[9] :
  405. -             wb_slave_sel_r[10] ? wbs_dat_o_mux_i[10] :
  406. -             wb_slave_sel_r[11] ? wbs_dat_o_mux_i[11] :
  407. -             wb_slave_sel_r[12] ? wbs_dat_o_mux_i[12] :
  408. -             wb_slave_sel_r[13] ? wbs_dat_o_mux_i[13] :
  409. -             wb_slave_sel_r[14] ? wbs_dat_o_mux_i[14] :
  410. -             wb_slave_sel_r[15] ? wbs_dat_o_mux_i[15] :
  411. -             wb_slave_sel_r[16] ? wbs_dat_o_mux_i[16] :
  412. +   assign wbm_dat_i = wb_slave_sel[0] ? wbs_dat_o_mux_i[0] :
  413. +             wb_slave_sel[1] ? wbs_dat_o_mux_i[1] :
  414. +             wb_slave_sel[2] ? wbs_dat_o_mux_i[2] :
  415. +             wb_slave_sel[3] ? wbs_dat_o_mux_i[3] :
  416. +             wb_slave_sel[4] ? wbs_dat_o_mux_i[4] :
  417. +/*           wb_slave_sel[5] ? wbs_dat_o_mux_i[5] :
  418. +             wb_slave_sel[6] ? wbs_dat_o_mux_i[6] :
  419. +             wb_slave_sel[7] ? wbs_dat_o_mux_i[7] :
  420. +             wb_slave_sel[8] ? wbs_dat_o_mux_i[8] :
  421. +             wb_slave_sel[9] ? wbs_dat_o_mux_i[9] :
  422. +             wb_slave_sel[10] ? wbs_dat_o_mux_i[10] :
  423. +             wb_slave_sel[11] ? wbs_dat_o_mux_i[11] :
  424. +             wb_slave_sel[12] ? wbs_dat_o_mux_i[12] :
  425. +             wb_slave_sel[13] ? wbs_dat_o_mux_i[13] :
  426. +             wb_slave_sel[14] ? wbs_dat_o_mux_i[14] :
  427. +             wb_slave_sel[15] ? wbs_dat_o_mux_i[15] :
  428. +             wb_slave_sel[16] ? wbs_dat_o_mux_i[16] :
  429.  */
  430.               wbs_dat_o_mux_i[0];
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!