TODO address

NR_gNB_DLSCH => txdataF
do_one_dlsch()
2026-07-17 14:40:31 +00:00 · 2026-02-07 09:25:23 +01:00 · 2026-02-07 09:25:22 +01:00 · 2026-02-07 09:25:22 +01:00 · 2026-02-07 09:25:21 +01:00 · 2026-02-07 09:25:21 +01:00
55 changed files with 773 additions and 1411 deletions
--- a/ci-scripts/Jenkinsfile
+++ b/ci-scripts/Jenkinsfile
@@ -115,7 +115,6 @@ pipeline {
            } else {
              sh "git fetch"
              sh "git checkout -f ${commitID}"
-              sh "git reset --hard origin/${commitID}"
            }
          } else {
            echo "\u274C Some parameters are missing"
--- a/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch
+++ b/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch
@@ -1,5 +1,5 @@
 diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
-index ac5f471..b1acb26 100644
+index ac5f471..ed9ab7d 100644
 --- a/fhi_lib/app/src/common.h
 +++ b/fhi_lib/app/src/common.h
@@ -28,7 +28,7 @@
@@ -7,7 +7,7 @@ index ac5f471..b1acb26 100644
 #include <rte_mbuf.h>
 
 -#define VERSIONX                "oran_f_release_v1.0"
-+#define VERSIONX                "oran_f_release_v1.8"
+#define VERSIONX                "oran_f_release_v1.7"
 
 #define APP_O_DU  0
 #define APP_O_RU  1
@@ -530,7 +530,7 @@ index 59b6850..322d238 100644
 \ No newline at end of file
 +}
 diff --git a/fhi_lib/lib/src/xran_cb_proc.c b/fhi_lib/lib/src/xran_cb_proc.c
-index 08660f3..b5de607 100644
+index 08660f3..2bb5187 100644
 --- a/fhi_lib/lib/src/xran_cb_proc.c
 +++ b/fhi_lib/lib/src/xran_cb_proc.c
@@ -25,7 +25,10 @@
@@ -544,55 +544,6 @@ index 08660f3..b5de607 100644
 #include <rte_common.h>
 #include <rte_eal.h>
 #include <rte_errno.h>
-@@ -106,6 +109,12 @@ void xran_timer_arm_for_deadline(struct rte_timer *tim, void* arg,  void *p_dev_
-            + nSubframeIdx*SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local)
-            + nSlotIdx;
- 
-+    /* correction to rx_tti for Ta4 values larger than a TTI */
-+    rx_tti -= p_xran_dev_ctx->offset_num_slots_up_ul;
-+    if (rx_tti < 0) {
-+        rx_tti += (SUBFRAMES_PER_SYSTEMFRAME*SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local)*1024);
-+    }
-+
-     p_xran_dev_ctx->cb_timer_ctx[p_xran_dev_ctx->timer_put %  MAX_CB_TIMER_CTX].tti_to_process = rx_tti;
-     if (xran_if_current_state == XRAN_RUNNING){
-         rte_timer_cb_t fct = (rte_timer_cb_t)arg;
-@@ -195,6 +204,7 @@ xran_timing_create_cbs(void *args)
-             max_dl_delay_offset += interval_us_local;
-             numSlots++;
-         }
-+        p_dev_ctx->offset_num_slots_cp_dl = numSlots;
- 
-         /* Delay from start of 'a' slot */
-         delay_cp_dl_max = max_dl_delay_offset - p_dev_ctx->fh_cfg.T1a_max_cp_dl;
-@@ -227,6 +237,7 @@ xran_timing_create_cbs(void *args)
-             ul_delay_offset += interval_us_local;
-             numSlots++;
-         }
-+        p_dev_ctx->offset_num_slots_cp_ul = numSlots;
-         delay_cp_ul = ul_delay_offset - p_dev_ctx->fh_cfg.T1a_max_cp_ul;
-         sym_cp_ul = (delay_cp_ul*1000/(interval_us_local*1000/N_SYM_PER_SLOT)+1);
-         uint8_t ul_offset_sym = (numSlots+1)*N_SYM_PER_SLOT - sym_cp_ul;
-@@ -242,8 +253,18 @@ xran_timing_create_cbs(void *args)
- 
-         delay_up    = p_dev_ctx->fh_cfg.T1a_max_up;
-         time_diff_us = p_dev_ctx->fh_cfg.Ta4_max;
-+        uint32_t ul_up_delay_offset=interval_us_local;
-+        numSlots=0;
-+        while(time_diff_us > ul_up_delay_offset) {
-+            ul_up_delay_offset += interval_us_local;
-+            numSlots++;
-+        }
-+        p_dev_ctx->offset_num_slots_up_ul = numSlots;
-+
-+        printf("offset_num_slots_cp_dl=%d, offset_num_slots_cp_ul=%d, offset_num_slots_up_ul=%d\n",
-+            p_dev_ctx->offset_num_slots_cp_dl, p_dev_ctx->offset_num_slots_cp_ul, p_dev_ctx->offset_num_slots_up_ul);
- 
-        delay_cp2up = delay_up-delay_cp_dl_max;
-+        delay_cp2up = p_dev_ctx->fh_cfg.T1a_max_cp_dl - p_dev_ctx->fh_cfg.T1a_max_up;
- 
- 
-         time_diff_nSymb = time_diff_us*1000/(interval_us_local*1000/N_SYM_PER_SLOT);
 diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
 index dc40ad9..1b88013 100644
 --- a/fhi_lib/lib/src/xran_common.c
@@ -1081,7 +1032,7 @@ index 4acade1..c939edc 100644
         for(i = 0; i < xran_ports_num; i++){
             g_xran_dev_ctx[i] = pCtx;
 diff --git a/fhi_lib/lib/src/xran_dev.h b/fhi_lib/lib/src/xran_dev.h
-index 0371a53..778b38d 100644
+index 0371a53..dd76b49 100644
 --- a/fhi_lib/lib/src/xran_dev.h
 +++ b/fhi_lib/lib/src/xran_dev.h
@@ -201,6 +201,7 @@ struct __rte_cache_aligned xran_device_ctx
@@ -1092,18 +1043,6 @@ index 0371a53..778b38d 100644
     int64_t offset_sec;
     int64_t offset_nsec;    //offset to GPS time calcuated based on alpha and beta
     uint32_t interval_us_local;
-@@ -254,6 +255,11 @@ struct __rte_cache_aligned xran_device_ctx
-     int32_t sym_up; /**< when we start sym 0 of up with respect to OTA time as measured in symbols */
-     int32_t sym_up_ul;
- 
-+    /* used to support large T1a/Ta4 values */
-+    int32_t offset_num_slots_cp_dl;
-+    int32_t offset_num_slots_cp_ul;
-+    int32_t offset_num_slots_up_ul;
-+
-     xran_fh_tti_callback_fn ttiCb[XRAN_CB_MAX];
-     void *TtiCbParam[XRAN_CB_MAX];
-     uint32_t SkipTti[XRAN_CB_MAX];
 diff --git a/fhi_lib/lib/src/xran_frame_struct.c b/fhi_lib/lib/src/xran_frame_struct.c
 index fbb1298..44aaf92 100644
 --- a/fhi_lib/lib/src/xran_frame_struct.c
@@ -1143,7 +1082,7 @@ index 7ed0a3a..8e66945 100644
 #ifdef __cplusplus
 }
 diff --git a/fhi_lib/lib/src/xran_main.c b/fhi_lib/lib/src/xran_main.c
-index 7c472d7..db03d94 100644
+index 7c472d7..7c7cf91 100644
 --- a/fhi_lib/lib/src/xran_main.c
 +++ b/fhi_lib/lib/src/xran_main.c
@@ -35,7 +35,11 @@
@@ -1193,42 +1132,7 @@ index 7c472d7..db03d94 100644
     print_dbg("PRACH eAxC_offset %d\n",  pPrachCPConfig->eAxC_offset);
 
     /* Save some configs for app */
-@@ -623,6 +646,8 @@ xran_prepare_cp_dl_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
-     return ret;
- }
- 
-+uint32_t prev_dl_tti = -1;
-+
- void
- tx_cp_dl_cb(struct rte_timer *tim, void *arg)
- {
-@@ -655,7 +680,7 @@ tx_cp_dl_cb(struct rte_timer *tim, void *arg)
- 
-     if(first_call && p_xran_dev_ctx->enableCP)
-     {
-        tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process;
-+        tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process + p_xran_dev_ctx->offset_num_slots_cp_dl;
-         buf_id = tti % XRAN_N_FE_BUF_LEN;
- 
-         slot_id     = XranGetSlotNum(tti, SLOTNUM_PER_SUBFRAME(interval_us_local));
-@@ -665,6 +690,16 @@ tx_cp_dl_cb(struct rte_timer *tim, void *arg)
-         {
-             /* Wrap around to next second */
-             frame_id = (frame_id + NUM_OF_FRAMES_PER_SECOND) & 0x3ff;
-+            prev_dl_tti = -1;
-+        }
-+        else if (p_xran_dev_ctx->offset_num_slots_cp_dl > 0 && prev_dl_tti == xran_fs_get_max_slot(PortId) - 1 + p_xran_dev_ctx->offset_num_slots_cp_dl)
-+        {
-+            prev_dl_tti = tti;
-+            tti = xran_fs_get_max_slot(PortId) + p_xran_dev_ctx->offset_num_slots_cp_dl;
-+        }
-+        else
-+        {
-+            prev_dl_tti = tti;
-         }
- 
-         ctx_id      = tti % XRAN_MAX_SECTIONDB_CTX;
-@@ -1169,6 +1204,10 @@ xran_prepare_cp_ul_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
+@@ -1169,6 +1192,10 @@ xran_prepare_cp_ul_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
                             uint8_t seqid = xran_get_cp_seqid(pHandle, XRAN_DIR_UL, cc_id, port_id);
 
                             beam_id = xran_get_beamid(pHandle, XRAN_DIR_UL, cc_id, port_id, slot_id);
@@ -1239,45 +1143,7 @@ index 7c472d7..db03d94 100644
                             ret = generate_cpmsg_prach(pHandle, &params, sect_geninfo, mbuf, p_xran_dev_ctx,
                                         frame_id, subframe_id, slot_id, tti,
                                         beam_id, cc_id, port_id, occasionid, seqid);
-@@ -1213,6 +1252,7 @@ xran_prepare_cp_ul_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
-     return ret;
- }
- 
-+uint32_t prev_ul_tti = -1;
- 
- void
- tx_cp_ul_cb(struct rte_timer *tim, void *arg)
-@@ -1254,7 +1294,7 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
-         pTCtx       = &p_xran_dev_ctx->timer_ctx[0];
-         interval    = p_xran_dev_ctx->interval_us_local;
-         PortId      = p_xran_dev_ctx->xran_port_id;
-    tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process;
-+    tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process + p_xran_dev_ctx->offset_num_slots_cp_ul;
- 
-     buf_id = tti % XRAN_N_FE_BUF_LEN;
-         ctx_id      = tti % XRAN_MAX_SECTIONDB_CTX;
-@@ -1264,7 +1304,20 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
- 
-         /* Wrap around to next second */
-         if(tti == 0)
-+        {
-             frame_id = (frame_id + NUM_OF_FRAMES_PER_SECOND) & 0x3ff;
-+            prev_ul_tti = tti;
-+        }
-+        else if (p_xran_dev_ctx->offset_num_slots_cp_ul > 0 && prev_ul_tti == xran_fs_get_max_slot(PortId) - 1 + p_xran_dev_ctx->offset_num_slots_cp_ul)
-+        {
-+            prev_ul_tti = tti;
-+            tti = xran_fs_get_max_slot(PortId) + p_xran_dev_ctx->offset_num_slots_cp_ul;
-+        }
-+        else
-+        {
-+            prev_ul_tti = tti;
-+        }
-+
-     if(xran_get_ru_category(pHandle) == XRAN_CATEGORY_A)
-         num_eAxc    = xran_get_num_eAxc(pHandle);
-     else
-@@ -1338,6 +1391,10 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
+@@ -1338,6 +1365,10 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
                             uint8_t seqid = xran_get_cp_seqid(pHandle, XRAN_DIR_UL, cc_id, port_id);
 
                             beam_id = xran_get_beamid(pHandle, XRAN_DIR_UL, cc_id, port_id, slot_id);
@@ -1288,7 +1154,7 @@ index 7c472d7..db03d94 100644
                         ret = generate_cpmsg_prach(pHandle, &params, sect_geninfo, mbuf, p_xran_dev_ctx,
                                         frame_id, subframe_id, slot_id, tti,
                                         beam_id, cc_id, port_id, occasionid, seqid);
-@@ -1570,6 +1627,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
+@@ -1570,6 +1601,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
         {
         case ECPRI_IQ_DATA:
                 pkt_data[num_data++] = pkt;
@@ -1296,7 +1162,7 @@ index 7c472d7..db03d94 100644
             break;
         // For RU emulation
         case ECPRI_RT_CONTROL_DATA:
-@@ -1587,7 +1645,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
+@@ -1587,7 +1619,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
                 break;
             default:
                 if (p_dev_ctx->fh_init.io_cfg.id == O_DU) {
@@ -1305,7 +1171,7 @@ index 7c472d7..db03d94 100644
         }
                 break;
     }
-@@ -1876,7 +1934,7 @@ xran_sector_get_instances (uint32_t xran_port, void * pDevHandle, uint16_t nNumI
+@@ -1876,7 +1908,7 @@ xran_sector_get_instances (uint32_t xran_port, void * pDevHandle, uint16_t nNumI
     for (i = 0; i < nNumInstances; i++) {
 
         /* Allocate Memory for CC handles */
@@ -1314,7 +1180,7 @@ index 7c472d7..db03d94 100644
 
         if(pCcHandle == NULL)
             return XRAN_STATUS_RESOURCE;
-@@ -2347,8 +2405,7 @@ ring_processing_func_per_port(void* args)
+@@ -2347,8 +2379,7 @@ ring_processing_func_per_port(void* args)
     for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i = i+1) {
         if (ctx->vf2xran_port[i] == port_id) {
             for(qi = 0; qi < ctx->rxq_per_port[port_id]; qi++){
@@ -1324,7 +1190,7 @@ index 7c472d7..db03d94 100644
             }
         }
     }
-@@ -2414,9 +2471,6 @@ xran_spawn_workers(void)
+@@ -2414,9 +2445,6 @@ xran_spawn_workers(void)
         nWorkerCore = nWorkerCore << 1;
     }
 
@@ -1334,7 +1200,7 @@ index 7c472d7..db03d94 100644
     printf("O-XU      %d\n", eth_ctx->io_cfg.id);
     printf("HW        %d\n", icx_cpu);
     printf("Num cores %d\n", total_num_cores);
-@@ -2453,7 +2507,7 @@ xran_spawn_workers(void)
+@@ -2453,7 +2481,7 @@ xran_spawn_workers(void)
                 eth_ctx->time_wrk_cfg.arg   = NULL;
                 eth_ctx->time_wrk_cfg.state = 1;
 
@@ -1343,7 +1209,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -2475,7 +2529,7 @@ xran_spawn_workers(void)
+@@ -2475,7 +2503,7 @@ xran_spawn_workers(void)
 
                 /* workers */
                 /** 0 **/
@@ -1352,7 +1218,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -2502,7 +2556,7 @@ xran_spawn_workers(void)
+@@ -2502,7 +2530,7 @@ xran_spawn_workers(void)
                 }
 
                 /** 1 - CP GEN **/
@@ -1361,7 +1227,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -2536,7 +2590,7 @@ xran_spawn_workers(void)
+@@ -2536,7 +2564,7 @@ xran_spawn_workers(void)
                 else
                 p_dev->tx_sym_gen_func = xran_process_tx_sym_cp_on_opt;
 
@@ -1370,7 +1236,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -2559,7 +2613,7 @@ xran_spawn_workers(void)
+@@ -2559,7 +2587,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0 **/
@@ -1379,7 +1245,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2586,7 +2640,7 @@ xran_spawn_workers(void)
+@@ -2586,7 +2614,7 @@ xran_spawn_workers(void)
                     }
 
                     /** 1 - CP GEN **/
@@ -1388,7 +1254,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2613,7 +2667,7 @@ xran_spawn_workers(void)
+@@ -2613,7 +2641,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0 **/
@@ -1397,7 +1263,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2628,7 +2682,7 @@ xran_spawn_workers(void)
+@@ -2628,7 +2656,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1 - CP GEN **/
@@ -1406,7 +1272,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2643,7 +2697,7 @@ xran_spawn_workers(void)
+@@ -2643,7 +2671,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2 UP GEN **/
@@ -1415,7 +1281,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2682,7 +2736,7 @@ xran_spawn_workers(void)
+@@ -2682,7 +2710,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0 **/
@@ -1424,7 +1290,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2697,7 +2751,7 @@ xran_spawn_workers(void)
+@@ -2697,7 +2725,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1 - CP GEN **/
@@ -1433,7 +1299,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2712,7 +2766,7 @@ xran_spawn_workers(void)
+@@ -2712,7 +2740,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2 UP GEN **/
@@ -1442,7 +1308,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2727,7 +2781,7 @@ xran_spawn_workers(void)
+@@ -2727,7 +2755,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 3 UP GEN **/
@@ -1451,7 +1317,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2766,7 +2820,7 @@ xran_spawn_workers(void)
+@@ -2766,7 +2794,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0 **/
@@ -1460,7 +1326,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2781,7 +2835,7 @@ xran_spawn_workers(void)
+@@ -2781,7 +2809,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1 Eth Tx **/
@@ -1469,7 +1335,7 @@ index 7c472d7..db03d94 100644
 
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
-@@ -2797,7 +2851,7 @@ xran_spawn_workers(void)
+@@ -2797,7 +2825,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2 - CP GEN **/
@@ -1478,7 +1344,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2812,7 +2866,7 @@ xran_spawn_workers(void)
+@@ -2812,7 +2840,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 3 UP GEN **/
@@ -1487,7 +1353,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2827,7 +2881,7 @@ xran_spawn_workers(void)
+@@ -2827,7 +2855,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 4 UP GEN **/
@@ -1496,7 +1362,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2861,7 +2915,7 @@ xran_spawn_workers(void)
+@@ -2861,7 +2889,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0  Eth RX */
@@ -1505,7 +1371,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2876,7 +2930,7 @@ xran_spawn_workers(void)
+@@ -2876,7 +2904,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1  FH RX and BBDEV */
@@ -1514,7 +1380,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2891,7 +2945,7 @@ xran_spawn_workers(void)
+@@ -2891,7 +2919,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2  FH RX and BBDEV */
@@ -1523,7 +1389,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2906,7 +2960,7 @@ xran_spawn_workers(void)
+@@ -2906,7 +2934,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 3  FH RX and BBDEV */
@@ -1532,7 +1398,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2921,7 +2975,7 @@ xran_spawn_workers(void)
+@@ -2921,7 +2949,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /**  FH TX and BBDEV */
@@ -1541,7 +1407,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -2969,7 +3023,7 @@ xran_spawn_workers(void)
+@@ -2969,7 +2997,7 @@ xran_spawn_workers(void)
 
             /* p_dev->tx_sym_gen_func = xran_process_tx_sym_cp_on_opt; */
 
@@ -1550,7 +1416,7 @@ index 7c472d7..db03d94 100644
             if(pThCtx == NULL){
                 print_err("pThCtx allocation error\n");
                 return XRAN_STATUS_FAIL;
-@@ -3004,7 +3058,7 @@ xran_spawn_workers(void)
+@@ -3004,7 +3032,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0 **/
@@ -1559,7 +1425,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3031,7 +3085,7 @@ xran_spawn_workers(void)
+@@ -3031,7 +3059,7 @@ xran_spawn_workers(void)
                     }
 
                     /** 1 - CP GEN **/
@@ -1568,7 +1434,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3062,7 +3116,7 @@ xran_spawn_workers(void)
+@@ -3062,7 +3090,7 @@ xran_spawn_workers(void)
 
                 /* workers */
                 /** 0 **/
@@ -1577,7 +1443,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3089,7 +3143,7 @@ xran_spawn_workers(void)
+@@ -3089,7 +3117,7 @@ xran_spawn_workers(void)
                 }
 
                 /** 1 - CP GEN **/
