Merge pull request #73 from linvogel/master

Fixed a possible bug regarding RDMA write requests originating in user logic

Author: JonasDann

hw/hdl/user/mux_init/user_req_mux.sv

@@ -122,7 +122,7 @@ always_comb begin
     user_remote_rd_int.data.req_2 = 0;
 
     user_remote_wr_int.data.req_1 = 0;
-    user_remote_wr_int.data.req_2 = user_sq_rd_int.data;
+    user_remote_wr_int.data.req_2 = user_sq_wr_int.data;
 end
 
 meta_reg #(.DATA_BITS($bits(req_t))) inst_reg_local_rd  (.aclk(aclk), .aresetn(aresetn), .s_meta(user_local_rd_int), .m_meta(user_local_rd));
@@ -160,4 +160,4 @@ meta_reg #(.DATA_BITS($bits(req_t))) inst_reg_local_wr  (.aclk(aclk), .aresetn(a
 
 `endif 
 
-endmodule
+endmodule

scripts/wr_hdl/template_gen/lynx_pkg_tmplt.txt

@@ -394,8 +394,8 @@ package lynxTypes;
     typedef struct packed {
         // Opcode
         logic [OPCODE_BITS-1:0] opcode; // One of the values of fpga::CoyoteOper
-        logic [STRM_BITS-1:0] strm;     // One of STRM_CARD, STRM_HOST, STRM_TCP, or STRM_RDMA
-        logic mode;
+        logic [STRM_BITS-1:0] strm;     // One of STRM_CARD, STRM_HOST, STRM_TCP, or STRM_RDMA (this determines the where this request lands)
+        logic mode;                     // In the STRM_RDMA case, controls whether to skip the request splitter in the dreq_rdma_parser_wr module
         logic rdma;
         logic remote;