Moved nr_compute_tbs_common file to common MAC folder

- updated cmakelists file
- fixed formatting, tabs and white spaces in the function

cmake_targets/CMakeLists.txt

@@ -1933,7 +1933,7 @@ add_dependencies(L2_UE rrc_flag s1ap_flag x2_flag)
 
 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
 
-add_library( MAC_NR_COMMON ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c ${OPENAIR2_DIR}/LAYER2/NR_MAC_gNB/nr_compute_tbs_common.c)
+add_library( MAC_NR_COMMON ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c)
 
 include_directories("${OPENAIR2_DIR}/NR_UE_PHY_INTERFACE")
 include_directories("${OPENAIR2_DIR}/LAYER2")

openair2/LAYER2/NR_MAC_gNB/nr_compute_tbs_common.c → openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c

@@ -49,11 +49,8 @@ uint32_t nr_compute_tbs(uint16_t Qm,
   uint8_t n, scale;
 
   nbp_re = 12 * nb_symb_sch - nb_dmrs_prb - nb_rb_oh;
-
   nb_re = min(156, nbp_re) * nb_rb;
-    
   scale = (R>1024)?11:10;
-
   // Intermediate number of information bits
   Ninfo = ((nb_re * R * Qm * Nl)>>scale)>>tb_scaling;
 
@@ -66,26 +63,21 @@ uint32_t nr_compute_tbs(uint16_t Qm,
           break;
         }
       }
-    }
-    else {
+  } else {
     n = log2(Ninfo-24)-5;
     Np_info = max(3840, (ROUNDIDIV((Ninfo-24),(1<<n)))<<n);
 
     if (R <= 256) {
         C = CEILIDIV((Np_info+24),3816);
         nr_tbs = (C<<3)*CEILIDIV((Np_info+24),(C<<3)) - 24;
-        }
-        else {
+    } else {
       if (Np_info > 8424){
           C = CEILIDIV((Np_info+24),8424);
           nr_tbs = (C<<3)*CEILIDIV((Np_info+24),(C<<3)) - 24;
-            }
-            else {
+      } else {
         nr_tbs = ((CEILIDIV((Np_info+24),8))<<3) - 24;
       }
-
     }
-
   }
   //printf("Ninfo %d nbp_re %d nb_re %d Qm %d, R %d, tbs %d\n", Ninfo, nbp_re, nb_re, Qm, R, nr_tbs);
   return nr_tbs;
@@ -130,25 +122,19 @@ uint32_t nr_compute_tbslbrm(uint16_t table,
         break;
       }
     }
-  }
-  else {
+  } else {
     n = log2(Ninfo-24)-5;
     Np_info = max(3840, (ROUNDIDIV((Ninfo-24),(1<<n)))<<n);
 
     if (R <= 256) {
         nr_tbs = (C<<3)*CEILIDIV((Np_info+24),(C<<3)) - 24;
-        }
-        else {
+    } else {
       if (Np_info > 8424){
           nr_tbs = (C<<3)*CEILIDIV((Np_info+24),(C<<3)) - 24;
-            }
-            else {
+      } else {
         nr_tbs = ((CEILIDIV((Np_info+24),8))<<3) - 24;
       }
-
     }
-
   }
   return nr_tbs;
-
 }