@@ -1586,7 +1452,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3115,7 +3169,7 @@ xran_spawn_workers(void)
+@@ -3115,7 +3143,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0 **/
@@ -1595,7 +1461,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3130,7 +3184,7 @@ xran_spawn_workers(void)
+@@ -3130,7 +3158,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1 - CP GEN **/
@@ -1604,7 +1470,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3145,7 +3199,7 @@ xran_spawn_workers(void)
+@@ -3145,7 +3173,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2 UP GEN **/
@@ -1613,7 +1479,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3184,7 +3238,7 @@ xran_spawn_workers(void)
+@@ -3184,7 +3212,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0  FH RX and BBDEV */
@@ -1622,7 +1488,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3199,7 +3253,7 @@ xran_spawn_workers(void)
+@@ -3199,7 +3227,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1 - CP GEN **/
@@ -1631,7 +1497,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3214,7 +3268,7 @@ xran_spawn_workers(void)
+@@ -3214,7 +3242,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2 UP GEN **/
@@ -1640,7 +1506,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3229,7 +3283,7 @@ xran_spawn_workers(void)
+@@ -3229,7 +3257,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 3 UP GEN **/
@@ -1649,7 +1515,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3266,7 +3320,7 @@ xran_spawn_workers(void)
+@@ -3266,7 +3294,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0 **/
@@ -1658,7 +1524,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3281,7 +3335,7 @@ xran_spawn_workers(void)
+@@ -3281,7 +3309,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1 - CP GEN **/
@@ -1667,7 +1533,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3296,7 +3350,7 @@ xran_spawn_workers(void)
+@@ -3296,7 +3324,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2 UP GEN **/
@@ -1676,7 +1542,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3311,7 +3365,7 @@ xran_spawn_workers(void)
+@@ -3311,7 +3339,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 3 UP GEN **/
@@ -1685,7 +1551,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3326,7 +3380,7 @@ xran_spawn_workers(void)
+@@ -3326,7 +3354,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 4 UP GEN **/
@@ -1694,7 +1560,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3348,7 +3402,7 @@ xran_spawn_workers(void)
+@@ -3348,7 +3376,7 @@ xran_spawn_workers(void)
 
                     /* workers */
                     /** 0  Eth RX */
@@ -1703,7 +1569,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3363,7 +3417,7 @@ xran_spawn_workers(void)
+@@ -3363,7 +3391,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 1  FH RX and BBDEV */
@@ -1712,7 +1578,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3378,7 +3432,7 @@ xran_spawn_workers(void)
+@@ -3378,7 +3406,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 2  FH RX and BBDEV */
@@ -1721,7 +1587,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3393,7 +3447,7 @@ xran_spawn_workers(void)
+@@ -3393,7 +3421,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /** 3  FH RX and BBDEV */
@@ -1730,7 +1596,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3408,7 +3462,7 @@ xran_spawn_workers(void)
+@@ -3408,7 +3436,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                     /**  FH TX and BBDEV */
@@ -1739,7 +1605,7 @@ index 7c472d7..db03d94 100644
                     if(pThCtx == NULL){
                         print_err("pThCtx allocation error\n");
                         return XRAN_STATUS_FAIL;
-@@ -3435,7 +3489,7 @@ xran_spawn_workers(void)
+@@ -3435,7 +3463,7 @@ xran_spawn_workers(void)
 
                 /* workers */
                 /** 0  Eth RX */
@@ -1748,7 +1614,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3450,7 +3504,7 @@ xran_spawn_workers(void)
+@@ -3450,7 +3478,7 @@ xran_spawn_workers(void)
                 eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                 /** 1  FH RX and BBDEV */
@@ -1757,7 +1623,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3465,7 +3519,7 @@ xran_spawn_workers(void)
+@@ -3465,7 +3493,7 @@ xran_spawn_workers(void)
                 eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                 /** 2  FH RX and BBDEV */
@@ -1766,7 +1632,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3480,7 +3534,7 @@ xran_spawn_workers(void)
+@@ -3480,7 +3508,7 @@ xran_spawn_workers(void)
                 eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                 /** 3  FH RX and BBDEV */
@@ -1775,7 +1641,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3495,7 +3549,7 @@ xran_spawn_workers(void)
+@@ -3495,7 +3523,7 @@ xran_spawn_workers(void)
                     eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                 /** 4  FH RX and BBDEV */
@@ -1784,7 +1650,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3510,7 +3564,7 @@ xran_spawn_workers(void)
+@@ -3510,7 +3538,7 @@ xran_spawn_workers(void)
                 eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                 /**  FH TX and BBDEV */
@@ -1793,7 +1659,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3537,7 +3591,7 @@ xran_spawn_workers(void)
+@@ -3537,7 +3565,7 @@ xran_spawn_workers(void)
 
                 /* workers */
                 /** 0 **/
@@ -1802,7 +1668,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3562,7 +3616,7 @@ xran_spawn_workers(void)
+@@ -3562,7 +3590,7 @@ xran_spawn_workers(void)
                 }
 
                 /** 1 - CP GEN **/
@@ -1811,7 +1677,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3577,7 +3631,7 @@ xran_spawn_workers(void)
+@@ -3577,7 +3605,7 @@ xran_spawn_workers(void)
                 eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                 /** 2 UP GEN **/
@@ -1820,7 +1686,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3602,7 +3656,7 @@ xran_spawn_workers(void)
+@@ -3602,7 +3630,7 @@ xran_spawn_workers(void)
                 }
 
                 /** 3 UP GEN **/
@@ -1829,7 +1695,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3627,7 +3681,7 @@ xran_spawn_workers(void)
+@@ -3627,7 +3655,7 @@ xran_spawn_workers(void)
                 }
 
                 /** 4 UP GEN **/
@@ -1838,7 +1704,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3642,7 +3696,7 @@ xran_spawn_workers(void)
+@@ -3642,7 +3670,7 @@ xran_spawn_workers(void)
                 eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
 
                 /** 5 UP GEN **/
