Change how the input data is handled in the packet generator to accept more data in form of a pointer

Author: fa-jimenez

modules/ethernetAMS/include/ethernetEncoder.h

@@ -24,12 +24,14 @@ SCA_TDF_MODULE(ethernetEncoder)
 
     std::map<std::string, std::string> encoding_map;
 
+    sca_core::sca_time sample_time;
+
     void set_attributes();
     void initialize();
     void processing();
 
-    SCA_CTOR(ethernetEncoder)
-    : data_in("data_in"), mlt3_out("mlt3_out"), valid("valid")
+    ethernetEncoder(sc_core::sc_module_name name, sca_core::sca_time sample_time)
+    : sca_tdf::sca_module(name), data_in("data_in"), mlt3_out("mlt3_out"), valid("valid"), sample_time(sample_time)
     {
     }
 };

modules/ethernetAMS/include/packetGenerator.h

@@ -1,20 +1,11 @@
+#ifndef PACKET_GENERATOR_H
+#define PACKET_GENERATOR_H
+
 #include <systemc-ams.h>
 
 SCA_TDF_MODULE(packetGenerator)
 {
-  SCA_CTOR(packetGenerator) : bitCount(0)
-  {
-    // Set the time-step
-    set_timestep(sc_core::sc_time(10, sc_core::SC_NS));
-    tmp_data_out_valid = false;
-    n1_data_out_valid = false;
-    n2_data_out_valid = false;
-    n2_sigBitCount = 0;
-
-    preamble_in_process = false;
-    data_length_in_process = false;
-  }
-
+public:
   #define N 16
 
   // Main results from block
@@ -42,6 +33,8 @@ SCA_TDF_MODULE(packetGenerator)
   sca_tdf::sca_out<sc_dt::sc_int<4>> n2_sigBitCount_;
   sca_tdf::sca_out<sc_dt::sc_int<4>> sigBitCount;
 
+  sca_tdf::sca_out<sc_dt::sc_int<32>> remaining_bytes_to_send;
+
   // Internal values to do the logic
   bool tmp_data_out_valid;
 
@@ -56,7 +49,6 @@ SCA_TDF_MODULE(packetGenerator)
   sc_dt::sc_int<4> n2_sigBitCount;
 
   bool preamble_in_process;
-  bool data_length_in_process;
 
   // Data to be sent, set in fill_data()
   sc_dt::sc_bv<N * 4> data_in;
@@ -66,9 +58,34 @@ SCA_TDF_MODULE(packetGenerator)
   sc_dt::sc_bv<N> data_valid_to_send;
 
   int bitCount;
+  int actual_data_length;
+  int bytes_sent;
 
-  void fill_data(unsigned char* data, int data_length);
+  unsigned char preamble_data[8] = {0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xBA};
+  unsigned char* local_data;
 
-  void processing();
+  sca_core::sca_time sample_time;
 
+  // Constructor with sample time argument
+  packetGenerator(sc_core::sc_module_name name, sca_core::sca_time sample_time)
+  : sca_tdf::sca_module(name)
+  {
+    bitCount = 0;
+    this->sample_time = sample_time;
+
+    tmp_data_out_valid = false;
+    n1_data_out_valid = false;
+    n2_data_out_valid = false;
+    n2_sigBitCount = 0;
+
+    preamble_in_process = false;
+  }
+
+  void fill_data(unsigned char* data, int packet_length);
+  void create_pack_of_data(unsigned char* data, int packet_length);
+
+  void processing();
+  void set_attributes();
 };
+
+#endif // PACKET_GENERATOR_H

modules/ethernetAMS/src/ethernetEncoder.cpp

@@ -1,9 +1,12 @@
+#ifndef ETHERNET_ENCODER_CPP
+#define ETHERNET_ENCODER_CPP
+
 #include "ethernetEncoder.h"
 
 void ethernetEncoder::set_attributes()
 {
     // Set a timestep for the TDF module
-    set_timestep(sca_core::sca_time(10, SC_NS));  // Example timestep
+    set_timestep(sample_time);
 }
 
 void ethernetEncoder::initialize()
