Renamed func_ring_nof_hops_to_source_rn() to include ring (to refer to ring_lib) in name.

libraries/base/ring/src/vhdl/ring_pkg.vhd

@@ -93,14 +93,14 @@ PACKAGE ring_pkg is
   );
   CONSTANT c_ring_dp_hdr_field_size : NATURAL := ceil_div(field_slv_len(c_ring_dp_hdr_field_arr), c_longword_w);
 
-  FUNCTION func_nof_hops_to_source_rn(hops, this_rn, N_rn, lane_dir : NATURAL) RETURN NATURAL;
-  FUNCTION func_nof_hops_to_source_rn(hops, this_rn, N_rn : STD_LOGIC_VECTOR; lane_dir : NATURAL) RETURN STD_LOGIC_VECTOR; -- return vector length is same as hops vector length
+  FUNCTION func_ring_nof_hops_to_source_rn(hops, this_rn, N_rn, lane_dir : NATURAL) RETURN NATURAL;
+  FUNCTION func_ring_nof_hops_to_source_rn(hops, this_rn, N_rn : STD_LOGIC_VECTOR; lane_dir : NATURAL) RETURN STD_LOGIC_VECTOR; -- return vector length is same as hops vector length
 
  END PACKAGE ring_pkg;
 
 PACKAGE BODY ring_pkg IS
 
-  FUNCTION func_nof_hops_to_source_rn(hops, this_rn, N_rn, lane_dir : NATURAL) RETURN NATURAL IS
+  FUNCTION func_ring_nof_hops_to_source_rn(hops, this_rn, N_rn, lane_dir : NATURAL) RETURN NATURAL IS
     VARIABLE v_source_rn     : INTEGER;
     VARIABLE v_source_rn_nat : NATURAL;
   BEGIN
@@ -123,9 +123,9 @@ PACKAGE BODY ring_pkg IS
     RETURN v_source_rn_nat;
   END;
 
-  FUNCTION func_nof_hops_to_source_rn(hops, this_rn, N_rn : STD_LOGIC_VECTOR; lane_dir : NATURAL) RETURN STD_LOGIC_VECTOR IS
+  FUNCTION func_ring_nof_hops_to_source_rn(hops, this_rn, N_rn : STD_LOGIC_VECTOR; lane_dir : NATURAL) RETURN STD_LOGIC_VECTOR IS
   BEGIN
-    RETURN TO_UVEC(func_nof_hops_to_source_rn(TO_UINT(hops), TO_UINT(this_rn), TO_UINT(N_rn), lane_dir),hops'LENGTH);
+    RETURN TO_UVEC(func_ring_nof_hops_to_source_rn(TO_UINT(hops), TO_UINT(this_rn), TO_UINT(N_rn), lane_dir),hops'LENGTH);
   END;
   
 END ring_pkg;

libraries/base/ring/src/vhdl/ring_rx.vhd

@@ -199,7 +199,7 @@ BEGIN
 
         -- Convert nof_hops to source RN
         monitor_sosi <= decoded_sosi;
-        monitor_sosi.channel <= func_nof_hops_to_source_rn(decoded_sosi.channel, this_rn, N_rn, g_lane_direction);
+        monitor_sosi.channel <= func_ring_nof_hops_to_source_rn(decoded_sosi.channel, this_rn, N_rn, g_lane_direction);
       END IF;
     END PROCESS;
 

libraries/base/ring/src/vhdl/ring_tx.vhd

@@ -205,7 +205,7 @@ BEGIN
 
         -- Convert nof_hops to source RN
         monitor_sosi <= validated_sosi;
-        monitor_sosi.channel <= func_nof_hops_to_source_rn(validated_sosi.channel, this_rn, N_rn, g_lane_direction);
+        monitor_sosi.channel <= func_ring_nof_hops_to_source_rn(validated_sosi.channel, this_rn, N_rn, g_lane_direction);
       END IF;
     END PROCESS;