Change how the delays of initiator and target are used

Author: jgavillalobos

modules/router/src/img_initiator.cpp

@@ -124,15 +124,17 @@ struct img_initiator: sc_module
     //Transaction Management Variables
     tlm::tlm_phase phase;
     tlm::tlm_sync_enum status;
+    tlm::tlm_command cur_command;
     img_generic_extension* img_ext;
 
     //Begin Request
     phase = tlm::BEGIN_REQ;
     transaction->acquire();
     transaction->get_extension(img_ext);
+    cur_command = transaction->get_command();
     dbgmodprint("BEGIN_REQ SENT TRANS ID %0d", img_ext->transaction_number);
     pending_transaction = transaction;
-    status = socket->nb_transport_fw(*transaction, phase, this->write_delay);  // Non-blocking transport call   
+    status = socket->nb_transport_fw(*transaction, phase, ((cur_command == tlm::TLM_WRITE_COMMAND) ? this->write_delay : this->read_delay));  // Non-blocking transport call   
 
     // Check request status returned by target
     switch (status) {   

modules/router/src/img_target.cpp

@@ -85,7 +85,7 @@ struct img_target: sc_module
 
                 //Queue a response
                 tlm::tlm_phase int_phase = internal_processing_ph;
-                m_peq.notify(trans, int_phase, response_delay);
+                m_peq.notify(trans, int_phase, receive_delay);
                 break;
             }
             case tlm::END_RESP:

modules/router/src/tb_edge_detector_tlm.cpp

@@ -51,7 +51,7 @@ SC_MODULE(Tb_top)
     rgb2gray_DUT = new rgb2gray_tlm("rgb2gray_DUT");
 
     sobel_initiator->start_img_initiators();
-    sobel_initiator->set_delays(sc_time(10, SC_NS), sc_time(3, SC_NS));
+    sobel_initiator->set_delays(sc_time(10, SC_NS), sc_time(10, SC_NS));
     edge_detector_DUT->set_delays(sc_time(10, SC_NS), sc_time(3, SC_NS));
     gray_initiator->start_img_initiators();
     gray_initiator->set_delays(sc_time(0, SC_NS), sc_time(0, SC_NS));