@@ -71,3 +74,5 @@ void ethernetEncoder::processing()
 
     sampleCount++;
 }
+
+#endif // ETHERNET_ENCODER_CPP

modules/ethernetAMS/src/packetGenerator.cpp

@@ -1,8 +1,31 @@
+#ifndef PACKET_GENERATOR_CPP
+#define PACKET_GENERATOR_CPP
+
 #include <systemc-ams.h>
 #include <systemc.h>
 #include "packetGenerator.h"
 
+void packetGenerator::set_attributes()
+{
+    // Set a timestep for the TDF module
+    set_timestep(sample_time);
+}
+
 void packetGenerator::fill_data(unsigned char* data, int packet_length)
+{
+  local_data = new unsigned char[packet_length];
+  memcpy(local_data, data, packet_length * sizeof(char));
+
+  actual_data_length = packet_length;
+  bytes_sent = 0;
+
+  // Insert first the preamble
+  create_pack_of_data(preamble_data, 8);
+
+  preamble_in_process = true;
+}
+
+void packetGenerator::create_pack_of_data(unsigned char* data, int packet_length)
 {
   int actual_length = (packet_length * 2 > N) ? N : packet_length * 2;
   unsigned char tmp_data;
@@ -20,22 +43,11 @@ void packetGenerator::fill_data(unsigned char* data, int packet_length)
     tmp_data_valid[i] = 1;
   }
 
-  data_in = tmp_data_in;
-  data_in_valid = tmp_data_valid;
-
-  // Insert first the preamble
-  for (int i = 0; i < 15; i++)
-  {
-    std::cout << "@" << sc_time_stamp() << " Inside fill_data(): i " << i << std::endl;
-    data_to_send.range(i * 4 + 3, i * 4) = "1010";
-  }
-  data_to_send.range(63, 60) = "1011";
-  data_valid_to_send = "1111111111111111";
+  data_to_send = tmp_data_in;
+  data_valid_to_send = tmp_data_valid;
 
   n2_data_valid = data_valid_to_send;
   n1_data_valid = n2_data_valid;
-
-  preamble_in_process = true;
 }
 
 void packetGenerator::processing()
@@ -47,41 +59,35 @@ void packetGenerator::processing()
 
   if ((tmp_data_valid_to_send.or_reduce() == 0) && (preamble_in_process == true))
   {
-    unsigned char length = 0;
-    sc_dt::sc_bv<8> local_length = 0;
+    sc_dt::sc_bv<32> local_length = 0;
 
     preamble_in_process = false;
-    data_length_in_process = true;
 
-    for (int i = 0; i < N; i++)
-    {
-      if (data_in_valid[i] == 1)
-      {
-        length++;
-      }
-    }
-    local_length = length / 2;
+    local_length = (unsigned int)actual_data_length;
 
     data_to_send = 0;
-    data_to_send.range(7, 0) = local_length;
-    data_valid_to_send = "11";
+    data_to_send.range(31, 0) = local_length;
+    data_valid_to_send = "11111111";
     tmp_data_to_send = data_to_send;
     tmp_data_valid_to_send = data_valid_to_send;
 
     n2_data_valid = data_valid_to_send;
     n1_data_valid = n2_data_valid;
   }
-  else if ((tmp_data_valid_to_send.or_reduce() == 0) && (data_length_in_process == true))
+  else if ((tmp_data_valid_to_send.or_reduce() == 0) && (actual_data_length > 0))
   {
-    data_length_in_process = false;
-
-    data_to_send = data_in;
-    data_valid_to_send = data_in_valid;
-    tmp_data_to_send = data_to_send;
-    tmp_data_valid_to_send = data_valid_to_send;
-
-    n2_data_valid = data_valid_to_send;
-    n1_data_valid = n2_data_valid;
+    if (actual_data_length > 8)
+    {
+      create_pack_of_data((local_data + bytes_sent), 8);
+      actual_data_length -= 8;
+      bytes_sent += 8;
+    }
+    else
+    {
+      create_pack_of_data((local_data + bytes_sent), actual_data_length);
+      actual_data_length = 0;
+      delete[] local_data;
+    }
   }
 
   n1_data_out = n2_data_out;