@@ -1847,7 +1713,7 @@ index 7c472d7..db03d94 100644
                 if(pThCtx == NULL){
                     print_err("pThCtx allocation error\n");
                     return XRAN_STATUS_FAIL;
-@@ -3754,6 +3808,7 @@ xran_open(void *pHandle, struct xran_fh_config* pConf)
+@@ -3754,6 +3782,7 @@ xran_open(void *pHandle, struct xran_fh_config* pConf)
     p_xran_dev_ctx->puschMaskSlot = pConf->puschMaskSlot;
     p_xran_dev_ctx->DynamicSectionEna = pConf->DynamicSectionEna;
     p_xran_dev_ctx->RunSlotPrbMapBySymbolEnable = pConf->RunSlotPrbMapBySymbolEnable;
@@ -1855,7 +1721,7 @@ index 7c472d7..db03d94 100644
     p_xran_dev_ctx->dssEnable = pConf->dssEnable;
     p_xran_dev_ctx->dssPeriod = pConf->dssPeriod;
     for(i=0; i<pConf->dssPeriod; i++) {
-@@ -4034,6 +4089,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
+@@ -4034,6 +4063,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
     return tti;
 }
 
@@ -1880,7 +1746,7 @@ index 7c472d7..db03d94 100644
 int32_t
 xran_set_debug_stop(int32_t value, int32_t count)
 {
-@@ -4208,7 +4281,7 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+@@ -4208,7 +4255,7 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
     int32_t i = 0, j = 0, nPrbElm = 0;
     int16_t iqwidth = p_PrbMapIn->prbMap[0].iqWidth;
     struct xran_prb_elm *p_prb_elm_src, *p_prb_elm_dst;
@@ -1889,7 +1755,7 @@ index 7c472d7..db03d94 100644
     int32_t nRBStart_tmp, nRBremain, nStartSymb, nEndSymb, nRBStart, nRBEnd, nRBSize;
     // int32_t eth_xran_up_headers_sz = sizeof(struct eth_xran_up_pkt_hdr);
     // int32_t nmaxRB = (mtu - eth_xran_up_headers_sz - RTE_PKTMBUF_HEADROOM)/XRAN_PAYLOAD_1_RB_SZ(iqwidth);
-@@ -4217,7 +4290,6 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+@@ -4217,7 +4264,6 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
     if (mtu==9600)
         nmaxRB--;   //for some reason when mtu is 9600, only 195 RB can be sent, not 196
 
@@ -1897,7 +1763,7 @@ index 7c472d7..db03d94 100644
     memcpy(p_PrbMapOut, p_PrbMapIn, sizeof(struct xran_prb_map));
     for(i = 0; i < XRAN_NUM_OF_SYMBOL_PER_SLOT; i++)
     {
-@@ -4292,26 +4364,30 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+@@ -4292,26 +4338,30 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
 
     for(; i < XRAN_NUM_OF_SYMBOL_PER_SLOT; i++)
     {
@@ -2179,7 +2045,7 @@ index 72249bc..6b30084 100644
 #include <rte_config.h>
 
 diff --git a/fhi_lib/lib/src/xran_tx_proc.c b/fhi_lib/lib/src/xran_tx_proc.c
-index 45a17a8..cca2dcc 100644
+index 45a17a8..85ce6fa 100644
 --- a/fhi_lib/lib/src/xran_tx_proc.c
 +++ b/fhi_lib/lib/src/xran_tx_proc.c
@@ -35,7 +35,11 @@
@@ -2194,19 +2060,7 @@ index 45a17a8..cca2dcc 100644
 
 #include <rte_common.h>
 #include <rte_eal.h>
-@@ -1399,6 +1403,11 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
- 
-             if(0!=ptr_sect_elm->cur_index)
-             {
-+                /* prevent xran from sending DL U-plane packets when it should not */
-+                if(p_xran_dev_ctx->fh_init.io_cfg.id == O_DU && xran_fs_get_slot_type(xran_port_id, 0, tti, XRAN_SLOT_TYPE_DL) != 1)
-+                {
-+                    return 0;
-+                }
-                 num_sections = ptr_sect_elm->cur_index;
-                 /* iterate C-Plane configuration to generate corresponding U-Plane */
-                 vf_id = p_xran_dev_ctx->map2vf[direction][cc_id][ant_id][XRAN_UP_VF];
-@@ -1514,7 +1523,11 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
+@@ -1514,7 +1518,11 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
                         mb_oran_hdr_ext->buf_addr = ext_buff;
                         mb_oran_hdr_ext->buf_iova = ((struct rte_mempool_objhdr*)RTE_PTR_SUB(mb_base, rte_mempool_objhdr_size))->iova + RTE_PTR_DIFF(ext_buff, mb_base);
                         mb_oran_hdr_ext->buf_len = ext_buff_len;
@@ -2218,7 +2072,7 @@ index 45a17a8..cca2dcc 100644
                         mb_oran_hdr_ext->shinfo = p_share_data;
                         mb_oran_hdr_ext->data_off = (uint16_t)RTE_MIN((uint16_t)RTE_PKTMBUF_HEADROOM, (uint16_t)mb_oran_hdr_ext->buf_len) - rte_ether_hdr_size;
                         mb_oran_hdr_ext->data_len = (uint16_t)(mb_oran_hdr_ext->data_len + rte_ether_hdr_size);
-@@ -1532,8 +1545,13 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
+@@ -1532,8 +1540,13 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
 
                         /* Fill in the ethernet header. */
 #ifndef TRANSMIT_BURST
@@ -2232,7 +2086,7 @@ index 45a17a8..cca2dcc 100644
                         ((struct rte_ether_hdr*)pStart)->ether_type = ETHER_TYPE_ECPRI_BE;                            /* ethertype */
 #endif
                         nPktSize = sizeof(struct rte_ether_hdr)
-@@ -1878,7 +1896,11 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
+@@ -1878,7 +1891,11 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
                         mb_oran_hdr_ext->buf_addr = ext_buff;
                         mb_oran_hdr_ext->buf_iova = ((struct rte_mempool_objhdr*)RTE_PTR_SUB(mb_base, rte_mempool_objhdr_size))->iova + RTE_PTR_DIFF(ext_buff, mb_base);
                         mb_oran_hdr_ext->buf_len = ext_buff_len;
@@ -2244,7 +2098,7 @@ index 45a17a8..cca2dcc 100644
                         mb_oran_hdr_ext->shinfo = p_share_data;
                         mb_oran_hdr_ext->data_off = (uint16_t)RTE_MIN((uint16_t)RTE_PKTMBUF_HEADROOM, (uint16_t)mb_oran_hdr_ext->buf_len) - rte_ether_hdr_size;
                         mb_oran_hdr_ext->data_len = (uint16_t)(mb_oran_hdr_ext->data_len + rte_ether_hdr_size);
-@@ -1887,8 +1909,13 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
+@@ -1887,8 +1904,13 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
                         pStart = (char*)((char*)mb_oran_hdr_ext->buf_addr + mb_oran_hdr_ext->data_off);
 
                         /* Fill in the ethernet header. */
--- a/common/config/libconfig/config_libconfig.c
+++ b/common/config/libconfig/config_libconfig.c
@@ -319,32 +319,6 @@ int config_libconfig_set(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
  }
 }

-static const char *config_type_to_name(int type)
-{
-  switch (type) {
-    case CONFIG_TYPE_NONE:
-      return "none";
-    case CONFIG_TYPE_GROUP:
-      return "group";
-    case CONFIG_TYPE_INT:
-      return "integer";
-    case CONFIG_TYPE_INT64:
-      return "64-bit integer";
-    case CONFIG_TYPE_FLOAT:
-      return "float";
-    case CONFIG_TYPE_STRING:
-      return "string";
-    case CONFIG_TYPE_BOOL:
-      return "boolean";
-    case CONFIG_TYPE_ARRAY:
-      return "array";
-    case CONFIG_TYPE_LIST:
-      return "list";
-    default:
-      return "unknown";
-  }
-}
-
 int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
 {
  config_setting_t *setting;
@@ -374,26 +348,17 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,

    switch(cfgoptions[i].type) {
      case TYPE_STRING:
-        setting = config_lookup(&(libconfig_privdata.cfg), cfgpath);
-        if (setting != NULL) {
-          int type = config_setting_type(setting);
-          if (type == CONFIG_TYPE_STRING) {
-            const char *strng = config_setting_get_string(setting);
-            config_check_valptr(cfg, &cfgoptions[i], 1, strlen(strng) + 1);
-            if (strlen(strng) + 1 > cfgoptions[i].numelt)
-              fprintf(stderr,
-                      "[LIBCONFIG] %s:  %s exceeds maximum length of %i bytes, value truncated\n",
-                      cfgpath,
-                      strng,
-                      cfgoptions[i].numelt);
-            snprintf(*cfgoptions[i].strptr, cfgoptions[i].numelt, "%s", strng);
-            printf_params(cfg, "[LIBCONFIG] %s: \"%s\"\n", cfgpath, *cfgoptions[i].strptr);
-          } else {
-            fprintf(stderr,"[LIBCONFIG] expected a string input for %s but got type %s\n", cfgpath, config_type_to_name(type));
-            fatalerror = 1;
-          }
-        } else
+        if ( config_lookup_string(&(libconfig_privdata.cfg), cfgpath, (const char**)&str)) {
+          config_check_valptr(cfg, &cfgoptions[i], 1, strlen(str) + 1);
+          if ( strlen(str)+1 > cfgoptions[i].numelt )
+            fprintf(stderr,"[LIBCONFIG] %s:  %s exceeds maximum length of %i bytes, value truncated\n",
+                    cfgpath,str,cfgoptions[i].numelt);
+          snprintf( *cfgoptions[i].strptr , cfgoptions[i].numelt, "%s", str);
+          printf_params(cfg, "[LIBCONFIG] %s: \"%s\"\n", cfgpath, *cfgoptions[i].strptr);
+        } else {
          defval = config_common_getdefault(cfg, &cfgoptions[i], prefix);
+        }
+
        break;

      case TYPE_STRINGLIST:
--- a/common/utils/nr/nr_common.c
+++ b/common/utils/nr/nr_common.c
@@ -362,7 +362,7 @@ const sync_raster_t sync_raster[] = {
  {92, 0, 3584, 1, 3787},
  {93, 0, 3572, 1, 3574},
  {94, 0, 3584, 1, 3787},
-  {96, 3, 9531, 1, 10363},
+  {96, 1, 9531, 1, 10363},
  {100, 0, 2303, 1, 2307},
  {101, 0, 4754, 1, 4768},
  {101, 1, 4760, 1, 4764},
@@ -1066,11 +1066,6 @@ void get_samplerate_and_bw(int mu,
    }
  } else if (mu == 3) {
    switch(n_rb) {
-      case 264:
-	  *sample_rate=491.52e6;
-	  *tx_bw = 400e6;
-	  *rx_bw = 400e6;
-      break;
      case 132:
      case 128:
        if (threequarter_fs) {
--- a/doc/ORAN_FHI7.2_Tutorial.md
+++ b/doc/ORAN_FHI7.2_Tutorial.md
@@ -719,37 +719,7 @@ RU must be rebooted so the changes apply.
 - The measured throughput was **520 Mbps DL** and **40 Mbps UL**.
 - With newer OAI versions, throughput degrades. This issue is currently under investigation.

-#### ProtO-RU
-
-[ProtO-RU](https://github.com/NUS-CIR/ProtO-RU) is a software implementation of an O-RAN 7.2 RU using a NI USRP.
-Different from other COTS RUs, ProtO-RU requires a larger DU delay profile which is larger than the TTI interval.
-
-The OAI configuration file [`gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf) corresponds to:
-
- TDD pattern `DDDSU`, 2.5ms
- Bandwidth 40MHz
- MTU 9216
- 1T1R
-
-##### RU configuration
-
-First, compile the RU as outlined in the [building ProtO-RU tutorial](https://github.com/NUS-CIR/ProtO-RU/tree/proto-ru?tab=readme-ov-file#building-proto-ru).
-Then, ensure that both your DU and ProtO-RU host are PTP synchronized.
-
-Next, use the RU config, [protoru-OAI-B210-TDD-n78-40MHz-1x1-30kHz.yml](https://github.com/NUS-CIR/ProtO-RU/blob/proto-ru/proto-ru/conf-files/protoru-OAI-B210-TDD-n78-40MHz-1x1-30kHz.yml), which corresponds to the above mentioned DU config file. 
-In addition, please adapt the DU MAC address and VLAN tag to your needs.
-
-ProtO-RU was successfully tested with USRP B210.
-If you are using a different SDR (e.g., N310), you will need to update the ProtO-RU and the DU configurations accordingly.
-
-Launch ProtO-RU with the adapted configuration file with the command:
-```bash
-sudo ./ru_emulator -c <path-to/protoru-OAI-B210-TDD-n78-40MHz-1x1-30kHz.yml>
-```
-
-Finally, start the OAI gNB.
-
-## Configure Network Interfaces and DPDK VFs
+### Configure Network Interfaces and DPDK VFs

 The 7.2 fronthaul uses the xran library, which requires DPDK. In this step, we
 need to configure network interfaces to send data to the RU, and configure DPDK
--- a/doc/analog_beamforming.md
+++ b/doc/analog_beamforming.md
@@ -60,7 +60,7 @@ Therefore, in case of analog beamforming, L2 provides in each channel FAPI messa
 ## L1 implementation

 To handle multiple concurrent beams, the buffers containing Tx and Rx data in frequency domain (`txdataF` and `rxdataF`) have been extended by one dimension to contain multiple concurrent beams to be transmitted/received.
-The function `beam_index_allocation`, called by every L1 channel, is responsible to match the FAPI analog beam index to the RU beam index and to store the latter `beam_id` structure, which allocates the beams per symbol, despite L2 only supporting beam change at slot level. At the same time, the function returns the concurrent beam index, to be used to store data in frequency domain buffers. While doing so, the function also checks if there is room for current beam in the list of concurrent beams, which should always be the case, if L2 properly allocated the channels.
+The function `beam_index_allocation` TODO is responsible to match the FAPI analog beam index to the RU beam index and to store the latter `beam_id` structure, which allocates the beams per symbol, despite L2 only supporting beam change at slot level. At the same time, the function returns the concurrent beam index, to be used to store data in frequency domain buffers. While doing so, the function also checks if there is room for current beam in the list of concurrent beams, which should always be the case, if L2 properly allocated the channels.

 In case of DAS, since each beam corresponds to a specific antenna port, the `beam_index_allocation` function is simplified in the sense that the beam index corresponds to the antenna port index of the frequency domain buffers.

--- a/docker/Dockerfile.base.rhel9
+++ b/docker/Dockerfile.base.rhel9
@@ -26,7 +26,7 @@
 #---------------------------------------------------------------------


-FROM registry.redhat.io/ubi9/ubi:latest AS ran-base
+FROM registry.access.redhat.com/ubi9/ubi:latest AS ran-base
 LABEL MAINTAINER OpenAirInterface <contact@openairinterface.org>
 ARG NEEDED_GIT_PROXY
 ARG TARGETARCH
--- a/docker/Dockerfile.eNB.rhel9
+++ b/docker/Dockerfile.eNB.rhel9
@@ -31,7 +31,7 @@ FROM ran-build:latest AS enb-build


 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-enb
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-enb
 ENV TZ=Europe/Paris

 RUN dnf update -y && \
--- a/docker/Dockerfile.gNB.aw2s.rhel9
+++ b/docker/Dockerfile.gNB.aw2s.rhel9
@@ -38,7 +38,7 @@ RUN /bin/sh oaienv && \
    ./build_oai -w AW2SORI -t Ethernet

 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-gnb-aw2s
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-gnb-aw2s
 ENV TZ=Europe/Paris

 # Install EPEL for RHEL9
--- a/docker/Dockerfile.gNB.fhi72.rhel9
+++ b/docker/Dockerfile.gNB.fhi72.rhel9
@@ -30,7 +30,7 @@ FROM ran-base:latest AS gnb-base
 FROM ran-build-fhi72:latest AS gnb-build

 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-gnb-fhi72
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-gnb-fhi72
 ENV TZ=Europe/Paris

 # Install EPEL for RHEL9
--- a/docker/Dockerfile.gNB.rhel9
+++ b/docker/Dockerfile.gNB.rhel9
@@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build


 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-gnb
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-gnb
 ENV TZ=Europe/Paris

 # Install EPEL for RHEL9
--- a/docker/Dockerfile.lteRU.rhel9
+++ b/docker/Dockerfile.lteRU.rhel9
@@ -31,7 +31,7 @@ FROM ran-build:latest AS ru-build


 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-lte-ru
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-lte-ru
 ENV TZ=Europe/Paris

 RUN dnf update -y && \
--- a/docker/Dockerfile.lteUE.rhel9
+++ b/docker/Dockerfile.lteUE.rhel9
@@ -31,7 +31,7 @@ FROM ran-build:latest AS lte-ue-build


 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-lte-ue
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-lte-ue
 ENV TZ=Europe/Paris

 RUN dnf update -y && \
--- a/docker/Dockerfile.nr-cuup.rhel9
+++ b/docker/Dockerfile.nr-cuup.rhel9
@@ -32,7 +32,7 @@ FROM ran-build:latest AS gnb-build
 RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh

 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-nr-cuup
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-nr-cuup
 ENV TZ=Europe/Paris

 # Install EPEL 
--- a/docker/Dockerfile.nrUE.rhel9
+++ b/docker/Dockerfile.nrUE.rhel9
@@ -31,7 +31,7 @@ FROM ran-build:latest AS nr-ue-build


 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-nr-ue
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-nr-ue
 ENV TZ=Europe/Paris

 # Install EPEL for RHEL9
--- a/docker/Dockerfile.phySim.rhel9
+++ b/docker/Dockerfile.phySim.rhel9
@@ -46,7 +46,7 @@ RUN /bin/sh oaienv && \
    ninja -k10 -j36

 #start from scratch for target executable
-FROM registry.redhat.io/ubi9/ubi:latest AS oai-physim
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-physim

 RUN dnf update -y && \
    dnf install -y \
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -236,11 +236,11 @@ static size_t dump_L1_meas_stats(PHY_VARS_gNB *gNB, RU_t *ru, char *output, size
  output += print_meas_log(&gNB->l1_tx_proc, "L1 Tx job", NULL, NULL, output, end - output);
  output += print_meas_log(&gNB->l1_rx_proc, "L1 Rx job", NULL, NULL, output, end - output);
  output += print_meas_log(&gNB->phy_proc_tx, "L1 Tx processing", NULL, NULL, output, end - output);
-  output += print_meas_log(&gNB->dlsch_encoding_stats, "DLSCH encoding", NULL, NULL, output, end - output);
-  output += print_meas_log(&gNB->dlsch_scrambling_stats, "DLSCH scrambling", NULL, NULL, output, end-output);
-  output += print_meas_log(&gNB->dlsch_modulation_stats, "DLSCH modulation", NULL, NULL, output, end - output);
-  output += print_meas_log(&gNB->dlsch_resource_mapping_stats, "DLSCH resource mapping", NULL, NULL, output,end-output);
-  output += print_meas_log(&gNB->dlsch_precoding_stats, "DLSCH precoding", NULL, NULL, output,end-output);
+  output += print_meas_log(&gNB->dlsch_stats.encoding, "DLSCH encoding", NULL, NULL, output, end - output);
+  output += print_meas_log(&gNB->dlsch_stats.scrambling, "DLSCH scrambling", NULL, NULL, output, end-output);
+  output += print_meas_log(&gNB->dlsch_stats.modulation, "DLSCH modulation", NULL, NULL, output, end - output);
+  output += print_meas_log(&gNB->dlsch_stats.resource_mapping, "DLSCH resource mapping", NULL, NULL, output,end-output);
+  output += print_meas_log(&gNB->dlsch_stats.precoding, "DLSCH precoding", NULL, NULL, output,end-output);
  output += print_meas_log(&gNB->phy_proc_rx, "L1 Rx processing", NULL, NULL, output, end - output);
  output += print_meas_log(&gNB->ts_deinterleave, "UL segment deinterleaving", NULL, NULL, output, end - output);
  output += print_meas_log(&gNB->ts_rate_unmatch, "UL segment rate recovery", NULL, NULL, output, end - output);
@@ -301,7 +301,7 @@ void *nrL1_stats_thread(void *param) {
  reset_meas(&gNB->l1_tx_proc);
  reset_meas(&gNB->l1_rx_proc);
  reset_meas(&gNB->phy_proc_tx);
-  reset_meas(&gNB->dlsch_encoding_stats);
+  reset_meas(&gNB->dlsch_stats.encoding);
  reset_meas(&gNB->phy_proc_rx);
  reset_meas(&gNB->ts_deinterleave);
  reset_meas(&gNB->ts_rate_unmatch);
@@ -309,10 +309,10 @@ void *nrL1_stats_thread(void *param) {
  reset_meas(&gNB->ul_indication_stats);
  reset_meas(&gNB->slot_indication_stats);
  reset_meas(&gNB->rx_pusch_stats);
-  reset_meas(&gNB->dlsch_scrambling_stats);
-  reset_meas(&gNB->dlsch_modulation_stats);
-  reset_meas(&gNB->dlsch_resource_mapping_stats);
-  reset_meas(&gNB->dlsch_precoding_stats);
+  reset_meas(&gNB->dlsch_stats.scrambling);
+  reset_meas(&gNB->dlsch_stats.modulation);
+  reset_meas(&gNB->dlsch_stats.resource_mapping);
+  reset_meas(&gNB->dlsch_stats.precoding);
  while (!oai_exit) {
    sleep(1);
    if (ftruncate(fileno(fd), 0) != 0 || fseek(fd, 0, SEEK_SET) != 0) {
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -571,7 +571,7 @@ static void rx_rf(RU_t *ru, int *frame, int *slot)

  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1);
  openair0_timestamp_t old_ts = proc->timestamp_rx;
-  //if (/**slot == 0 && */(*frame&127) == 0) LOG_I(PHY,"Reading %d samples for slot %d (%p)\n", samples_per_slot, *slot, rxp[0]);
+  LOG_D(PHY,"Reading %d samples for slot %d (%p)\n", samples_per_slot, *slot, rxp[0]);

  openair0_timestamp_t ts;
  unsigned int rxs;
@@ -605,7 +605,7 @@ static void rx_rf(RU_t *ru, int *frame, int *slot)
  proc->frame_rx    = (proc->timestamp_rx / (fp->samples_per_subframe*10))&1023;
  proc->tti_rx = get_slot_from_timestamp(proc->timestamp_rx, fp);
  // synchronize first reception to frame 0 subframe 0
-  if ((proc->frame_rx&127) == 0 && proc->tti_rx == 0) LOG_I(PHY,
+  LOG_D(PHY,
        "RU %d/%d TS %ld, GPS %f, SR %f, frame %d, slot %d.%d / %d\n",
        ru->idx,
        0,
@@ -785,16 +785,12 @@ void tx_rf(RU_t *ru, int frame,int slot, uint64_t timestamp)
  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, (timestamp + ru->ts_offset) & 0xffffffff);
  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1);
  // prepare tx buffer pointers
-  if ((frame &127) == 0 && slot == 0) LOG_I(PHY,"[TXPATH] Frame.Slot %d.%d sending %d samples @ %lld\n",frame,slot,siglen + sf_extension,timestamp + ru->ts_offset - sf_extension);
-  
  uint32_t txs = ru->rfdevice.trx_write_func(&ru->rfdevice,
                                             timestamp + ru->ts_offset - sf_extension,
                                             txp,
                                             siglen + sf_extension,
                                             nt,
                                             flags);
-
-  /*
  LOG_D(PHY,
        "[TXPATH] RU %d tx_rf, writing to TS %lu, %d.%d, unwrapped_frame %d, slot %d, flags %d, siglen+sf_extension %d, "
        "returned %d, E %f\n",
@@ -808,8 +804,7 @@ void tx_rf(RU_t *ru, int frame,int slot, uint64_t timestamp)
        siglen + sf_extension,
        txs,
        10 * log10((double)signal_energy(txp[0], siglen + sf_extension)));
-*/
-      	VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0);
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0);
 }

 static void fill_rf_config(RU_t *ru, char *rf_config_file)
@@ -1125,8 +1120,6 @@ void *ru_thread(void *param)
  LOG_I(PHY, "RU %d RF started cpu_meas_enabled %d\n", ru->idx, cpu_meas_enabled);
  // start trx write thread
  if (usrp_tx_thread == 1) {
-    ru->rfdevice.tx_write_thread_affinity = ru->tx_write_thread_core;
-    LOG_I(HW,"Setting tx_write_thread_affinity to %d\n",ru->rfdevice.tx_write_thread_affinity);
    if (ru->start_write_thread) {
      if (ru->start_write_thread(ru) != 0) {
        LOG_E(HW, "Could not start tx write thread\n");
@@ -1199,8 +1192,7 @@ void *ru_thread(void *param)
    if (slot_type == NR_UPLINK_SLOT || slot_type == NR_MIXED_SLOT) {
      if (!wait_free_rx_tti(&gNB->L1_rx_out, rx_tti_busy, proc->frame_rx, proc->tti_rx))
        break; // nothing to wait for: we have to stop
- 
-    if (ru->feprx) {
+      if (ru->feprx) {
        ru->feprx(ru,proc->tti_rx);
        LOG_D(NR_PHY, "Setting %d.%d (%d) to busy\n", proc->frame_rx, proc->tti_rx, proc->tti_rx % RU_RX_SLOT_DEPTH);
        //LOG_M("rxdata.m","rxs",ru->common.rxdata[0],1228800,1,1);
@@ -1818,7 +1810,6 @@ static void NRRCconfig_RU(configmodule_interface_t *cfg)
    ru->num_tpcores = *param[RU_NUM_TP_CORES].iptr;
    ru->half_slot_parallelization = *param[RU_HALF_SLOT_PARALLELIZATION].iptr;
    ru->ru_thread_core = *param[RU_RU_THREAD_CORE].iptr;
-    ru->tx_write_thread_core = *param[RU_TX_WRITE_THREAD_CORE].iptr;
    LOG_D(PHY, "[RU %d] Setting half-slot parallelization to %d\n", j, ru->half_slot_parallelization);
    AssertFatal(ru->num_tpcores <= param[RU_TP_CORES].numelt, "Number of TP cores should be <=16\n");
    for (int i = 0; i < ru->num_tpcores; i++)
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -675,28 +675,11 @@ int main( int argc, char **argv ) {
    wait_nfapi_init("main?");
  }

-  if (IS_SOFTMODEM_IMSCOPE_ENABLED || IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) {
-    sleep(1);
-    scopeParms_t p;
-    p.argc = &argc;
-    p.argv = argv;
-    p.gNB = RC.gNB[0];
-    p.ru = RC.ru[0];
-    if (IS_SOFTMODEM_IMSCOPE_ENABLED) {
-      load_softscope("im", &p);
-    }
-    AssertFatal(!(IS_SOFTMODEM_IMSCOPE_ENABLED && IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED),
-                "Data recoding and ImScope cannot be enabled at the same time\n");
-    if (IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) {
-      load_module_shlib("imscope_record", NULL, 0, &p);
-    }
-  }
-
  if (RC.nb_nr_L1_inst > 0) {
    wait_RUs();
    // once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration)

-    if (IS_SOFTMODEM_DOSCOPE) {
+    if (IS_SOFTMODEM_DOSCOPE || IS_SOFTMODEM_IMSCOPE_ENABLED || IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) {
      sleep(1);
      scopeParms_t p;
      p.argc = &argc;
@@ -706,6 +689,14 @@ int main( int argc, char **argv ) {
      if (IS_SOFTMODEM_DOSCOPE) {
        load_softscope("nr", &p);
      }
+      if (IS_SOFTMODEM_IMSCOPE_ENABLED) {
+        load_softscope("im", &p);
+      }
+      AssertFatal(!(IS_SOFTMODEM_IMSCOPE_ENABLED && IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED),
+                  "Data recoding and ImScope cannot be enabled at the same time\n");
+      if (IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) {
+        load_module_shlib("imscope_record", NULL, 0, &p);
+      }
    }

    if (NFAPI_MODE != NFAPI_MODE_PNF && NFAPI_MODE != NFAPI_MODE_VNF && NFAPI_MODE != NFAPI_MODE_AERIAL) {
--- a/g410.conf
+++ b/g410.conf
@@ -1,253 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP                                     = 1;
-    pusch_AntennaPorts                                        = 1;
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
-    min_rxtxtime                                              = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # This is 6700.8MHz + 132*12 * 120e3 MHz = 6890.88 MHz (GSCN:10201 )
-      absoluteFrequencySSB                                             = 2090683;
-      dl_frequencyBand                                                 = 257
-      # This is 6700.8 MHz
-      dl_absoluteFrequencyPointA                                       = 2089251;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 3;
-        dl_carrierBandwidth                                            = 264;
-     #initialDownlinkBWP
-      #genericParameters
-        # This is RBstart = 0, L = 32: (275 * (L - 1)) + RBstart
-        initialDLBWPlocationAndBandwidth                               = 36025;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                  = 3;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                             = 4;
-        initialDLBWPsearchSpaceZero                                    = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 257
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 3;
-      ul_carrierBandwidth                                           = 264;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 36025;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 3;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 135;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 1;
-          preambleReceivedTargetPower                               = -118;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-        ra_ResponseWindow                                           = 7;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 3;
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 0;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-      ssb_PositionsInBurst_PR                                       = 3;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 1;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 3;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 3;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 3;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = 0;
-  }
-
-  );
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.5"; });
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.51";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.51";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  #pusch_TargetSNRx10         = 150;
-  #pucch_TargetSNRx10         = 200;
-}
-);
-
-L1s = (
-{
-  num_cc                = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 920;
-  #pucch0_dtx_threshold = 120;
-  L1_tx_thread_core     = 11;
-  L1_rx_thread_core     = 10;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes";
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  sl_ahead       = 10;
-  bands          = [257];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 60;
-  eNB_instances  = [0];
-  ru_thread_core = 6;
-  tx_write_thread_core = 7;
-  tp_cores = [8,9];
-  if_freq = 6900000000L;
-  #clock_src = "internal";
-  sdr_addrs = "mgmt_addr=172.21.19.115,addr=192.168.10.2,clock_source=internal,time_source=internal,,use_dpdk=1"
-}
-);
-
-
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = 4043;
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs";
-};
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="info";
-  f1ap_log_level                        ="info";
-};
--- a/nfapi/oai_integration/aerial/fapi_nvIPC.c
+++ b/nfapi/oai_integration/aerial/fapi_nvIPC.c
@@ -63,10 +63,6 @@ char cpu_buf_recv[RECV_BUF_LEN];

 uint16_t sfn = 0, slot = 0;
 nv_ipc_t *ipc;
-static nv_ipc_config_t nv_ipc_config;
-static int cpu_msg_buf_size = 0;
-static int cpu_data_buf_size = 0;
-
 void nvIPC_Stop()
 {
  LOG_I(NR_MAC, "Received STOP.indication\n");
@@ -99,7 +95,7 @@ static int ipc_handle_rx_msg(nv_ipc_t *ipc, nv_ipc_msg_t *msg)
  nfapi_vnf_config_t * vnf_config = get_config();
  if (vnf_config != 0) {
    // first, unpack the header
-    fapi_message_header_t fapi_msg;
+    fapi_phy_api_msg fapi_msg;
    if (!(pull8(&pReadPackedMessage, &fapi_msg.num_msg, end) && pull8(&pReadPackedMessage, &fapi_msg.opaque_handle, end)
          && pull16(&pReadPackedMessage, &fapi_msg.message_id, end)
          && pull32(&pReadPackedMessage, &fapi_msg.message_length, end))) {
@@ -199,30 +195,83 @@ static int ipc_handle_rx_msg(nv_ipc_t *ipc, nv_ipc_msg_t *msg)
  return 0;
 }

-int get_cpu_msg_buf_size()
+int8_t buf[1024];
+
+nv_ipc_config_t nv_ipc_config;
+
+bool aerial_nr_send_p5_message(vnf_t *vnf, uint16_t p5_idx, nfapi_nr_p4_p5_message_header_t *msg, uint32_t msg_len)
 {
-  return cpu_msg_buf_size;
-}
-int get_cpu_data_buf_size()
-{
-  return cpu_data_buf_size;
+  nfapi_vnf_pnf_info_t *pnf = nfapi_vnf_pnf_list_find(&(vnf->_public), p5_idx);
+
+  if (pnf) {
+    uint8_t tx_messagebufferFAPI[sizeof(vnf->tx_message_buffer)];
+    int packedMessageLengthFAPI = -1;
+    packedMessageLengthFAPI =
+        vnf->_public.pack_func(msg, msg_len, tx_messagebufferFAPI, sizeof(tx_messagebufferFAPI), &vnf->_public.codec_config);
+    return aerial_send_P5_msg(tx_messagebufferFAPI, packedMessageLengthFAPI, msg) == 0;
+  } else {
+    NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() cannot find pnf info for p5_idx:%d\n", __FUNCTION__, p5_idx);
+    return false;
+  }
 }

-bool allocate_msg(nv_ipc_msg_t *send_msg)
+bool aerial_send_P5_msg(void *packedBuf, uint32_t packedMsgLength, nfapi_nr_p4_p5_message_header_t *header)
 {
-  return ipc->tx_allocate(ipc, send_msg, 0) == 0;
-}
-void release_msg(nv_ipc_msg_t *send_msg)
-{
-  ipc->tx_release(ipc, send_msg);
-}
+  if (ipc == NULL) {
+    return false;
+  }
+  nv_ipc_msg_t send_msg = {0};
+  // look for the specific message
+  switch (header->message_id) {
+    case NFAPI_NR_PHY_MSG_TYPE_PARAM_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_PARAM_RESPONSE:
+    case NFAPI_NR_PHY_MSG_TYPE_CONFIG_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_CONFIG_RESPONSE:
+    case NFAPI_NR_PHY_MSG_TYPE_START_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_START_RESPONSE:
+    case NFAPI_NR_PHY_MSG_TYPE_STOP_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_STOP_RESPONSE:
+      break;
+    default: {
+      if (header->message_id >= NFAPI_VENDOR_EXT_MSG_MIN && header->message_id <= NFAPI_VENDOR_EXT_MSG_MAX) {
+        // if(config && config->pack_p4_p5_vendor_extension) {
+        //   result = (config->pack_p4_p5_vendor_extension)(header, ppWritePackedMsg, end, config);
+        // } else {
+        //   NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s VE NFAPI message ID %d. No ve ecoder provided\n", __FUNCTION__, header->message_id);
+        // }
+      } else {
+        NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s NFAPI Unknown message ID %d\n", __FUNCTION__, header->message_id);
+      }
+    } break;
+  }
+  send_msg.msg_id = header->message_id;
+  send_msg.cell_id = 0;
+  send_msg.msg_len = packedMsgLength + 8; // adding 8 to account for the size of the FAPI header
+  send_msg.data_len = 0;
+  send_msg.data_buf = NULL;
+  send_msg.data_pool = NV_IPC_MEMPOOL_CPU_MSG;

-bool send_nvipc_msg(nv_ipc_msg_t *send_msg)
-{
-  int send_retval = ipc->tx_send_msg(ipc, send_msg);
-  if (send_retval != 0) {
+  // procedure is  allocate->fill->send
+  int alloc_retval = ipc->tx_allocate(ipc, &send_msg, 0);
+  if (alloc_retval != 0) {
+    LOG_E(NFAPI_VNF, "%s error: allocate TX buffer failed Error: %d\n", __FUNCTION__, alloc_retval);
+    ipc->tx_release(ipc, &send_msg);
+    return false;
+  }
+
+  memcpy(send_msg.msg_buf, packedBuf, send_msg.msg_len);
+  LOG_D(NFAPI_VNF,
+        "send: cell_id=%d msg_id=0x%02X msg_len=%d data_len=%d data_pool=%d\n",
+        send_msg.cell_id,
+        send_msg.msg_id,
+        send_msg.msg_len,
+        send_msg.data_len,
+        send_msg.data_pool);
+  // Send the message
+  int send_retval = ipc->tx_send_msg(ipc, &send_msg);
+  if (send_retval < 0) {
    LOG_E(NFAPI_VNF, "%s error: send TX message failed Error: %d\n", __FUNCTION__, send_retval);
-    ipc->tx_release(ipc, send_msg);
+    ipc->tx_release(ipc, &send_msg);
    return false;
  }

@@ -230,45 +279,181 @@ bool send_nvipc_msg(nv_ipc_msg_t *send_msg)
  return true;
 }

-bool aerial_nr_send_p5_message(vnf_t *vnf, uint16_t p5_idx, nfapi_nr_p4_p5_message_header_t *msg, uint32_t msg_len)
+bool aerial_send_P7_msg(void *packedBuf, uint32_t packedMsgLength, nfapi_nr_p7_message_header_t *header)
 {
-  nfapi_vnf_pnf_info_t *pnf = nfapi_vnf_pnf_list_find(&(vnf->_public), p5_idx);
-
-  if (pnf) {
-    // Create the message
-    nv_ipc_msg_t send_msg = {.msg_id = msg->message_id,
-                             .cell_id = 0,
-                             // For P5 we don't need CPU_DATA
-                             .data_pool = NV_IPC_MEMPOOL_CPU_MSG,
-                             .data_len = 0,
-                             .data_buf = NULL};
-
-    // Allocate the message
-    if (!allocate_msg(&send_msg)) {
-      return false;
-    }
-
-    int packedMessageLengthFAPI = -1;
-    // Pack directly into it
-    if ((packedMessageLengthFAPI =
-             vnf->_public.pack_func(msg, msg_len, send_msg.msg_buf, get_cpu_msg_buf_size(), &vnf->_public.codec_config))
-        < 0) {
-      release_msg(&send_msg);
-      return false;
-    }
-    if (packedMessageLengthFAPI <= 0) {
-      LOG_E(NFAPI_VNF, "Error packing message 0x%02x\n", msg->message_id);
-      release_msg(&send_msg);
-      return false;
-    }
-    // Set the length
-    send_msg.msg_len = packedMessageLengthFAPI + 8; // adding 8 to account for the size of the FAPI header
-    // Send
-    return send_nvipc_msg(&send_msg);
-  } else {
-    NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() cannot find pnf info for p5_idx:%d\n", __FUNCTION__, p5_idx);
+  if (ipc == NULL) {
    return false;
  }
+  nv_ipc_msg_t send_msg;
+  uint8_t *pPacketBodyField = &((uint8_t *)packedBuf)[8];
+  uint8_t *pPackMessageEnd = packedBuf + packedMsgLength + 8;
+
+  uint16_t present_sfn = 0;
+  uint16_t present_slot = 0;
+  pull16(&pPacketBodyField, &present_sfn, pPackMessageEnd);
+  pull16(&pPacketBodyField, &present_slot, pPackMessageEnd);
+
+  if (present_sfn != old_sfn || present_slot != old_slot) {
+    LOG_E(NFAPI_VNF,
+          "\n============================================================================\n"
+          "sfn slot doesn't match unpacked one! L2->L1 %d.%d  vs L1->L2 %d.%d  \n"
+          "============================================================================\n",
+          present_sfn,
+          present_slot,
+          old_sfn,
+          old_slot);
+  }
+  // look for the specific message
+  switch (header->message_id) {
+    case NFAPI_NR_PHY_MSG_TYPE_DL_TTI_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_UL_DCI_REQUEST:
+    case NFAPI_UE_RELEASE_REQUEST:
+    case NFAPI_UE_RELEASE_RESPONSE:
+    case NFAPI_NR_PHY_MSG_TYPE_SLOT_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_RX_DATA_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_CRC_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_UCI_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_SRS_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_RACH_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_DL_NODE_SYNC:
+    case NFAPI_NR_PHY_MSG_TYPE_UL_NODE_SYNC:
+    case NFAPI_TIMING_INFO:
+    case 0x8f:
+      break;
+    default: {
+      if (header->message_id >= NFAPI_VENDOR_EXT_MSG_MIN && header->message_id <= NFAPI_VENDOR_EXT_MSG_MAX) {
+      } else {
+        NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s NFAPI Unknown message ID %d\n", __FUNCTION__, header->message_id);
+      }
+    } break;
+  }
+
+  send_msg.msg_id = header->message_id;
+  send_msg.cell_id = 0;
+  send_msg.msg_len = packedMsgLength + 8; // adding 8 to account for the size of the FAPI header
+  send_msg.data_len = 0;
+  send_msg.data_buf = NULL;
+  send_msg.data_pool = NV_IPC_MEMPOOL_CPU_MSG;
+  // procedure is  allocate->fill->send
+
+  // Allocate buffer for TX message
+  int alloc_retval = ipc->tx_allocate(ipc, &send_msg, 0);
+  if (alloc_retval != 0) {
+    LOG_E(NFAPI_VNF, "%s error: allocate TX buffer failed Error: %d\n", __FUNCTION__, alloc_retval);
+    ipc->tx_release(ipc, &send_msg);
+    return false;
+  }
+
+  memcpy(send_msg.msg_buf, packedBuf, send_msg.msg_len);
+  LOG_D(NFAPI_VNF,
+        "send: cell_id=%d msg_id=0x%02X msg_len=%d data_len=%d data_pool=%d\n",
+        send_msg.cell_id,
+        send_msg.msg_id,
+        send_msg.msg_len,
+        send_msg.data_len,
+        send_msg.data_pool);
+  // Send the message
+  int send_retval = ipc->tx_send_msg(ipc, &send_msg);
+  if (send_retval < 0) {
+    LOG_E(NFAPI_VNF, "%s error: send TX message failed Error: %d\n", __FUNCTION__, send_retval);
+    ipc->tx_release(ipc, &send_msg);
+    return false;
+  }
+
+  ipc->notify(ipc, 1); // notify that there's 1 message in queue
+  return true;
+}
+
+bool aerial_send_P7_msg_with_data(void *packedBuf,
+                                 uint32_t packedMsgLength,
+                                 void *dataBuf,
+                                 uint32_t dataLength,
+                                 nfapi_nr_p7_message_header_t *header)
+{
+  if (ipc == NULL) {
+    return false;
+  }
+  nv_ipc_msg_t send_msg;
+  uint8_t *pPacketBodyField = &((uint8_t *)packedBuf)[8];
+  uint8_t *pPackMessageEnd = packedBuf + packedMsgLength + 8;
+  uint16_t present_sfn = 0;
+  uint16_t present_slot = 0;
+  pull16(&pPacketBodyField, &present_sfn, pPackMessageEnd);
+  pull16(&pPacketBodyField, &present_slot, pPackMessageEnd);
+
+  if (present_sfn != old_sfn || present_slot != old_slot) {
+    LOG_E(NFAPI_VNF,
+          "\n============================================================================\n"
+          "sfn slot doesn't match unpacked one! L2->L1 %d.%d  vs L1->L2 %d.%d  \n"
+          "============================================================================\n",
+          present_sfn,
+          present_slot,
+          old_sfn,
+          old_slot);
+  }
+  // look for the specific message
+  switch (header->message_id) {
+    case NFAPI_NR_PHY_MSG_TYPE_DL_TTI_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST:
+    case NFAPI_NR_PHY_MSG_TYPE_UL_DCI_REQUEST:
+    case NFAPI_UE_RELEASE_REQUEST:
+    case NFAPI_UE_RELEASE_RESPONSE:
+    case NFAPI_NR_PHY_MSG_TYPE_SLOT_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_RX_DATA_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_CRC_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_UCI_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_SRS_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_RACH_INDICATION:
+    case NFAPI_NR_PHY_MSG_TYPE_DL_NODE_SYNC:
+    case NFAPI_NR_PHY_MSG_TYPE_UL_NODE_SYNC:
+    case NFAPI_TIMING_INFO:
+      break;
+    default: {
+      if (header->message_id >= NFAPI_VENDOR_EXT_MSG_MIN && header->message_id <= NFAPI_VENDOR_EXT_MSG_MAX) {
+      } else {
+        NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s NFAPI Unknown message ID %d\n", __FUNCTION__, header->message_id);
+      }
+    } break;
+  }
+
+  send_msg.msg_id = header->message_id;
+  send_msg.cell_id = 0;
+  send_msg.msg_len = packedMsgLength + 8; // adding 8 to account for the size of the FAPI header
+  send_msg.data_len = dataLength;
+  send_msg.data_pool = NV_IPC_MEMPOOL_CPU_DATA;
+
+  // procedure is  allocate->fill->send
+
+  // Allocate buffer for TX message
+  int alloc_retval = ipc->tx_allocate(ipc, &send_msg, 0);
+  if (alloc_retval != 0) {
+    LOG_E(NFAPI_VNF, "%s error: allocate TX buffer failed Error: %d\n", __FUNCTION__, alloc_retval);
+    ipc->tx_release(ipc, &send_msg);
+    return false;
+  }
+
+  memcpy(send_msg.msg_buf, packedBuf, send_msg.msg_len);
+  memcpy(send_msg.data_buf, dataBuf, send_msg.data_len);
+  LOG_D(NFAPI_VNF,
+        "send: cell_id=%d msg_id=0x%02X msg_len=%d data_len=%d data_pool=%d\n",
+        send_msg.cell_id,
+        send_msg.msg_id,
+        send_msg.msg_len,
+        send_msg.data_len,
+        send_msg.data_pool);
+  // Send the message
+  int send_retval = ipc->tx_send_msg(ipc, &send_msg);
+  if (send_retval != 0) {
+    LOG_E(NFAPI_VNF, "%s error: send TX message failed Error: %d\n", __FUNCTION__, send_retval);
+    ipc->tx_release(ipc, &send_msg);
+    return false;
+  }
+
+  ipc->notify(ipc, 1); // notify that there's 1 message in queue
+  return true;
 }

 // Always allocate message buffer, but allocate data buffer only when data_len > 0
@@ -383,10 +568,6 @@ int nvIPC_Init(nvipc_params_t nvipc_params_s)
 {
  // Want to use transport SHM, type epoll, module secondary (reads the created shm from cuphycontroller)
  load_hard_code_config(&nv_ipc_config, NV_IPC_MODULE_SECONDARY, NV_IPC_TRANSPORT_SHM);
-  // save the mempool sizes for later use in packing
-  cpu_msg_buf_size = nv_ipc_get_buf_size(&nv_ipc_config, NV_IPC_MEMPOOL_CPU_MSG);
-  cpu_data_buf_size = nv_ipc_get_buf_size(&nv_ipc_config, NV_IPC_MEMPOOL_CPU_DATA);
-
  // Create nv_ipc_t instance
  LOG_I(NFAPI_VNF, "%s: creating IPC interface with prefix %s\n", __func__, nvipc_params_s.nvipc_shm_prefix);
  strcpy(nv_ipc_config.transport_config.shm.prefix, nvipc_params_s.nvipc_shm_prefix);
@@ -407,9 +588,10 @@ int oai_fapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req)
  ul_tti_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
  ul_tti_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST;

-  bool retval = p7_config->send_p7_msg(get_p7_vnf(), &ul_tti_req->header);
+  // int retval = nfapi_vnf_p7_ul_tti_req(p7_config, ul_tti_req);
+  int retval = p7_config->send_p7_msg(get_p7_vnf(), &ul_tti_req->header);

-  if (!retval) {
+  if (retval != 0) {
    LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
  } else {
    // Reset number of PDUs so that it is not resent
@@ -426,9 +608,9 @@ int oai_fapi_ul_dci_req(nfapi_nr_ul_dci_request_t *ul_dci_req)
  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
  ul_dci_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
  ul_dci_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_UL_DCI_REQUEST;
-
-  bool retval = p7_config->send_p7_msg(get_p7_vnf(), &ul_dci_req->header);
-  if (!retval) {
+  // int retval = nfapi_vnf_p7_ul_dci_req(p7_config, ul_dci_req);
+  int retval = p7_config->send_p7_msg(get_p7_vnf(), &ul_dci_req->header);
+  if (retval != 0) {
    LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
  } else {
    ul_dci_req->numPdus = 0;
@@ -441,9 +623,10 @@ int oai_fapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req)
  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
  tx_data_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
  tx_data_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST;
-
-  bool retval = p7_config->send_p7_msg(get_p7_vnf(), &tx_data_req->header);
-  if (!retval) {
+  // LOG_D(PHY, "[VNF] %s() TX_REQ sfn_sf:%d number_of_pdus:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(tx_data_req->SFN),
+  // tx_data_req->Number_of_PDUs); int retval = nfapi_vnf_p7_tx_data_req(p7_config, tx_data_req);
+  int retval = p7_config->send_p7_msg(get_p7_vnf(), &tx_data_req->header);
+  if (retval != 0) {
    LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
  } else {
    tx_data_req->Number_of_PDUs = 0;
@@ -457,12 +640,11 @@ int oai_fapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
  dl_config_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_DL_TTI_REQUEST;
  dl_config_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
-
-  bool retval = p7_config->send_p7_msg(get_p7_vnf(), &dl_config_req->header);
+  int retval = p7_config->send_p7_msg(get_p7_vnf(), &dl_config_req->header);
  dl_config_req->dl_tti_request_body.nPDUs = 0;
  dl_config_req->dl_tti_request_body.nGroup = 0;

-  if (!retval) {
+  if (retval != 0) {
    LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
  }
  return retval;
@@ -471,9 +653,8 @@ int oai_fapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
 int oai_fapi_send_end_request(int cell, uint32_t frame, uint32_t slot){
  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
  nfapi_nr_slot_indication_scf_t nr_slot_resp = {.header.message_id = 0x8F, .sfn = frame, .slot = slot};
-
-  bool retval = p7_config->send_p7_msg(get_p7_vnf(), &nr_slot_resp.header);
-  if (!retval) {
+  int retval = p7_config->send_p7_msg(get_p7_vnf(), &nr_slot_resp.header);
+  if (retval != 0) {
    LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
  }
  return retval;
--- a/nfapi/oai_integration/aerial/fapi_nvIPC.h
+++ b/nfapi/oai_integration/aerial/fapi_nvIPC.h
@@ -41,12 +41,22 @@

 #include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"

-int get_cpu_msg_buf_size();
-int get_cpu_data_buf_size();
-bool allocate_msg(nv_ipc_msg_t* send_msg);
-void release_msg(nv_ipc_msg_t* send_msg);
-bool send_nvipc_msg(nv_ipc_msg_t* send_msg);
+typedef struct {
+  uint8_t num_msg;
+  uint8_t opaque_handle;
+  uint16_t message_id;
+  uint32_t message_length;
+} fapi_phy_api_msg;
+
 bool aerial_nr_send_p5_message(vnf_t *vnf, uint16_t p5_idx, nfapi_nr_p4_p5_message_header_t *msg, uint32_t msg_len);
+bool aerial_send_P5_msg(void *packedBuf, uint32_t packedMsgLength, nfapi_nr_p4_p5_message_header_t *header);
+bool aerial_send_P7_msg(void *packedBuf, uint32_t packedMsgLength, nfapi_nr_p7_message_header_t *header);
+bool aerial_send_P7_msg_with_data(void *packedBuf,
+                                 uint32_t packedMsgLength,
+                                 void *dataBuf,
+                                 uint32_t dataLength,
+                                 nfapi_nr_p7_message_header_t *header);
+
 int nvIPC_Init(nvipc_params_t nvipc_params_s);
 int oai_fapi_send_end_request(int cell_id, uint32_t frame, uint32_t slot);
 int oai_fapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req);
--- a/nfapi/oai_integration/aerial/fapi_vnf_p7.c
+++ b/nfapi/oai_integration/aerial/fapi_vnf_p7.c
@@ -114,10 +114,10 @@ static int32_t aerial_pack_tx_data_request(void *pMessageBuf,
                                           void *pPackedBuf,
                                           void *pDataBuf,
                                           uint32_t packedBufLen,
-                                           int32_t dataBufLen,
+                                           uint32_t dataBufLen,
                                           nfapi_p7_codec_config_t *config,
                                           nfapi_vnf_p7_config_t *p7_config,
-                                           int32_t *data_len)
+                                           uint32_t *data_len)
 {
  if (pMessageBuf == NULL || pPackedBuf == NULL) {
    NFAPI_TRACE(NFAPI_TRACE_ERROR, "P7 Pack supplied pointers are null\n");
@@ -130,7 +130,7 @@ static int32_t aerial_pack_tx_data_request(void *pMessageBuf,
  uint8_t *pPackedDataField = &pDataPackedMessage[0];
  uint8_t *pPackedDataFieldStart = &pDataPackedMessage[0];
  uint8_t **ppWriteData = &pPackedDataField;
-  const int32_t dataBufLen32 = (dataBufLen + 3) / 4;
+  const uint32_t dataBufLen32 = (dataBufLen + 3) / 4;
  nfapi_nr_tx_data_request_t *pNfapiMsg = (nfapi_nr_tx_data_request_t *)pMessageHeader;
  // Actual payloads are packed in a separate buffer
  for (int i = 0; i < pNfapiMsg->Number_of_PDUs; i++) {
@@ -180,67 +180,40 @@ static int32_t aerial_pack_tx_data_request(void *pMessageBuf,
  return (int32_t)(pMessageHeader->message_length);
 }

+
 bool aerial_nr_send_p7_message(vnf_p7_t *vnf_p7, nfapi_nr_p7_message_header_t *header)
 {
-  // Common to both cases, we can set it now
-  // In most cases we don't need the data pool, only the CPU_MSG
-  nv_ipc_msg_t send_msg = {.msg_id = header->message_id, .data_pool = NV_IPC_MEMPOOL_CPU_MSG, .cell_id = 0};
+  uint8_t FAPI_buffer[1024 * 64];
  // Check if TX_DATA request, if true, need to pack to data_buf
  if (header->message_id == NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST) {
-    // for this we need the secondary CPU_DATA pool
-    send_msg.data_pool = NV_IPC_MEMPOOL_CPU_DATA;
-    // Allocate the message after setting the data pool
-    if (!allocate_msg(&send_msg)) {
-      LOG_E(NFAPI_VNF, "Error in allocating nvipc message\n");
-      return false;
-    }
-
    nfapi_nr_tx_data_request_t *pNfapiMsg = (nfapi_nr_tx_data_request_t *)header;
    uint64_t size = 0;
    for (int i = 0; i < pNfapiMsg->Number_of_PDUs; ++i) {
      size += pNfapiMsg->pdu_list[i].PDU_length;
    }
-    AssertFatal(size <= get_cpu_data_buf_size(), "Message data larger than available buffer, tried to pack %" PRId64, size);
-    int32_t data_len = 0;
+    AssertFatal(size <= 1024 * 1024 * 2, "Message data larger than available buffer, tried to pack %" PRId64, size);
+    uint8_t FAPI_data_buffer[1024 * 1024 * 2]; // 2MB
+    uint32_t data_len = 0;
    int32_t len_FAPI = aerial_pack_tx_data_request(header,
-                                                   send_msg.msg_buf,
-                                                   send_msg.data_buf,
-                                                   get_cpu_msg_buf_size(),
-                                                   get_cpu_data_buf_size(),
+                                                   FAPI_buffer,
+                                                   FAPI_data_buffer,
+                                                   sizeof(FAPI_buffer),
+                                                   sizeof(FAPI_data_buffer),
                                                   &vnf_p7->_public.codec_config,
                                                   ((nfapi_vnf_p7_config_t *)vnf_p7),
                                                   &data_len);
-
-    // Set both lengths
-    send_msg.msg_len = len_FAPI + 8; // adding 8 to account for the size of the FAPI header
-    send_msg.data_len = data_len;
-
    if (len_FAPI <= 0) {
      LOG_E(NFAPI_VNF, "Problem packing TX_DATA_request\n");
-      release_msg(&send_msg);
      return false;
+    } else {
+      return aerial_send_P7_msg_with_data(FAPI_buffer, len_FAPI, FAPI_data_buffer, data_len, header) == 0;
    }
-    // Send
-    return send_nvipc_msg(&send_msg);
  } else {
-    send_msg.data_len = 0;
-    send_msg.data_buf = NULL;
-    // Allocate the message
-    if (!allocate_msg(&send_msg)) {
-      LOG_E(NFAPI_VNF, "Error in allocating nvipc message\n");
-      return false;
-    }
-    // Pack directly into it
-    nfapi_vnf_p7_config_t* p7_config = (nfapi_vnf_p7_config_t *)vnf_p7;
-    int len_FAPI = p7_config->pack_func(header, send_msg.msg_buf, get_cpu_msg_buf_size(), &vnf_p7->_public.codec_config);
-    if (len_FAPI <= 0) {
-      LOG_E(NFAPI_VNF, "Problem packing message 0x%02x\n", header->message_id);
-      release_msg(&send_msg);
-      return false;
-    }
-    // Set the length
-    send_msg.msg_len = len_FAPI + 8; // adding 8 to account for the size of the FAPI header
-    // Send
-    return send_nvipc_msg(&send_msg);
+    // Create and send FAPI P7 message
+    int len_FAPI = ((nfapi_vnf_p7_config_t *)vnf_p7)->pack_func(header,
+                                                                FAPI_buffer,
+                                                                sizeof(FAPI_buffer),
+                                                                &vnf_p7->_public.codec_config);
+    return aerial_send_P7_msg(FAPI_buffer, len_FAPI, header) == 0;
  }
 }
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -228,6 +228,7 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)

  PHY_MEASUREMENTS_gNB *meas = &gNB->measurements;
  free_and_zero(meas->n0_subband_power);
+  free_and_zero(meas->n0_subband_power_dB);

  for (int id = 0; id < gNB->max_nb_srs; id++) {
    for(int i=0; i<MAX_NUM_NR_SRS_AP; i++) {
--- a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
+++ b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
@@ -105,47 +105,36 @@ void nr_est_srs_timing_advance_offset(uint16_t ofdm_symbol_size,
        max_idx);
 }

-void dump_nr_I0_stats(FILE *fd, PHY_VARS_gNB *gNB)
-{
-  int min_I0 = 1000, max_I0 = 0;
-  int amin = 0, amax = 0;
-  fprintf(fd, "Blacklisted PRBs %d/%d\n", gNB->num_ulprbbl, gNB->frame_parms.N_RB_UL);
-  for (int i = 0; i < gNB->frame_parms.N_RB_UL; i++) {
-    if (gNB->ulprbbl[i] > 0)
-      continue;
-    if (gNB->measurements.n0_subband_power_tot_dB[i] < min_I0) {
-      min_I0 = gNB->measurements.n0_subband_power_tot_dB[i];
-      amin = i;
-    }
-    if (gNB->measurements.n0_subband_power_tot_dB[i] > max_I0) {
-      max_I0 = gNB->measurements.n0_subband_power_tot_dB[i];
-      amax = i;
-    }
-  }
+void dump_nr_I0_stats(FILE *fd,PHY_VARS_gNB *gNB) {
+
+
+    int min_I0=1000,max_I0=0;
+    int amin=0,amax=0;
+    fprintf(fd,"Blacklisted PRBs %d/%d\n",gNB->num_ulprbbl,gNB->frame_parms.N_RB_UL);
+    for (int i=0; i<gNB->frame_parms.N_RB_UL; i++) {
+      if (gNB->ulprbbl[i] > 0) continue;	    
+
+      if (gNB->measurements.n0_subband_power_tot_dB[i]<min_I0) {min_I0 = gNB->measurements.n0_subband_power_tot_dB[i]; amin=i;}
+
+      if (gNB->measurements.n0_subband_power_tot_dB[i]>max_I0) {max_I0 = gNB->measurements.n0_subband_power_tot_dB[i]; amax=i;}
+    }
+
+    for (int i=0; i<gNB->frame_parms.N_RB_UL; i++) {
+     if (gNB->ulprbbl[i] ==0) fprintf(fd,"%2d.",gNB->measurements.n0_subband_power_tot_dB[i]-gNB->measurements.n0_subband_power_avg_dB);
+     else fprintf(fd," X."); 
+     if (i%25 == 24) fprintf(fd,"\n");
+    }
+    fprintf(fd,"\n");
+    fprintf(fd,"max_IO = %d (%d), min_I0 = %d (%d), avg_I0 = %d dB",max_I0,amax,min_I0,amin,gNB->measurements.n0_subband_power_avg_dB);
+    if (gNB->frame_parms.nb_antennas_rx>1) {
+       fprintf(fd,"(");
+       for (int aarx=0;aarx<gNB->frame_parms.nb_antennas_rx;aarx++)
+         fprintf(fd,"%d.",gNB->measurements.n0_subband_power_avg_perANT_dB[aarx]);
+       fprintf(fd,")");
+    }
+    fprintf(fd,"\nPRACH I0 = %d.%d dB\n",gNB->measurements.prach_I0/10,gNB->measurements.prach_I0%10);
+

-  for (int i = 0; i < gNB->frame_parms.N_RB_UL; i++) {
-    if (gNB->ulprbbl[i] == 0)
-      fprintf(fd, "%2d.", gNB->measurements.n0_subband_power_tot_dB[i] - gNB->measurements.n0_subband_power_avg_dB);
-    else
-      fprintf(fd, " X.");
-    if (i % 25 == 24)
-      fprintf(fd, "\n");
-  }
-  fprintf(fd, "\n");
-  fprintf(fd,
-          "max_IO = %d (%d), min_I0 = %d (%d), avg_I0 = %d dB",
-          max_I0,
-          amax,
-          min_I0,
-          amin,
-          gNB->measurements.n0_subband_power_avg_dB);
-  if (gNB->frame_parms.nb_antennas_rx > 1) {
-    fprintf(fd, "(");
-    for (int aarx = 0; aarx < gNB->frame_parms.nb_antennas_rx; aarx++)
-      fprintf(fd, "%d.", gNB->measurements.n0_subband_power_avg_perANT_dB[aarx]);
-    fprintf(fd, ")");
-  }
-  fprintf(fd, "\nPRACH I0 = %d.%d dB\n", gNB->measurements.prach_I0 / 10, gNB->measurements.prach_I0 % 10);
 }

 void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_symb, uint32_t rb_mask_ul[14][9])
@@ -155,8 +144,19 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
  PHY_MEASUREMENTS_gNB *measurements = &gNB->measurements;
  int nb_symb[275]={0};

-  unsigned int tmp_n0_subband[frame_parms->nb_antennas_rx][frame_parms->N_RB_UL];
-  memset(tmp_n0_subband, 0, sizeof(tmp_n0_subband));
+  allocCast2D(n0_subband_power,
+              unsigned int,
+              gNB->measurements.n0_subband_power,
+              frame_parms->nb_antennas_rx,
+              frame_parms->N_RB_UL,
+              false);
+  clearArray(gNB->measurements.n0_subband_power, unsigned int);
+  allocCast2D(n0_subband_power_dB,
+              unsigned int,
+              gNB->measurements.n0_subband_power_dB,
+              frame_parms->nb_antennas_rx,
+              frame_parms->N_RB_UL,
+              false);

  // TODO modify the measurements to take into account concurrent beams
  for (int s = first_symb; s < first_symb + num_symb; s++) {
@@ -176,46 +176,39 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
          } else {
            signal_energy = signal_energy_nodc(ul_ch, 12);
          }
-          // noise power per antenna/RB, symbols summed up
-          tmp_n0_subband[aarx][rb] += signal_energy;
+          n0_subband_power[aarx][rb] += signal_energy;
          LOG_D(NR_PHY,"slot %d symbol %d RB %d aarx %d n0_subband_power %d\n", slot, s, rb, aarx, signal_energy);
        } //antenna
      }
    } //rb
  } // symb
  int nb_rb=0;
+  int64_t n0_subband_tot=0;
  int32_t n0_subband_tot_perANT[frame_parms->nb_antennas_rx];
-  memset(n0_subband_tot_perANT, 0, sizeof(n0_subband_tot_perANT));

-  allocCast2D(n0_subband_power,
-              unsigned int,
-              measurements->n0_subband_power,
-              frame_parms->nb_antennas_rx,
-              frame_parms->N_RB_UL,
-              false);
+  memset(n0_subband_tot_perANT, 0, sizeof(n0_subband_tot_perANT));

  for (int rb = 0 ; rb<frame_parms->N_RB_UL;rb++) {
    int32_t n0_subband_tot_perPRB=0;
    if (nb_symb[rb] > 0) {
-      for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
-        tmp_n0_subband[aarx][rb] /= nb_symb[rb];
-        // apply exponential moving average to smooth noise measurements
-        n0_subband_power[aarx][rb] = 0.9 * n0_subband_power[aarx][rb] + 0.1 * tmp_n0_subband[aarx][rb];
+      for (int aarx=0;aarx<frame_parms->nb_antennas_rx;aarx++) {
+        n0_subband_power[aarx][rb] /= nb_symb[rb];
+        n0_subband_power_dB[aarx][rb] = dB_fixed(n0_subband_power[aarx][rb]);
        n0_subband_tot_perPRB += n0_subband_power[aarx][rb];
        n0_subband_tot_perANT[aarx] += n0_subband_power[aarx][rb];
      }
-      n0_subband_tot_perPRB /= frame_parms->nb_antennas_rx;
+      n0_subband_tot_perPRB/=frame_parms->nb_antennas_rx;
      measurements->n0_subband_power_tot_dB[rb] = dB_fixed(n0_subband_tot_perPRB);
+      measurements->n0_subband_power_tot_dBm[rb] = measurements->n0_subband_power_tot_dB[rb] - gNB->rx_total_gain_dB - dB_fixed(frame_parms->N_RB_UL);
      LOG_D(NR_PHY,"n0_subband_power_tot_dB[%d] => %d, over %d symbols\n",rb,measurements->n0_subband_power_tot_dB[rb],nb_symb[rb]);
+      n0_subband_tot += n0_subband_tot_perPRB;
      nb_rb++;
    }
  }
  if (nb_rb>0) {
-    int64_t n0_subband_tot = 0;
-    for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
-      measurements->n0_subband_power_avg_perANT_dB[aarx] = dB_fixed(n0_subband_tot_perANT[aarx] / nb_rb);
-      n0_subband_tot += n0_subband_tot_perANT[aarx];
-    }
-    measurements->n0_subband_power_avg_dB = dB_fixed(n0_subband_tot / nb_rb);
+     measurements->n0_subband_power_avg_dB = dB_fixed(n0_subband_tot/nb_rb);
+     for (int aarx=0;aarx<frame_parms->nb_antennas_rx;aarx++) {
+       measurements->n0_subband_power_avg_perANT_dB[aarx] = dB_fixed(n0_subband_tot_perANT[aarx]/nb_rb);
+     }
  }
 }
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c
@@ -51,11 +51,11 @@ static void nr_pdcch_scrambling(uint32_t *in, uint32_t size, uint32_t Nid, uint3
    out[i] = in[i] ^ seq[i];
 }

-void nr_generate_dci(PHY_VARS_gNB *gNB,
-                     const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
-                     int txdataF_offset,
-                     NR_DL_FRAME_PARMS *frame_parms,
-                     int slot)
+void nr_generate_dci(const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
+                     const NR_DL_FRAME_PARMS *frame_parms,
+                     int slot,
+                     uint16_t amp,
+                     c16_t *txdataF)
 {
  // fill reg list per symbol
  int reg_list[MAX_DCI_CORESET][NR_MAX_PDCCH_AGG_LEVEL * NR_NB_REG_PER_CCE];
@@ -83,14 +83,6 @@ void nr_generate_dci(PHY_VARS_gNB *gNB,
    uint32_t cset_start_symb = pdcch_pdu_rel15->StartSymbolIndex;
    uint32_t cset_nsymb = pdcch_pdu_rel15->DurationSymbols;
    int dci_idx = 0;
-    // multi-beam number (for concurrent beams)
-    int bitmap = SL_to_bitmap(cset_start_symb, pdcch_pdu_rel15->DurationSymbols);
-    int beam_nb = beam_index_allocation(gNB->enable_analog_das,
-                                        dci_pdu->precodingAndBeamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx,
-                                        &gNB->common_vars,
-                                        slot,
-                                        frame_parms->symbols_per_slot,
-                                        bitmap);

    LOG_D(NR_PHY_DCI, "pdcch: Coreset rb_offset %d, nb_rb %d BWP Start %d\n", rb_offset, n_rb, pdcch_pdu_rel15->BWPStart);
    LOG_D(NR_PHY_DCI,
@@ -178,8 +170,6 @@ void nr_generate_dci(PHY_VARS_gNB *gNB,
 #endif

    /// Resource mapping
-    uint16_t amp = gNB->TX_AMP;
-    c16_t *txdataF = gNB->common_vars.txdataF[beam_nb][0] + txdataF_offset;
    if (cset_start_sc >= frame_parms->ofdm_symbol_size)
      cset_start_sc -= frame_parms->ofdm_symbol_size;

--- a/openair1/PHY/NR_TRANSPORT/nr_dci.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.h
@@ -26,11 +26,11 @@
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"

-void nr_generate_dci(PHY_VARS_gNB *gNB,
-                     const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
-                     int txdataF_offset,
-                     NR_DL_FRAME_PARMS *frame_parms,
-                     int slot);
+void nr_generate_dci(const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
+                     const NR_DL_FRAME_PARMS *frame_parms,
+                     int slot,
+                     uint16_t amp,
+                     c16_t *txdataF);

 int16_t find_nr_pdcch(int frame,int slot, PHY_VARS_gNB *gNB,find_type_t type);

--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -46,7 +46,7 @@
 #include <simde/x86/avx512.h>
 #define USE128BIT

-static void nr_pdsch_codeword_scrambling(uint8_t *in, uint32_t size, uint8_t q, uint32_t Nid, uint32_t n_RNTI, uint32_t *out)
+static void nr_pdsch_codeword_scrambling(const uint8_t *in, uint32_t size, uint8_t q, uint32_t Nid, uint32_t n_RNTI, uint32_t *out)
 {
  nr_codeword_scrambling(in, size, q, Nid, n_RNTI, out);
 }
@@ -337,7 +337,7 @@ static inline void neg_dmrs(c16_t *in, c16_t *out, int sz)
    *out++ = i % 2 ? (c16_t){-in[i].r, -in[i].i} : in[i];
 }

-static inline int do_onelayer(NR_DL_FRAME_PARMS *frame_parms,
+static inline int do_onelayer(const NR_DL_FRAME_PARMS *frame_parms,
                              int slot,
                              const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15,
                              int layer,
@@ -453,16 +453,15 @@ static inline int do_onelayer(NR_DL_FRAME_PARMS *frame_parms,
  return txl - txl_start;
 }

-static inline void do_txdataF(c16_t **txdataF,
+static inline void do_txdataF(const nfapi_nr_config_request_scf_t *cfg,
+                              c16_t **txdataF,
                              int symbol_sz,
                              c16_t txdataF_precoding[][symbol_sz],
-                              PHY_VARS_gNB *gNB,
                              const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15,
                              int ant,
                              int start_sc,
                              int txdataF_offset_per_symbol)
 {
-  NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
  int rb = 0;
  uint16_t subCarrier = start_sc;
  const nfapi_nr_tx_precoding_and_beamforming_t *pb = &rel15->precodingAndBeamforming;
@@ -504,9 +503,8 @@ static inline void do_txdataF(c16_t **txdataF,
        subCarrier -= symbol_sz;
      }
    } else { // non-unitary Precoding
-      AssertFatal(frame_parms->nb_antennas_tx > 1, "No precoding can be done with a single antenna port\n");
      // get the precoding matrix weights:
-      nfapi_nr_pm_pdu_t *pmi_pdu = &gNB->gNB_config.pmi_list.pmi_pdu[pmi - 1]; // pmi 0 is identity matrix
+      nfapi_nr_pm_pdu_t *pmi_pdu = &cfg->pmi_list.pmi_pdu[pmi - 1]; // pmi 0 is identity matrix
      AssertFatal(pmi == pmi_pdu->pm_idx, "PMI %d doesn't match to the one in precoding matrix %d\n", pmi, pmi_pdu->pm_idx);
      AssertFatal(ant < pmi_pdu->num_ant_ports,
                  "Antenna port index %d exceeds precoding matrix AP size %d\n",
@@ -548,13 +546,16 @@ static inline void do_txdataF(c16_t **txdataF,
    rb += rb_step;
  } // RB loop: while(rb < rel15->rbSize)
 }
-static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSCH_t *dlsch, int slot)
+static int do_one_dlsch(const NR_DL_FRAME_PARMS *frame_parms,
+                        const nfapi_nr_config_request_scf_t *cfg,
+                        const unsigned char *input_ptr,
+                        int amp,
+                        NR_gNB_DLSCH_t *dlsch,
+                        int slot,
+                        c16_t **txdataF,
+                        nr_dlsch_stats_t *stats)
 {
-  const int16_t amp = gNB->TX_AMP;
-  NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;

-  time_stats_t *dlsch_scrambling_stats = &gNB->dlsch_scrambling_stats;
-  time_stats_t *dlsch_modulation_stats = &gNB->dlsch_modulation_stats;
  const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &dlsch->pdsch_pdu->pdsch_pdu_rel15;
  const int layerSz = frame_parms->N_RB_DL * NR_SYMBOLS_PER_SLOT * NR_NB_SC_PER_RB;
  const int symbol_sz=frame_parms->ofdm_symbol_size;
@@ -610,7 +611,7 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC
  c16_t mod_symbs[rel15->NrOfCodewords][encoded_length] __attribute__((aligned(64)));
  for (int codeWord = 0; codeWord < rel15->NrOfCodewords; codeWord++) {
    /// scrambling
-    start_meas(dlsch_scrambling_stats);
+    start_meas(&stats->scrambling);
    uint32_t scrambled_output[(encoded_length >> 5) + 4]; // modulator acces by 4 bytes in some cases
    memset(scrambled_output, 0, sizeof(scrambled_output));
    nr_pdsch_codeword_scrambling(input_ptr, encoded_length, codeWord, rel15->dataScramblingId, rel15->rnti, scrambled_output);
@@ -624,12 +625,12 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC
    }
 #endif

-    stop_meas(dlsch_scrambling_stats);
+    stop_meas(&stats->scrambling);
    /// Modulation
-    start_meas(dlsch_modulation_stats);
+    start_meas(&stats->modulation);
    nr_modulation(scrambled_output, encoded_length, Qm, (int16_t *)mod_symbs[codeWord]);
    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_PDSCH_MODULATION, 0);
-    stop_meas(dlsch_modulation_stats);
+    stop_meas(&stats->modulation);
 #ifdef DEBUG_DLSCH
    printf("PDSCH Modulation: Qm %d(%d)\n", Qm, nb_re);
    for (int i = 0; i < nb_re; i += 8) {
@@ -641,7 +642,7 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC
 #endif
  }

-  start_meas(&gNB->dlsch_pdsch_generation_stats);
+  start_meas(&stats->pdsch_generation);
  /// Resource mapping
  // Non interleaved VRB to PRB mapping
  uint16_t start_sc = frame_parms->first_carrier_offset + (rel15->rbStart + rel15->BWPStart) * NR_NB_SC_PER_RB;
@@ -663,34 +664,16 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC
  c16_t mod_dmrs[(n_dmrs+63)&~63] __attribute__((aligned(64)));
  unsigned int re_beginning_of_symbol = 0;

-  start_meas(&gNB->dlsch_layer_mapping_stats);
+  start_meas(&stats->layer_mapping);
  int layerSz2 = (layerSz + 63) & ~63;
  c16_t tx_layers[rel15->nrOfLayers][layerSz2] __attribute__((aligned(64)));
  memset(tx_layers, 0, sizeof(tx_layers));
  nr_layer_mapping(rel15->NrOfCodewords, encoded_length, mod_symbs, rel15->nrOfLayers, layerSz2, nb_re, tx_layers);

-  /// Layer Precoding and Antenna port mapping
-  // tx_layers 1-8 are mapped on antenna ports 1000-1007
-  // The precoding info is supported by nfapi such as num_prgs, prg_size, prgs_list and pm_idx
-  // The same precoding matrix is applied on prg_size RBs, Thus
-  //        pmi = prgs_list[rbidx/prg_size].pm_idx, rbidx =0,...,rbSize-1
-  // The Precoding matrix:
-  // The Codebook Type I
-  const nfapi_nr_tx_precoding_and_beamforming_t *pb = &rel15->precodingAndBeamforming;
-  // beam number in multi-beam scenario (concurrent beams)
-  int bitmap = SL_to_bitmap(rel15->StartSymbolIndex, rel15->NrOfSymbols);
-  int beam_nb = beam_index_allocation(gNB->enable_analog_das,
-                                      pb->prgs_list[0].dig_bf_interface_list[0].beam_idx,
-                                      &gNB->common_vars,
-                                      slot,
-                                      frame_parms->symbols_per_slot,
-                                      bitmap);
-
-  c16_t **txdataF = gNB->common_vars.txdataF[beam_nb];
-  stop_meas(&gNB->dlsch_layer_mapping_stats);
+  stop_meas(&stats->layer_mapping);
  // Loop Over OFDM symbols:
  for (int l_symbol = rel15->StartSymbolIndex; l_symbol < rel15->StartSymbolIndex + rel15->NrOfSymbols; l_symbol++) {
-    start_meas(&gNB->dlsch_resource_mapping_stats);
+    start_meas(&stats->resource_mapping);
    int l_prime = 0; // single symbol layer 0
    int l_overline = get_l0(rel15->dlDmrsSymbPos);

@@ -755,16 +738,16 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC
                             mod_dmrs + dmrs_idx);
    } // layer loop
    re_beginning_of_symbol += layer_sz;
-    stop_meas(&gNB->dlsch_resource_mapping_stats);
+    stop_meas(&stats->resource_mapping);

-    start_meas(&gNB->dlsch_precoding_stats);
+    start_meas(&stats->precoding);
    for (int ant = 0; ant < frame_parms->nb_antennas_tx; ant++) {
      const size_t txdataF_offset_per_symbol = l_symbol * symbol_sz + txdataF_offset;
-      do_txdataF(txdataF, symbol_sz, txdataF_precoding, gNB, rel15, ant, start_sc, txdataF_offset_per_symbol);
+      do_txdataF(cfg, txdataF, symbol_sz, txdataF_precoding, rel15, ant, start_sc, txdataF_offset_per_symbol);
    }
-    stop_meas(&gNB->dlsch_precoding_stats);
+    stop_meas(&stats->precoding);
  }
-  stop_meas(&gNB->dlsch_pdsch_generation_stats);
+  stop_meas(&stats->pdsch_generation);
  /* output and its parts for each dlsch should be aligned on 64 bytes (or 8 * 64 bits)
   * should remain a multiple of 8 * 64 with enough offset to fit each dlsch
   */
@@ -774,15 +757,9 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC

 void nr_generate_pdsch(PHY_VARS_gNB *gNB, int n_dlsch, NR_gNB_DLSCH_t *dlsch_array, int frame, int slot)
 {
-  NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
-  time_stats_t *dlsch_encoding_stats = &gNB->dlsch_encoding_stats;
-  time_stats_t *tinput = &gNB->tinput;
-  time_stats_t *tprep = &gNB->tprep;
-  time_stats_t *tparity = &gNB->tparity;
-  time_stats_t *toutput = &gNB->toutput;
-  time_stats_t *dlsch_rate_matching_stats = &gNB->dlsch_rate_matching_stats;
-  time_stats_t *dlsch_interleaving_stats = &gNB->dlsch_interleaving_stats;
-  time_stats_t *dlsch_segmentation_stats = &gNB->dlsch_segmentation_stats;
+  const NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
+  const nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
+  nr_dlsch_stats_t *stats = &gNB->dlsch_stats;

  size_t size_output = 0;

@@ -827,29 +804,18 @@ void nr_generate_pdsch(PHY_VARS_gNB *gNB, int n_dlsch, NR_gNB_DLSCH_t *dlsch_arr
  unsigned char output[size_output >> 3] __attribute__((aligned(64)));
  bzero(output, sizeof(output));

-  start_meas(dlsch_encoding_stats);
-  if (nr_dlsch_encoding(gNB,
-                        n_dlsch,
-                        dlsch_array,
-                        frame,
-                        slot,
-                        frame_parms,
-                        output,
-                        tinput,
-                        tprep,
-                        tparity,
-                        toutput,
-                        dlsch_rate_matching_stats,
-                        dlsch_interleaving_stats,
-                        dlsch_segmentation_stats)
-      == -1) {
+  start_meas(&stats->encoding);
+  nrLDPC_coding_encoder_t *enc = gNB->nrLDPC_coding_interface.nrLDPC_coding_encoder;
+  if (nr_dlsch_encoding(enc, &gNB->threadPool, n_dlsch, dlsch_array, frame, slot, frame_parms, output, stats) == -1) {
    return;
  }
-  stop_meas(dlsch_encoding_stats);
+  stop_meas(&stats->encoding);

  unsigned char *output_ptr = output;
+  int beam_nb = 0; // TODO
+  c16_t **txdataF = gNB->common_vars.txdataF[beam_nb];
  for (int i = 0; i < n_dlsch; i++) {
-    output_ptr += do_one_dlsch(output_ptr, gNB, &dlsch_array[i], slot);
+    output_ptr += do_one_dlsch(frame_parms, cfg, output_ptr, gNB->TX_AMP, &dlsch_array[i], slot, txdataF, stats);
  }
 }

--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
@@ -37,20 +37,15 @@

 void nr_generate_pdsch(PHY_VARS_gNB *gNB, int n_dlsch, NR_gNB_DLSCH_t *dlsch_array, int frame, int slot);

-int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
+int nr_dlsch_encoding(nrLDPC_coding_encoder_t *encoder,
+                      tpool_t *threadPool,
                      int n_dlsch,
                      NR_gNB_DLSCH_t *dlsch_array,
                      int frame,
                      uint8_t slot,
-                      NR_DL_FRAME_PARMS *frame_parms,
+                      const NR_DL_FRAME_PARMS *frame_parms,
                      unsigned char *output,
-                      time_stats_t *tinput,
-                      time_stats_t *tprep,
-                      time_stats_t *tparity,
-                      time_stats_t *toutput,
-                      time_stats_t *dlsch_rate_matching_stats,
-                      time_stats_t *dlsch_interleaving_stats,
-                      time_stats_t *dlsch_segmentation_stats);
+                      nr_dlsch_stats_t *stats);

 void dump_pdsch_stats(FILE *fd,PHY_VARS_gNB *gNB);

--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -103,20 +103,15 @@ NR_gNB_DLSCH_t new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms, uint16_t N_RB)
  return (dlsch);
 }

-int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
+int nr_dlsch_encoding(nrLDPC_coding_encoder_t encoder,
+                      tpool_t *threadPool,
                      int n_dlsch,
                      NR_gNB_DLSCH_t *dlsch_array,
                      int frame,
                      uint8_t slot,
-                      NR_DL_FRAME_PARMS *frame_parms,
+                      const NR_DL_FRAME_PARMS *frame_parms,
                      unsigned char *output,
-                      time_stats_t *tinput,
-                      time_stats_t *tprep,
-                      time_stats_t *tparity,
-                      time_stats_t *toutput,
-                      time_stats_t *dlsch_rate_matching_stats,
-                      time_stats_t *dlsch_interleaving_stats,
-                      time_stats_t *dlsch_segmentation_stats)
+                      nr_dlsch_stats_t *stats)
 {
  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_DLSCH_ENCODING, VCD_FUNCTION_IN);

@@ -149,8 +144,10 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
    }

    NR_gNB_PHY_STATS_t *phy_stats = NULL;
+    /* TODO
    if (rel15->rnti != 0xFFFF)
      phy_stats = get_phy_stats(gNB, rel15->rnti);
+      */

    if (phy_stats) {
      phy_stats->frame = frame;
@@ -190,7 +187,7 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
    TB_parameters->harq_unique_pid = i;
    TB_parameters->BG = rel15->maintenance_parms_v3.ldpcBaseGraph;
    TB_parameters->A = A;
-    start_meas(dlsch_segmentation_stats);
+    start_meas(&stats->segmentation);
    TB_parameters->Kb = nr_segmentation(dlsch->b,
                                        dlsch->c,
                                        B,
@@ -199,7 +196,7 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
                                        &TB_parameters->Z,
                                        &TB_parameters->F,
                                        TB_parameters->BG);
-    stop_meas(dlsch_segmentation_stats);
+    stop_meas(&stats->segmentation);

    if (TB_parameters->C > MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER * rel15->nrOfLayers) {
      LOG_E(PHY, "nr_segmentation.c: too many segments %d, B %d\n", TB_parameters->C, B);
@@ -274,20 +271,20 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
  nrLDPC_slot_encoding_parameters_t slot_parameters = {.frame = frame,
                                                       .slot = slot,
                                                       .nb_TBs = n_dlsch,
-                                                       .threadPool = &gNB->threadPool,
-                                                       .tinput = tinput,
-                                                       .tprep = tprep,
-                                                       .tparity = tparity,
-                                                       .toutput = toutput,
+                                                       .threadPool = threadPool,
+                                                       .tinput = &stats->tinput,
+                                                       .tprep = &stats->tprep,
+                                                       .tparity = &stats->tparity,
+                                                       .toutput = &stats->toutput,
                                                       .TBs = TBs};
-  gNB->nrLDPC_coding_interface.nrLDPC_coding_encoder(&slot_parameters);
+  encoder(&slot_parameters);

  for (int i = 0; i < n_dlsch; i++) {
    nrLDPC_TB_encoding_parameters_t *TB_parameters = &TBs[i];
    for (int r = 0; r < TB_parameters->C; r++) {
      nrLDPC_segment_encoding_parameters_t *segment_parameters = &TB_parameters->segments[r];
-      merge_meas(dlsch_interleaving_stats, &segment_parameters->ts_interleave);
-      merge_meas(dlsch_rate_matching_stats, &segment_parameters->ts_rate_match);
+      merge_meas(&stats->interleaving, &segment_parameters->ts_interleave);
+      merge_meas(&stats->rate_matching, &segment_parameters->ts_rate_match);
      // merge_meas(, &segment_parameters->ts_ldpc_encode);
    }
  }
--- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
@@ -51,8 +51,8 @@ void nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
                           c16_t *txdataF,
                           int16_t amp,
                           uint8_t ssb_start_symbol,
-                           nfapi_nr_config_request_scf_t *config,
-                           NR_DL_FRAME_PARMS *frame_parms)
+                           const nfapi_nr_config_request_scf_t *config,
+                           const NR_DL_FRAME_PARMS *frame_parms)
 {
  int k,l;
  //int16_t a;
@@ -228,14 +228,15 @@ uint32_t nr_pbch_extra_byte_generation(int sfn, int n_hf, int ssb_index, int ssb
  return extra_byte;
 }

-void nr_generate_pbch(PHY_VARS_gNB *gNB,
+void nr_generate_pbch(int16_t amp,
+                      const uint8_t *interleaver,
                      const nfapi_nr_dl_tti_ssb_pdu *ssb_pdu,
                      c16_t *txdataF,
                      uint8_t ssb_start_symbol,
                      uint8_t n_hf,
                      int sfn,
-                      nfapi_nr_config_request_scf_t *config,
-                      NR_DL_FRAME_PARMS *frame_parms)
+                      const nfapi_nr_config_request_scf_t *config,
+                      const NR_DL_FRAME_PARMS *frame_parms)
 {
  LOG_D(PHY, "PBCH generation started\n");
  ///Payload generation
@@ -261,7 +262,6 @@ void nr_generate_pbch(PHY_VARS_gNB *gNB,

  // Payload interleaving
  uint32_t pbch_a_interleaved = 0;
-  uint8_t *interleaver = gNB->nr_pbch_interleaver;
  for (int i = 0; i < NR_POLAR_PBCH_PAYLOAD_BITS; i++) {
    pbch_a_interleaved |= ((pbch_a >> i) & 1) << (*(interleaver + i));
  }
@@ -336,7 +336,6 @@ void nr_generate_pbch(PHY_VARS_gNB *gNB,
  int k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier;
  int l = ssb_start_symbol + 1;
  int m = 0;
-  int16_t amp = gNB->TX_AMP;

  for (int ssb_sc_idx = 0; ssb_sc_idx < 240; ssb_sc_idx++) {
    if ((ssb_sc_idx&3) == nushift) {  //skip DMRS
--- a/openair1/PHY/NR_TRANSPORT/nr_prach.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_prach.c
@@ -333,11 +333,6 @@ static void rx_nr_prach_ru_internal(prach_item_t *p,
    dftlen <<= 3;
    break;

-  case 491520:
-    Ncp <<= 4;
-    dftlen <<=4;
-    break;
-
  default:
    AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
  }
--- a/openair1/PHY/NR_TRANSPORT/nr_pss.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pss.c
@@ -27,8 +27,8 @@
 int nr_generate_pss(  c16_t *txdataF,
                      int16_t amp,
                      uint8_t ssb_start_symbol,
-                      nfapi_nr_config_request_scf_t* config,
-                      NR_DL_FRAME_PARMS *frame_parms)
+                      const nfapi_nr_config_request_scf_t* config,
+                      const NR_DL_FRAME_PARMS *frame_parms)
 {
  int16_t x[NR_PSS_LENGTH];
  const int x_initial[7] = {0, 1, 1 , 0, 1, 1, 1};
--- a/openair1/PHY/NR_TRANSPORT/nr_scrambling.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_scrambling.c
@@ -24,7 +24,7 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #define DEBUG_SCRAMBLING(a)
 //#define DEBUG_SCRAMBLING(a) a
-void nr_codeword_scrambling(uint8_t *in,
+void nr_codeword_scrambling(const uint8_t *in,
                            uint32_t size,
                            uint8_t q,
                            uint32_t Nid,
--- a/openair1/PHY/NR_TRANSPORT/nr_sss.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_sss.c
@@ -26,8 +26,8 @@
 int nr_generate_sss(  c16_t *txdataF,
                      int16_t amp,
                      uint8_t ssb_start_symbol,
-                      nfapi_nr_config_request_scf_t* config,
-                      NR_DL_FRAME_PARMS *frame_parms)
+                      const nfapi_nr_config_request_scf_t* config,
+                      const NR_DL_FRAME_PARMS *frame_parms)
 {
  int16_t x0[NR_SSS_LENGTH];
  int16_t x1[NR_SSS_LENGTH];
--- a/openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
@@ -69,7 +69,7 @@ void compute_nr_prach_seq(uint8_t short_sequence, uint8_t num_sequences, uint8_t

 void nr_fill_du(uint16_t N_ZC, const uint16_t *prach_root_sequence_map, uint16_t nr_du[NR_PRACH_SEQ_LEN_L - 1]);

-void nr_codeword_scrambling(uint8_t *in,
+void nr_codeword_scrambling(const uint8_t *in,
                            uint32_t size,
                            uint8_t q,
                            uint32_t Nid,
--- a/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
@@ -56,8 +56,8 @@ int nr_generate_prs(int slot,
 int nr_generate_pss(c16_t *txdataF,
                    int16_t amp,
                    uint8_t ssb_start_symbol,
-                    nfapi_nr_config_request_scf_t *config,
-                    NR_DL_FRAME_PARMS *frame_parms);
+                    const nfapi_nr_config_request_scf_t *config,
+                    const NR_DL_FRAME_PARMS *frame_parms);

 /*!
 \fn int nr_generate_sss
@@ -68,8 +68,8 @@ int nr_generate_pss(c16_t *txdataF,
 int nr_generate_sss(c16_t *txdataF,
                    int16_t amp,
                    uint8_t ssb_start_symbol,
-                    nfapi_nr_config_request_scf_t *config,
-                    NR_DL_FRAME_PARMS *frame_parms);
+                    const nfapi_nr_config_request_scf_t *config,
+                    const NR_DL_FRAME_PARMS *frame_parms);

 /*!
 \fn void nr_generate_pbch_dmrs
@@ -80,22 +80,23 @@ void nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
                           c16_t *txdataF,
                           int16_t amp,
                           uint8_t ssb_start_symbol,
-                           nfapi_nr_config_request_scf_t *config,
-                           NR_DL_FRAME_PARMS *frame_parms);
+                           const nfapi_nr_config_request_scf_t *config,
+                           const NR_DL_FRAME_PARMS *frame_parms);

 /*!
 \fn void nr_generate_pbch
 \brief Generation of the PBCH
@param
 */
-void nr_generate_pbch(PHY_VARS_gNB *gNB,
+void nr_generate_pbch(int16_t amp,
+                      const uint8_t *interleaver,
                      const nfapi_nr_dl_tti_ssb_pdu *ssb_pdu,
                      c16_t *txdataF,
                      uint8_t ssb_start_symbol,
                      uint8_t n_hf,
                      int sfn,
-                      nfapi_nr_config_request_scf_t *config,
-                      NR_DL_FRAME_PARMS *frame_parms);
+                      const nfapi_nr_config_request_scf_t *config,
+                      const NR_DL_FRAME_PARMS *frame_parms);

 /*!
 \fn int nr_generate_pbch
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch.h
@@ -74,6 +74,8 @@ void nr_ulsch_layer_demapping(int16_t *llr_cw, uint8_t Nl, uint8_t mod_order, ui

 void dump_pusch_stats(FILE *fd,PHY_VARS_gNB *gNB);

+void dump_nr_I0_stats(FILE *fd,PHY_VARS_gNB *gNB);
+
 NR_gNB_SCH_STATS_t *get_ulsch_stats(PHY_VARS_gNB *gNB,NR_gNB_ULSCH_t *ulsch);

 #endif /* NR_ULSCH_H_ */
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
@@ -1164,11 +1164,12 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
  int max_ch = 0;
  uint32_t nvar = 0;
  int end_symbol = rel15_ul->start_symbol_index + rel15_ul->nr_of_symbols;
-  for (uint8_t symbol = rel15_ul->start_symbol_index; symbol < end_symbol; symbol++) {
+  for(uint8_t symbol = rel15_ul->start_symbol_index; symbol < end_symbol; symbol++) {
    uint8_t dmrs_symbol_flag = (rel15_ul->ul_dmrs_symb_pos >> symbol) & 0x01;
    LOG_D(PHY, "symbol %d, dmrs_symbol_flag :%d\n", symbol, dmrs_symbol_flag);
-
+    
    if (dmrs_symbol_flag == 1) {
+
      for (int nl = 0; nl < rel15_ul->nrOfLayers; nl++) {
        uint32_t nvar_tmp = 0;
        nr_pusch_channel_estimation(gNB,
@@ -1186,54 +1187,56 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
                                    pusch_ch_est_dmrs_pos_slot_mem);
        nvar += nvar_tmp;
      }
+
+      allocCast2D(n0_subband_power,
+                  unsigned int,
+                  gNB->measurements.n0_subband_power,
+                  frame_parms->nb_antennas_rx,
+                  frame_parms->N_RB_UL,
+                  false);
+      for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
+        if (symbol == rel15_ul->start_symbol_index) {
+          pusch_vars->ulsch_power[aarx] = 0;
+          pusch_vars->ulsch_noise_power[aarx] = 0;
+        }
+
+        int64_t symb_energy = 0;
+        int start_sc = (rel15_ul->bwp_start + rel15_ul->rb_start) * NR_NB_SC_PER_RB;
+        int middle_sc = frame_parms->ofdm_symbol_size - frame_parms->first_carrier_offset;
+        int end_sc = (start_sc + rel15_ul->rb_size * NR_NB_SC_PER_RB - 1) % frame_parms->ofdm_symbol_size;
+
+        for (int s = rel15_ul->start_symbol_index; s < (rel15_ul->start_symbol_index + rel15_ul->nr_of_symbols); s++) {
+          int offset0 = ((slot % RU_RX_SLOT_DEPTH) * frame_parms->symbols_per_slot + s) * frame_parms->ofdm_symbol_size;
+          int offset = offset0 + (frame_parms->first_carrier_offset + start_sc) % frame_parms->ofdm_symbol_size;
+          c16_t *ul_ch = &gNB->common_vars.rxdataF[beam_nb][aarx][offset];
+          if (end_sc < start_sc) {
+            int64_t symb_energy_aux = signal_energy_nodc(ul_ch, middle_sc - start_sc) * (middle_sc - start_sc);
+            ul_ch = &gNB->common_vars.rxdataF[beam_nb][aarx][offset0];
+            symb_energy_aux += (signal_energy_nodc(ul_ch, end_sc + 1) * (end_sc + 1));
+            symb_energy += symb_energy_aux / (rel15_ul->rb_size * NR_NB_SC_PER_RB);
+          } else {
+            symb_energy += signal_energy_nodc(ul_ch, rel15_ul->rb_size * NR_NB_SC_PER_RB);
+          }
+        }
+        pusch_vars->ulsch_power[aarx] += (symb_energy / rel15_ul->nr_of_symbols);
+
+        pusch_vars->ulsch_noise_power[aarx] +=
+            average_u32(&n0_subband_power[aarx][rel15_ul->bwp_start + rel15_ul->rb_start], rel15_ul->rb_size);
+
+        LOG_D(PHY,
+              "aa %d, bwp_start%d, rb_start %d, rb_size %d: ulsch_power %d, ulsch_noise_power %d\n",
+              aarx,
+              rel15_ul->bwp_start,
+              rel15_ul->rb_start,
+              rel15_ul->rb_size,
+              pusch_vars->ulsch_power[aarx],
+              pusch_vars->ulsch_noise_power[aarx]);
+      }
    }
  }

  nvar /= (rel15_ul->nr_of_symbols * rel15_ul->nrOfLayers * frame_parms->nb_antennas_rx);

-  allocCast2D(n0_subband_power,
-              unsigned int,
-              gNB->measurements.n0_subband_power,
-              frame_parms->nb_antennas_rx,
-              frame_parms->N_RB_UL,
-              false);
-
-  int start_sc = (rel15_ul->bwp_start + rel15_ul->rb_start) * NR_NB_SC_PER_RB;
-  int middle_sc = frame_parms->ofdm_symbol_size - frame_parms->first_carrier_offset;
-  int end_sc = (start_sc + rel15_ul->rb_size * NR_NB_SC_PER_RB - 1) % frame_parms->ofdm_symbol_size;
-  for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
-    pusch_vars->ulsch_power[aarx] = 0;
-    pusch_vars->ulsch_noise_power[aarx] = 0;
-    int64_t symb_energy = 0;
-
-    for (uint8_t symbol = rel15_ul->start_symbol_index; symbol < end_symbol; symbol++) {
-      int offset0 = ((slot % RU_RX_SLOT_DEPTH) * frame_parms->symbols_per_slot + symbol) * frame_parms->ofdm_symbol_size;
-      int offset = offset0 + (frame_parms->first_carrier_offset + start_sc) % frame_parms->ofdm_symbol_size;
-      c16_t *ul_ch = &gNB->common_vars.rxdataF[beam_nb][aarx][offset];
-      if (end_sc < start_sc) {
-        int64_t symb_energy_aux = signal_energy_nodc(ul_ch, middle_sc - start_sc) * (middle_sc - start_sc);
-        ul_ch = &gNB->common_vars.rxdataF[beam_nb][aarx][offset0];
-        symb_energy_aux += (signal_energy_nodc(ul_ch, end_sc + 1) * (end_sc + 1));
-        symb_energy += symb_energy_aux / (rel15_ul->rb_size * NR_NB_SC_PER_RB);
-      } else {
-        symb_energy += signal_energy_nodc(ul_ch, rel15_ul->rb_size * NR_NB_SC_PER_RB);
-      }
-    }
-    pusch_vars->ulsch_power[aarx] += (symb_energy / rel15_ul->nr_of_symbols);
-
-    pusch_vars->ulsch_noise_power[aarx] +=
-        average_u32(&n0_subband_power[aarx][rel15_ul->bwp_start + rel15_ul->rb_start], rel15_ul->rb_size);
-
-    LOG_D(PHY,
-          "aa %d, bwp_start%d, rb_start %d, rb_size %d: ulsch_power %d, ulsch_noise_power %d\n",
-          aarx,
-          rel15_ul->bwp_start,
-          rel15_ul->rb_start,
-          rel15_ul->rb_size,
-          pusch_vars->ulsch_power[aarx],
-          pusch_vars->ulsch_noise_power[aarx]);
-  }
-
  // averaging time domain channel estimates
  if (gNB->chest_time == 1)
    nr_chest_time_domain_avg(frame_parms,
--- a/openair1/PHY/TOOLS/imscope/imscope_init.cpp
+++ b/openair1/PHY/TOOLS/imscope/imscope_init.cpp
@@ -41,8 +41,7 @@ extern "C" void imscope_autoinit(void *dataptr)
  if (IS_SOFTMODEM_GNB) {
    scopeParms_t *scope_params = (scopeParms_t *)dataptr;
    scope_params->gNB->scopeData = scope;
-    if (scope_params->ru)
-      scope_params->ru->scopeData = scope;
+    scope_params->ru->scopeData = scope;
  } else {
    PHY_VARS_NR_UE *ue = (PHY_VARS_NR_UE *)dataptr;
    ue->scopeData = scope;
--- a/openair1/PHY/defs_RU.h
+++ b/openair1/PHY/defs_RU.h
@@ -634,8 +634,6 @@ typedef struct RU_t_s {
  int num_fd;
  /// Core id of ru_thread
  int ru_thread_core;
-  /// Core id of tx_write_thread
-  int tx_write_thread_core;
  /// list of cores for RU ThreadPool
  int tpcores[16];
  /// number of cores for RU ThreadPool
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -111,6 +111,8 @@ typedef struct {
  uint8_t *f;
  /// REs unavailable for DLSCH (overlapping with PTRS, CSIRS etc.)
  uint32_t unav_res;
+  /// output of freq
+  //c16_t **txdataF; TODO
 } NR_gNB_DLSCH_t;

 typedef struct {
@@ -340,12 +342,16 @@ typedef struct {
  unsigned int n0_power_tot_dB;
  //! estimated avg noise power per RB per RX ant (lin)
  fourDimArray_t *n0_subband_power;
+  //! estimated avg noise power per RB per RX ant (dB)
+  fourDimArray_t *n0_subband_power_dB;
  //! estimated avg subband noise power (dB)
  unsigned int n0_subband_power_avg_dB;
  //! estimated avg subband noise power per antenna (dB)
  unsigned int n0_subband_power_avg_perANT_dB[MAX_ANT];
  //! estimated avg noise power per RB (dB)
  int n0_subband_power_tot_dB[275];
+  //! estimated avg noise power per RB (dBm)
+  int n0_subband_power_tot_dBm[275];
  /// PRACH background noise level
  int prach_I0;
 } PHY_MEASUREMENTS_gNB;
@@ -355,6 +361,23 @@ typedef struct {
 // therefore, we can have up to "number of UE" UCI PDUs
 #define MAX_NUM_NR_UCI_PDUS MAX_MOBILES_PER_GNB

+typedef struct {
+  time_stats_t encoding;
+  time_stats_t modulation;
+  time_stats_t scrambling;
+  time_stats_t pdsch_generation;
+  time_stats_t layer_mapping;
+  time_stats_t resource_mapping;
+  time_stats_t precoding;
+  time_stats_t rate_matching;
+  time_stats_t interleaving;
+  time_stats_t segmentation;
+  time_stats_t tinput;
+  time_stats_t tprep;
+  time_stats_t tparity;
+  time_stats_t toutput;
+} nr_dlsch_stats_t;
+
 /// Top-level PHY Data Structure for gNB
 typedef struct PHY_VARS_gNB_s {
  /// Module ID indicator for this instance
@@ -448,21 +471,7 @@ typedef struct PHY_VARS_gNB_s {
  time_stats_t phy_proc_rx;
  time_stats_t rx_prach;

-  time_stats_t dlsch_encoding_stats;
-  time_stats_t dlsch_modulation_stats;
-  time_stats_t dlsch_scrambling_stats;
-  time_stats_t dlsch_pdsch_generation_stats;
-  time_stats_t dlsch_layer_mapping_stats;
-  time_stats_t dlsch_resource_mapping_stats;
-  time_stats_t dlsch_precoding_stats;
-  time_stats_t tinput;
-  time_stats_t tprep;
-  time_stats_t tparity;
-  time_stats_t toutput;
-  
-  time_stats_t dlsch_rate_matching_stats;
-  time_stats_t dlsch_interleaving_stats;
-  time_stats_t dlsch_segmentation_stats;
+  nr_dlsch_stats_t dlsch_stats;

  time_stats_t dci_generation_stats;
  time_stats_t phase_comp_stats;
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -102,9 +102,28 @@ int beam_index_allocation(bool das,
  return idx;
 }

-void nr_common_signal_procedures(PHY_VARS_gNB *gNB, int frame, int slot, const nfapi_nr_dl_tti_ssb_pdu *ssb_pdu)
+static int get_beam(PHY_VARS_gNB *gNB, int slot, uint8_t start_sym, uint8_t len_sym, uint16_t beam_idx)
+{
+  /* TODO is this really necessary? FAPI message should tell us precoding +
+   * digBF weight (indices), and L1 should simply process this. I don't see a
+   * reason to have common_vars->beam_id, or why something should be checked.
+   * Surely, if something does not align, we should not assert(!) */
+  int bitmap = SL_to_bitmap(start_sym, len_sym);
+  int syms = gNB->frame_parms.symbols_per_slot;
+  int beam = beam_index_allocation(gNB->enable_analog_das, beam_idx, &gNB->common_vars, slot, syms, bitmap);
+  DevAssert(beam >= 0);
+  return beam;
+}
+
+void nr_common_signal_procedures(NR_DL_FRAME_PARMS *fp, // TODO: should be const
+                                 const nfapi_nr_config_request_scf_t *cfg,
+                                 int frame,
+                                 int slot,
+                                 const nfapi_nr_dl_tti_ssb_pdu *ssb_pdu,
+                                 const uint8_t *pbch_interleaver,
+                                 int amp,
+                                 c16_t *txdataF)
 {
-  NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
  const nfapi_nr_dl_tti_ssb_pdu_rel15_t *pdu = &ssb_pdu->ssb_pdu_rel15;
  uint8_t ssb_index = pdu->SsbBlockIndex;
  LOG_D(PHY,"common_signal_procedures: frame %d, slot %d ssb index %d\n", frame, slot, ssb_index);
@@ -117,7 +136,6 @@ void nr_common_signal_procedures(PHY_VARS_gNB *gNB, int frame, int slot, const n
  // for FR1 offsetToPointA and k_SSB are expressed in terms of 15 kHz SCS
  // for FR2 offsetToPointA is expressed in terms of 60 kHz SCS and k_SSB expressed in terms of the subcarrier spacing provided
  // by the higher-layer parameter subCarrierSpacingCommon
-  nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
  const int scs = cfg->ssb_config.scs_common.value;
  const int prb_offset = (fp->freq_range == FR1) ? pdu->ssbOffsetPointA >> scs : pdu->ssbOffsetPointA >> (scs - 2);
  const int sc_offset = (fp->freq_range == FR1) ? pdu->SsbSubcarrierOffset >> scs : pdu->SsbSubcarrierOffset;
@@ -153,28 +171,16 @@ void nr_common_signal_procedures(PHY_VARS_gNB *gNB, int frame, int slot, const n
        fp->ssb_start_subcarrier);

  LOG_D(PHY,"SS TX: frame %d, slot %d, start_symbol %d\n", frame, slot, ssb_start_symbol);
-  const nfapi_nr_tx_precoding_and_beamforming_t *pb = &pdu->precoding_and_beamforming;
-  c16_t ***txdataF = gNB->common_vars.txdataF;
-  int txdataF_offset = slot * fp->samples_per_slot_wCP;
-  // beam number in a scenario with multiple concurrent beams
-  int bitmap = SL_to_bitmap(ssb_start_symbol, 4); // 4 ssb symbols
-  int beam_nb = beam_index_allocation(gNB->enable_analog_das,
-                                      pb->prgs_list[0].dig_bf_interface_list[0].beam_idx,
-                                      &gNB->common_vars,
-                                      slot,
-                                      fp->symbols_per_slot,
-                                      bitmap);
-
-  nr_generate_pss(&txdataF[beam_nb][0][txdataF_offset], gNB->TX_AMP, ssb_start_symbol, cfg, fp);
-  nr_generate_sss(&txdataF[beam_nb][0][txdataF_offset], gNB->TX_AMP, ssb_start_symbol, cfg, fp);
+  nr_generate_pss(txdataF, amp, ssb_start_symbol, cfg, fp);
+  nr_generate_sss(txdataF, amp, ssb_start_symbol, cfg, fp);

  uint16_t slots_per_hf = (fp->slots_per_frame) >> 1;
  int n_hf = slot < slots_per_hf ? 0 : 1;

  int hf = fp->Lmax == 4 ? n_hf : 0;
-  nr_generate_pbch_dmrs(nr_gold_pbch(fp->Lmax, gNB->gNB_config.cell_config.phy_cell_id.value, hf, ssb_index & 7),
-                        &txdataF[beam_nb][0][txdataF_offset],
-                        gNB->TX_AMP,
+  nr_generate_pbch_dmrs(nr_gold_pbch(fp->Lmax, cfg->cell_config.phy_cell_id.value, hf, ssb_index & 7),
+                        txdataF,
+                        amp,
                        ssb_start_symbol,
                        cfg,
                        fp);
@@ -189,9 +195,10 @@ void nr_common_signal_procedures(PHY_VARS_gNB *gNB, int frame, int slot, const n
  }
 #endif

-  nr_generate_pbch(gNB,
+  nr_generate_pbch(amp,
+                   pbch_interleaver,
                   ssb_pdu,
-                   &txdataF[beam_nb][0][txdataF_offset],
+                   txdataF,
                   ssb_start_symbol,
                   n_hf,
                   frame,
@@ -210,10 +217,12 @@ void clear_slot_beamid(PHY_VARS_gNB *gNB, int slot)
  }
 }

-static void nr_generate_csi_rs_gNB(PHY_VARS_gNB *gNB,
+static void nr_generate_csi_rs_gNB(const NR_DL_FRAME_PARMS *frame_parms,
                                   int slot,
                                   const nfapi_nr_config_request_scf_t *cfg,
-                                   const nfapi_nr_dl_tti_csi_rs_pdu *csi_rs_pdu)
+                                   const nfapi_nr_dl_tti_csi_rs_pdu *csi_rs_pdu,
+                                   int amp,
+                                   c16_t **txdataF)
 {
  const nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *csi_params = &csi_rs_pdu->csi_rs_pdu_rel15;
  if (csi_params->csi_type == 2) // ZP-CSI
@@ -221,21 +230,14 @@ static void nr_generate_csi_rs_gNB(PHY_VARS_gNB *gNB,

  csi_mapping_parms_t mapping_parms =
      get_csi_mapping_parms(csi_params->row, csi_params->freq_domain, csi_params->symb_l0, csi_params->symb_l1);
-  const nfapi_nr_tx_precoding_and_beamforming_t *pb = &csi_params->precodingAndBeamforming;
  int csi_bitmap = 0;
  int lprime_num = mapping_parms.lprime + 1;
  for (int j = 0; j < mapping_parms.size; j++)
    csi_bitmap |= ((1 << lprime_num) - 1) << mapping_parms.loverline[j];
-  int beam_nb = beam_index_allocation(gNB->enable_analog_das,
-                                      pb->prgs_list[0].dig_bf_interface_list[0].beam_idx,
-                                      &gNB->common_vars,
-                                      slot,
-                                      gNB->frame_parms.symbols_per_slot,
-                                      csi_bitmap);

-  nr_generate_csi_rs(&gNB->frame_parms,
+  nr_generate_csi_rs(frame_parms,
                     &mapping_parms,
-                     gNB->TX_AMP,
+                     amp,
                     slot,
                     csi_params->freq_density,
                     csi_params->start_rb,
@@ -246,7 +248,7 @@ static void nr_generate_csi_rs_gNB(PHY_VARS_gNB *gNB,
                     csi_params->scramb_id,
                     csi_params->power_control_offset_ss,
                     csi_params->cdm_type,
-                     gNB->common_vars.txdataF[beam_nb]);
+                     txdataF);
 }

 void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
@@ -288,21 +290,36 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
    }
  }

-  for (int i = 0; i < UL_dci_req->numPdus; ++i)
-    nr_generate_dci(gNB, &UL_dci_req->ul_dci_pdu_list[i].pdcch_pdu.pdcch_pdu_rel15, txdataF_offset, &gNB->frame_parms, slot);
+  c16_t ***txdataF = gNB->common_vars.txdataF;
+  for (int i = 0; i < UL_dci_req->numPdus; ++i) {
+    const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdu = &UL_dci_req->ul_dci_pdu_list[i].pdcch_pdu.pdcch_pdu_rel15;
+    uint16_t beam_idx = pdu->precodingAndBeamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx;
+    int beam_nb = get_beam(gNB, slot, pdu->StartSymbolIndex, pdu->DurationSymbols, beam_idx);
+    nr_generate_dci(pdu, &gNB->frame_parms, slot, gNB->TX_AMP, txdataF[beam_nb][0] + txdataF_offset);
+  }

  int num_pdsch = 0;
  for (int i = 0; i < DL_req->dl_tti_request_body.nPDUs; ++i) {
    const nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu = &DL_req->dl_tti_request_body.dl_tti_pdu_list[i];
    switch (dl_tti_pdu->PDUType) {
      case NFAPI_NR_DL_TTI_SSB_PDU_TYPE:
-        nr_common_signal_procedures(gNB, frame, slot, &dl_tti_pdu->ssb_pdu);
-        break;
-      case NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE:
-        nr_generate_dci(gNB, &dl_tti_pdu->pdcch_pdu.pdcch_pdu_rel15, txdataF_offset, &gNB->frame_parms, slot);
+        // TODO: do beam selection
+        nr_common_signal_procedures(&gNB->frame_parms,
+                                    &gNB->gNB_config,
+                                    frame,
+                                    slot,
+                                    &dl_tti_pdu->ssb_pdu,
+                                    gNB->nr_pbch_interleaver,
+                                    gNB->TX_AMP,
+                                    txdataF[0] + txdataF_offset);
        break;
+      case NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE: {
+        const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdu = &dl_tti_pdu->pdcch_pdu.pdcch_pdu_rel15;
+        nr_generate_dci(pdu, &gNB->frame_parms, slot, gNB->TX_AMP, txdataF[0] + txdataF_offset);
+        } break;
      case NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE:
-        nr_generate_csi_rs_gNB(gNB, slot, cfg, &dl_tti_pdu->csi_rs_pdu);
+        // TODO: do beam selection
+        nr_generate_csi_rs_gNB(&gNB->frame_parms, slot, cfg, &dl_tti_pdu->csi_rs_pdu, gNB->TX_AMP, txdataF);
        break;
      case NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE: {
        int tx_data_idx = dl_tti_pdu->pdsch_pdu.pdsch_pdu_rel15.pduIndex;
@@ -328,7 +345,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
  if (num_pdsch > 0) {
    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DLSCH,1);
    LOG_D(PHY, "PDSCH generation started (%d) in frame %d.%d\n", num_pdsch, frame, slot);
-    nr_generate_pdsch(gNB, num_pdsch, gNB->dlsch, frame, slot);
+    nr_generate_pdsch(gNB, num_pdsch, gNB->dlsch, frame, slot); // TODO
    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DLSCH,0);
  }

@@ -1083,6 +1100,8 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, N
    if (!(ulsch->active && ulsch->frame == frame_rx && ulsch->slot == slot_rx && !ulsch->handled))
      continue;
    LOG_D(PHY, "PUSCH ID %d with RNTI %x detection started in frame %d slot %d\n", ULSCH_id, ulsch->rnti, frame_rx, slot_rx);
+    nfapi_nr_pusch_pdu_t *pdu = &ulsch_harq->ulsch_pdu;
+    int num_dmrs = count_bits64_with_mask(pdu->ul_dmrs_symb_pos, 0, NR_NUMBER_OF_SYMBOLS_PER_SLOT);

 #ifdef DEBUG_RXDATA
    RU_t *ru = gNB->RU_list[0];
@@ -1122,7 +1141,9 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, N
    pusch_vars->ulsch_power_tot = 0;
    pusch_vars->ulsch_noise_power_tot = 0;
    for (int aarx = 0; aarx < nb_antennas_rx; aarx++) {
+      pusch_vars->ulsch_power[aarx] /= num_dmrs;
      pusch_vars->ulsch_power_tot += pusch_vars->ulsch_power[aarx];
+      pusch_vars->ulsch_noise_power[aarx] /= num_dmrs;
      pusch_vars->ulsch_noise_power_tot += pusch_vars->ulsch_noise_power[aarx];
    }
    if (dB_fixed_x10(pusch_vars->ulsch_power_tot) < dB_fixed_x10(pusch_vars->ulsch_noise_power_tot) + gNB->pusch_thres) {
--- a/openair1/SCHED_NR/sched_nr.h
+++ b/openair1/SCHED_NR/sched_nr.h
@@ -43,7 +43,14 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
 void nr_save_ul_tti_req(PHY_VARS_gNB *gNB, nfapi_nr_ul_tti_request_t *UL_tti_req);
 int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, NR_UL_IND_t *UL_INFO);
 void L1_nr_prach_procedures(PHY_VARS_gNB *gNB, int frame, int slot, nfapi_nr_rach_indication_t *rach_ind);
-void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame,int slot, const nfapi_nr_dl_tti_ssb_pdu *ssb_pdu);
+void nr_common_signal_procedures(NR_DL_FRAME_PARMS *fp, // TODO: should be const
+                                 const nfapi_nr_config_request_scf_t *cfg,
+                                 int frame,
+                                 int slot,
+                                 const nfapi_nr_dl_tti_ssb_pdu *ssb_pdu,
+                                 const uint8_t *pbch_interleaver,
+                                 int amp,
+                                 c16_t *txdataF);
 void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx);
 void nr_feptx0(RU_t *ru,int tti_tx,int first_symbol, int num_symbols, int aa);
 void nr_feptx_prec(RU_t *ru,int frame_tx,int tti_tx);
--- a/openair1/SIMULATION/NR_PHY/dlschsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlschsim.c
@@ -516,7 +516,9 @@ int main(int argc, char **argv)
        unsigned char output[nb_rb * NR_SYMBOLS_PER_SLOT * NR_NB_SC_PER_RB * NR_MAX_NB_LAYERS] __attribute__((aligned(64)));
        bzero(output, sizeof(output));
 	if (input_fd == NULL) {
-	  nr_dlsch_encoding(gNB, 1, dlsch, frame, slot, frame_parms, output, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    nr_dlsch_stats_t stats = {0};
+    nrLDPC_coding_encoder_t *enc = gNB->nrLDPC_coding_interface.nrLDPC_coding_encoder;
+	  nr_dlsch_encoding(enc, &gNB->threadPool, 1, dlsch, frame, slot, frame_parms, output, &stats);
 	}

 	for (SNR = snr0; SNR < snr1 && !stop; SNR += snr_step) {
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -1022,21 +1022,21 @@ int main(int argc, char **argv)

    varArray_t *table_tx=initVarArray(1000,sizeof(double));
    reset_meas(&gNB->phy_proc_tx);
-    reset_meas(&gNB->dlsch_scrambling_stats);
-    reset_meas(&gNB->dlsch_interleaving_stats);
-    reset_meas(&gNB->dlsch_rate_matching_stats);
-    reset_meas(&gNB->dlsch_segmentation_stats);
-    reset_meas(&gNB->dlsch_modulation_stats);
-    reset_meas(&gNB->dlsch_pdsch_generation_stats);
-    reset_meas(&gNB->dlsch_precoding_stats);
-    reset_meas(&gNB->dlsch_layer_mapping_stats);
-    reset_meas(&gNB->dlsch_resource_mapping_stats);
-    reset_meas(&gNB->dlsch_encoding_stats);
+    reset_meas(&gNB->dlsch_stats.scrambling);
+    reset_meas(&gNB->dlsch_stats.interleaving);
+    reset_meas(&gNB->dlsch_stats.rate_matching);
+    reset_meas(&gNB->dlsch_stats.segmentation);
+    reset_meas(&gNB->dlsch_stats.modulation);
+    reset_meas(&gNB->dlsch_stats.pdsch_generation);
+    reset_meas(&gNB->dlsch_stats.precoding);
+    reset_meas(&gNB->dlsch_stats.layer_mapping);
+    reset_meas(&gNB->dlsch_stats.resource_mapping);
+    reset_meas(&gNB->dlsch_stats.encoding);
+    reset_meas(&gNB->dlsch_stats.tinput);
+    reset_meas(&gNB->dlsch_stats.tprep);
+    reset_meas(&gNB->dlsch_stats.tparity);
+    reset_meas(&gNB->dlsch_stats.toutput);
    reset_meas(&gNB->dci_generation_stats);
-    reset_meas(&gNB->tinput);
-    reset_meas(&gNB->tprep);
-    reset_meas(&gNB->tparity);
-    reset_meas(&gNB->toutput);
    reset_meas(&gNB->phase_comp_stats);

    uint32_t errors_scrambling[16] = {0};
@@ -1323,22 +1323,22 @@ int main(int argc, char **argv)
             8 * pdsch_pdu_rel15->TBSize[0]);
      printDistribution(&gNB->phy_proc_tx,table_tx,"PHY proc tx");
      printStatIndent2(&gNB->dci_generation_stats, "DCI encoding time");
-      printStatIndent2(&gNB->dlsch_encoding_stats,"DLSCH encoding time");
-      printStatIndent3(&gNB->dlsch_segmentation_stats,"DLSCH segmentation time");
-      printStatIndent3(&gNB->tinput,"DLSCH LDPC input processing time");
-      printStatIndent3(&gNB->tprep,"DLSCH LDPC input preparation time");
-      printStatIndent3(&gNB->tparity,"DLSCH LDPC parity generation time");
-      printStatIndent3(&gNB->toutput,"DLSCH LDPC output generation time");
-      printStatIndent3(&gNB->dlsch_rate_matching_stats,"DLSCH Rate Matching time");
-      printStatIndent3(&gNB->dlsch_interleaving_stats,  "DLSCH Interleaving time");
-      printStatIndent2(&gNB->dlsch_modulation_stats,"DLSCH modulation time");
-      printStatIndent2(&gNB->dlsch_scrambling_stats, "DLSCH scrambling time");
-      printStatIndent2(&gNB->dlsch_pdsch_generation_stats,"DLSCH PDSCH Generation time");
-      printStatIndent3(&gNB->dlsch_layer_mapping_stats,"DLSCH Layer Mapping time");
-      gNB->dlsch_resource_mapping_stats.trials = gNB->dlsch_layer_mapping_stats.trials;
-      printStatIndent3(&gNB->dlsch_resource_mapping_stats,"DLSCH Resource Mapping time");
-      gNB->dlsch_precoding_stats.trials = gNB->dlsch_layer_mapping_stats.trials;
-      printStatIndent3(&gNB->dlsch_precoding_stats,"DLSCH Precoding time");
+      printStatIndent2(&gNB->dlsch_stats.encoding,"DLSCH encoding time");
+      printStatIndent3(&gNB->dlsch_stats.segmentation,"DLSCH segmentation time");
+      printStatIndent3(&gNB->dlsch_stats.tinput,"DLSCH LDPC input processing time");
+      printStatIndent3(&gNB->dlsch_stats.tprep,"DLSCH LDPC input preparation time");
+      printStatIndent3(&gNB->dlsch_stats.tparity,"DLSCH LDPC parity generation time");
+      printStatIndent3(&gNB->dlsch_stats.toutput,"DLSCH LDPC output generation time");
+      printStatIndent3(&gNB->dlsch_stats.rate_matching,"DLSCH Rate Matching time");
+      printStatIndent3(&gNB->dlsch_stats.interleaving,  "DLSCH Interleaving time");
+      printStatIndent2(&gNB->dlsch_stats.modulation,"DLSCH modulation time");
+      printStatIndent2(&gNB->dlsch_stats.scrambling, "DLSCH scrambling time");
+      printStatIndent2(&gNB->dlsch_stats.pdsch_generation,"DLSCH PDSCH Generation time");
+      printStatIndent3(&gNB->dlsch_stats.layer_mapping,"DLSCH Layer Mapping time");
+      gNB->dlsch_stats.resource_mapping.trials = gNB->dlsch_stats.layer_mapping.trials;
+      printStatIndent3(&gNB->dlsch_stats.resource_mapping,"DLSCH Resource Mapping time");
+      gNB->dlsch_stats.precoding.trials = gNB->dlsch_stats.layer_mapping.trials;
+      printStatIndent3(&gNB->dlsch_stats.precoding, "DLSCH Precoding time");
      if (gNB->phase_comp)
        printStatIndent2(&gNB->phase_comp_stats, "Phase Compensation");

--- a/openair1/SIMULATION/NR_PHY/pbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pbchsim.c
@@ -523,7 +523,14 @@ int main(int argc, char **argv)
        for (aa=0; aa<gNB->frame_parms.nb_antennas_tx; aa++)
          memset(gNB->common_vars.txdataF[0][aa], 0, frame_parms->samples_per_slot_wCP * sizeof(int32_t));

-        nr_common_signal_procedures (gNB,frame,slot, &ssb_pdu[i]);
+        nr_common_signal_procedures(&gNB->frame_parms,
+                                    &gNB->gNB_config,
+                                    frame,
+                                    slot,
+                                    &ssb_pdu[i],
+                                    gNB->nr_pbch_interleaver,
+                                    gNB->TX_AMP,
+                                    gNB->common_vars.txdataF[0][aa]);

        int samp = get_samples_slot_timestamp(frame_parms, slot);
        for (aa=0; aa<gNB->frame_parms.nb_antennas_tx; aa++) {
--- a/openair2/ENB_APP/enb_paramdef.h
+++ b/openair2/ENB_APP/enb_paramdef.h
@@ -99,7 +99,6 @@ typedef enum {
 #define CONFIG_STRING_RU_NUM_INTERFACES           "num_interfaces"
 #define CONFIG_STRING_RU_HALF_SLOT_PARALLELIZATION "half_slot_parallelization"
 #define CONFIG_STRING_RU_RU_THREAD_CORE            "ru_thread_core"
-#define CONFIG_STRING_RU_TX_WRITE_THREAD_CORE      "tx_write_thread_core"
 #define CONFIG_STRING_RU_GPIO_CONTROL "gpio_controller"

 #define HLP_RU_SF_AHEAD "LTE TX processing advance"
@@ -113,7 +112,6 @@ typedef enum {
 #define HLP_RU_NUM_INTERFACES "Number of network interfaces for RU"
 #define HLP_RU_HALF_SLOT_PARALLELIZATION "run half slots in parallel in RU FEP"
 #define HLP_RU_RU_THREAD_CORE "id of core to pin ru_thread, -1 is default"
-#define HLP_RU_TX_WRITE_THREAD_CORE "id of core to pin tx_write_thread, -1 is default"
 #define HLP_RU_GPIO_CONTROL "set the GPIO control type for the RU"

 #define RU_LOCAL_IF_NAME_IDX          0
@@ -159,7 +157,6 @@ typedef enum {
 #define RU_HALF_SLOT_PARALLELIZATION  40
 #define RU_RU_THREAD_CORE             41
 #define RU_GPIO_CONTROL               42
-#define RU_TX_WRITE_THREAD_CORE       43
 /*-----------------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            RU configuration parameters                                                                  */
 /*   optname                                   helpstr   paramflags    XXXptr          defXXXval                   type      numelt        */
@@ -209,7 +206,6 @@ typedef enum {
  {CONFIG_STRING_RU_HALF_SLOT_PARALLELIZATION, HLP_RU_HALF_SLOT_PARALLELIZATION,  0,       .uptr=NULL,       .defintval=1,                 TYPE_UINT,        0}, \
  {CONFIG_STRING_RU_RU_THREAD_CORE,            HLP_RU_RU_THREAD_CORE,             0,       .iptr=NULL,       .defintval=-1,                TYPE_INT,         0}, \
  {CONFIG_STRING_RU_GPIO_CONTROL,              HLP_RU_GPIO_CONTROL,               0,       .strptr=NULL,     .defstrval="generic",         TYPE_STRING,      0}, \
-  {CONFIG_STRING_RU_TX_WRITE_THREAD_CORE,      HLP_RU_TX_WRITE_THREAD_CORE,       0,       .iptr=NULL,       .defintval=-1,                TYPE_INT,         0}, \
 }
 // clang-format on

--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -563,13 +563,12 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc, uint64_t ssbmap)
  NR_RACH_ConfigCommon_t *rach_ConfigCommon = scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup;
  long config_index = rach_ConfigCommon->rach_ConfigGeneric.prach_ConfigurationIndex;
  frequency_range_t freq_range = get_freq_range_from_arfcn(dlcc->frequencyInfoDL->absoluteFrequencyPointA);
-  int band = (int)*dlcc->frequencyInfoDL->frequencyBandList.list.array[0];
  frame_type_t frame_type = get_frame_type((int)*dlcc->frequencyInfoDL->frequencyBandList.list.array[0], *scc->ssbSubcarrierSpacing);
-  nr_prach_info_t prach_info =  get_nr_prach_occasion_info_from_index(config_index, band==96 ? FR2 : freq_range, frame_type);
+  nr_prach_info_t prach_info =  get_nr_prach_occasion_info_from_index(config_index, freq_range, frame_type);
  AssertFatal(prach_info.start_symbol + prach_info.N_t_slot * prach_info.N_dur < 14,
-              "PRACH with configuration index %ld goes to the last symbol of the slot, for optimal performance pick another index (start_symbold %d, N_t_slot %d, N_dur %d. "
+              "PRACH with configuration index %ld goes to the last symbol of the slot, for optimal performance pick another index. "
              "See Tables 6.3.3.2-2 to 6.3.3.2-4 in 38.211\n",
-              config_index,prach_info.start_symbol, prach_info.N_t_slot, prach_info.N_dur);
+              config_index);
  // default value for msg3 precoder is NULL (0 means enabled)
  if (*rach_ConfigCommon->msg3_transformPrecoder != 0) {
    free(rach_ConfigCommon->msg3_transformPrecoder);
--- a/radio/COMMON/common_lib.h
+++ b/radio/COMMON/common_lib.h
@@ -430,8 +430,6 @@ struct openair0_device {
  /*!brief Used in ECPRI split 8 to indicate the TX/RX timing offset*/
  int txrx_offset;

-  /*!brief specifies affinity for tx_write_thread*/
-  int tx_write_thread_affinity;
  /* Functions API, which are called by the application*/

  /*! \brief Called to start the transceiver. Return 0 if OK, < 0 if error
--- a/radio/USRP/usrp_lib.cpp
+++ b/radio/USRP/usrp_lib.cpp
@@ -681,7 +681,7 @@ int trx_usrp_write_init(openair0_device_t *device)
               trx_usrp_write_thread,
               (void *)device,
               (char*)"trx_usrp_write_thread",
-               device->tx_write_thread_affinity,
+               -1,
               OAI_PRIORITY_RT_MAX);
  return(0);
 }
@@ -1165,12 +1165,13 @@ extern "C" {
    }

    if (device_adds[0].get(type_str) == "x4xx") {
-      printf("Found USRP x400 custom\n");
+      printf("Found USRP x400\n");
      device->type = USRP_X400_DEV;
-      usrp_master_clock = 491.52e6;
+      usrp_master_clock = 245.76e6;
      args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock);
+
      // https://kb.ettus.com/USRP_Host_Performance_Tuning_Tips_and_Tricks
-      if (0 != system("sysctl -w net.core.rmem_max=250000000 net.core.wmem_max=250000000"))
+      if (0 != system("sysctl -w net.core.rmem_max=62500000 net.core.wmem_max=62500000"))
        LOG_W(HW, "Can't set kernel parameters for X4x0\n");
    }

@@ -1196,12 +1197,6 @@ extern "C" {
    LOG_I(HW,"%s() sample_rate:%u\n", __FUNCTION__, (int)openair0_cfg[0].sample_rate);

    switch ((int)openair0_cfg[0].sample_rate) {
-      case 491520000:
-	openair0_cfg[0].tx_sample_advance = 15;
-	openair0_cfg[0].tx_bw = 400e6;
-	openair0_cfg[0].rx_bw = 400e6;
-	break;
-
      case 245760000:
        // from usrp_time_offset
        // openair0_cfg[0].samples_per_packet    = 2048;
@@ -1237,7 +1232,6 @@ extern "C" {
      case 61440000:
        // from usrp_time_offset
        //openair0_cfg[0].samples_per_packet    = 2048;
-	printf("sample rate of 40 \n"); 
        openair0_cfg[0].tx_sample_advance     = 15;
        openair0_cfg[0].tx_bw                 = 40e6;
        openair0_cfg[0].rx_bw                 = 40e6;
--- a/radio/fhi_72/CMakeLists.txt
+++ b/radio/fhi_72/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(oran_fhlib_5g MODULE
 )

 set(E_VERSION 5.1.6)
-set(F_VERSION 6.1.8)
+set(F_VERSION 6.1.7)

 find_package(xran REQUIRED)
 if(xran_VERSION VERSION_EQUAL E_VERSION)
--- a/radio/fhi_72/oaioran.c
+++ b/radio/fhi_72/oaioran.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <stdatomic.h>
 #include "xran_fh_o_du.h"
 #include "xran_compression.h"
 #include "armral_bfp_compression.h"
@@ -57,7 +56,6 @@ int xran_is_prach_slot(uint8_t PortId, uint32_t subframe_id, uint32_t slot_id);

 #ifndef USE_POLLING
 extern notifiedFIFO_t oran_sync_fifo;
-atomic_int xran_queue_length = 0;
 #else
 volatile oran_sync_info_t oran_sync_info = {0};
 #endif
@@ -139,7 +137,6 @@ void oai_xran_fh_rx_callback(void *pCallbackTag, xran_status_t status)
      info->sl = slot2;
      info->f = frame;
      LOG_D(HW, "Push %d.%d.%d (slot %d, subframe %d,last_slot %d)\n", frame, info->sl, slot, ru_id, subframe, last_slot);
-      atomic_fetch_add(&xran_queue_length, 1);
      pushNotifiedFIFO(&oran_sync_fifo, req);
 #else
      LOG_D(HW, "Writing %d.%d.%d (slot %d, subframe %d,last_slot %d)\n", frame, slot2, ru_id, slot, subframe, last_slot);
@@ -323,29 +320,20 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot)
  struct xran_common_counters x_counters[XRAN_PORTS_NUM];
  static int outcnt = 0;
 #ifndef USE_POLLING
-  // pull next event from oran_sync_fifo
+  // pull next even from oran_sync_fifo
  notifiedFIFO_elt_t *res = pullNotifiedFIFO(&oran_sync_fifo);
-  atomic_fetch_sub(&xran_queue_length, 1);
-  oran_sync_info_t *info = NotifiedFifoData(res);

-#define MAX_QUEUE_LENGTH_NO_JUMP 3
-  if (xran_queue_length > 0 && xran_queue_length < MAX_QUEUE_LENGTH_NO_JUMP) {
-    LOG_D(HW, "%4d.%2d TTI processing delay detected\n", info->f, info->sl);
-  } else if (xran_queue_length >= MAX_QUEUE_LENGTH_NO_JUMP) {
-    uint32_t old_f = info->f;
-    uint32_t old_sl = info->sl;
-    // set the frame/slot info to what is in the last message
-    notifiedFIFO_elt_t *f;
-    while ((f = pollNotifiedFIFO(&oran_sync_fifo)) != NULL) {
-      atomic_fetch_sub(&xran_queue_length, 1);
-      delNotifiedFIFO_elt(res);
-      res = f;
-    }
-    info = NotifiedFifoData(res);
-    LOG_W(HW, "TTI processing delay detected, skipping %4d.%2d => %4d.%2d\n", old_f, old_sl, info->f, info->sl);
-    DevAssert(xran_queue_length == 0);
+  notifiedFIFO_elt_t *f;
+  while ((f = pollNotifiedFIFO(&oran_sync_fifo)) != NULL) {
+    oran_sync_info_t *old_info = NotifiedFifoData(res);
+    oran_sync_info_t *new_info = NotifiedFifoData(f);
+    LOG_E(HW, "Detected double sync message %d.%d => %d.%d\n", old_info->f, old_info->sl, new_info->f, new_info->sl);
+    delNotifiedFIFO_elt(res);
+    res = f;
  }

+  oran_sync_info_t *info = NotifiedFifoData(res);
+
  *slot = info->sl;
  *frame = info->f;
  delNotifiedFIFO_elt(res);
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf
@@ -1,274 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe01;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-    # min_rxtxtime = 4;
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 1;
-    pusch_AntennaPorts    = 1;
-    do_CSIRS              = 0;
-    do_SRS                = 0;
-    force_256qam_off = 0;
-    force_UL256qam_off    = 0;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-     #n_TimingAdvanceOffset                                         = 1;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3420.48MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 627456;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3401.40 MHz
-      dl_absoluteFrequencyPointA                                    = 626760;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 106;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 28875; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 3;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1;
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0;
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 4;
-        p0_NominalWithGrant                                         = -24;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -24;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 10;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
-
-      ssPBCH_BlockPower                                                 = 0;
-  }
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.22.0.10"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.26.190.95";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.26.190.95";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 200;
-  #dl_bler_target_upper        = .35;
-  #dl_bler_target_lower        = .15;
-  #ul_bler_target_upper        = .35;
-  #ul_bler_target_lower        = .15;
-  pusch_FailureThres          = 1000;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 200;
-  pucch0_dtx_threshold = 100;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 9; # needs to match O-RU configuration
-  L1_rx_thread_core = 8;
-  L1_tx_thread_core = 10;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 9;
-  sl_ahead       = 10;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "no";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  nr_mac_log_level = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:70:11.0"); # one VF can be used as well
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  ru_addr = ("50:7c:6f:45:f3:04");
-  mtu = 9216;
-  fh_config = ({
-    T1a_cp_dl = (2566, 2585);
-    T1a_cp_ul = (2566, 2585);
-    T1a_up = (2200, 2300);
-    Ta4 = (1500, 1990);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-    prach_config = {
-      eAxC_offset = 4;
-    };
-  });
-};
-
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -11,7 +11,7 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });

    nr_cellid = 12345678L;

@@ -19,7 +19,7 @@ gNBs =

    do_CSIRS                                                  = 1;
    do_SRS                                                    = 1;
-    min_rxtxtime     = 6;
+
    #uess_agg_levels = [0,1,2,2,1]
    servingCellConfigCommon = (
    {
@@ -155,13 +155,13 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.5"; });
+    amf_ip_address = ({ ipv4 = "192.168.70.132"; });


    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.51/24";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.51/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
Author	SHA1	Message	Date
Robert Schmidt	02841ba05a	TODO address	2026-02-07 09:25:23 +01:00
Robert Schmidt	4b33d4a062	NR_gNB_DLSCH => txdataF	2026-02-07 09:25:22 +01:00
Robert Schmidt	c3abf1d7ba	do_one_dlsch()	2026-02-07 09:25:22 +01:00
Robert Schmidt	f64705b881	nr_codeword_scrambling() const	2026-02-07 09:25:21 +01:00
Robert Schmidt	77ec06fd28	nr_dlsch_encoding	2026-02-07 09:25:21 +01:00
Robert Schmidt	37d4ac017f	simplify DLSCH stats handling	2026-02-07 09:25:20 +01:00
Robert Schmidt	31c8862332	Simplify do_txdataF	2026-02-07 09:25:19 +01:00
Robert Schmidt	ef0161a8a4	TODO: nr_generate_pdsch()	2026-02-07 09:25:19 +01:00
Robert Schmidt	a8ca3bc6b0	nr_generate_csi_rs_gNB	2026-02-07 09:25:18 +01:00
Robert Schmidt	df221933c5	nr_common_signal_procedures() + const	2026-02-07 09:25:16 +01:00
Robert Schmidt	b6fef0cc86	nr_generate_pbch()	2026-02-07 09:24:49 +01:00
Robert Schmidt	9b09504285	Fix: pre-select txdataF beam. This does not work, each DCI says which beam, independently	2026-02-07 09:24:45 +01:00
Robert Schmidt	ae7af7b704	nr_generate_dci()	2026-02-05 14:45:36 +01:00