@@ -174,4 +180,8 @@ void packetGenerator::processing()
 
   data_to_send_.write(data_to_send);
   data_valid_to_send_.write(data_valid_to_send);
+
+  remaining_bytes_to_send.write(actual_data_length);
 }
+
+#endif // PACKET_GENERATOR_CPP

modules/ethernetAMS/src/tb_ethernet_encoder.cpp

@@ -1,9 +1,12 @@
+#ifndef TB_ETHERNET_ENCODER_CPP
+#define TB_ETHERNET_ENCODER_CPP
+
 #include <systemc-ams.h>
 #include <systemc.h>
 #include "ethernetEncoder.h"
 #include "packetGenerator.h"
 
-int sc_main(int argc, char* argv[])
+int sc_main()
 {
     sca_tdf::sca_signal<bool> valid;
     sca_tdf::sca_signal<double> mlt3_out_signal;
@@ -30,11 +33,14 @@ int sc_main(int argc, char* argv[])
     sca_tdf::sca_signal<sc_dt::sc_int<4>> n2_sigBitCount;
     sca_tdf::sca_signal<sc_dt::sc_int<4>> sigBitCount;
 
+    sca_tdf::sca_signal<sc_dt::sc_int<32>> remaining_bytes_to_send;
+
+    sca_core::sca_time sample_time(10, SC_NS);
 
-    unsigned char data[8];
+    unsigned char data[16];
 
-    ethernetEncoder encoder("encoder");
-    packetGenerator pkt_gen("pkt_gen");
+    ethernetEncoder encoder("encoder", sample_time);
+    packetGenerator pkt_gen("pkt_gen", sample_time);
 
     encoder.data_in(data_out);
     encoder.mlt3_out(mlt3_out_signal);
@@ -63,6 +69,8 @@ int sc_main(int argc, char* argv[])
     pkt_gen.n2_sigBitCount_(n2_sigBitCount);
     pkt_gen.sigBitCount(sigBitCount);
 
+    pkt_gen.remaining_bytes_to_send(remaining_bytes_to_send);
+
     // Trace file setup
     sca_util::sca_trace_file *traceFile = sca_util::sca_create_vcd_trace_file("ethernetEncoder");
 
@@ -85,15 +93,29 @@ int sc_main(int argc, char* argv[])
         sca_util::sca_trace(traceFile, tmp_data_out_valid, "pkt_gen_tmp_data_out_valid");
         sca_util::sca_trace(traceFile, data_to_send, "pkt_gen_data_to_send");
         sca_util::sca_trace(traceFile, data_valid_to_send, "pkt_gen_data_valid_to_send");
+        sca_util::sca_trace(traceFile, remaining_bytes_to_send, "pkt_gen_remaining_bytes_to_send");
     }
 
     sc_start(45, SC_NS);
     data[0] = 113;
     data[1] = 255;
     data[2] = 204;
-    pkt_gen.fill_data(data, 3);
-
-    sc_start(1455, SC_NS); // Run the simulation for 500 ns
+    data[3] = 85;
+    data[4] = 173;
+    data[5] = 37;
+    data[6] = 142;
+    data[7] = 69;
+    data[8] = 91;
+    data[9] = 178;
+    data[10] = 220;
+    data[11] = 33;
+    data[12] = 77;
+    data[13] = 111;
+    data[14] = 146;
+    data[15] = 194;
+    pkt_gen.fill_data(data, 13);
+
+    sc_start(3455, SC_NS); // Run the simulation for 500 ns
 
     if (traceFile)
     {
@@ -102,3 +124,5 @@ int sc_main(int argc, char* argv[])
 
     return 0;
 }
+
+#endif // TB_ETHERNET_ENCODER_CPP