intermediate commit

CMakeLists.txt

@@ -620,7 +620,7 @@ target_link_libraries(benetel_5g PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
 # ORAN 5G library
 ######################################################################
-add_boolean_option(ORAN_BRONZE ON "Build support for Bronze version of ORAN FHI")
+add_boolean_option(ORAN_BRONZE OFF "Build support for Bronze version of ORAN FHI")
 if (ORAN_BRONZE)
   set(ORAN_FHLIB_5G_SOURCE
       ${OPENAIR_DIR}/radio/ETHERNET/oran/5g/sample-app-bronze.c
@@ -656,7 +656,7 @@ execute_process(
 	OUTPUT_VARIABLE DPDK_LIBS
 )
 TARGET_LINK_LIBRARIES(oran_fhlib_5g PRIVATE ${DPDK_LIBS})
-TARGET_LINK_LIBRARIES(oran_fhlib_5g PRIVATE -L${XRAN_LIB_DIR}/build -lxran)
+TARGET_LINK_LIBRARIES(oran_fhlib_5g PRIVATE -L${XRAN_LIB_DIR} -lxran)
 TARGET_LINK_LIBRARIES(oran_fhlib_5g PRIVATE pthread dl rt m numa)
 target_link_libraries(oran_fhlib_5g PRIVATE asn1_nr_rrc asn1_lte_rrc)
 

radio/ETHERNET/oran/5g/oaioran.c

@@ -55,7 +55,7 @@ volatile uint32_t rx_cb_slot = 0;
 #define GetFrameNum(tti,SFNatSecStart,numSubFramePerSystemFrame, numSlotPerSubFrame)  ((((uint32_t)tti / ((uint32_t)numSubFramePerSystemFrame * (uint32_t)numSlotPerSubFrame)) + SFNatSecStart) & 0x3FF)
 #define GetSlotNum(tti, numSlotPerSfn) ((uint32_t)tti % ((uint32_t)numSlotPerSfn))
 
-#define ORAN_BRONZE 1
+//#define ORAN_BRONZE 1
 #ifdef ORAN_BRONZE
 extern struct xran_fh_config  xranConf;
 int xran_is_prach_slot(uint32_t subframe_id, uint32_t slot_id);
@@ -108,7 +108,7 @@ void oai_xran_fh_rx_callback(void *pCallbackTag, xran_status_t status){
            info->f  = frame;
            LOG_D(PHY,"Push %d.%d (slot %d, subframe %d,last_slot %d)\n",frame,info->sl,slot,subframe,last_slot);
 #else
-           LOG_D(PHY,"Writing %d.%d (slot %d, subframe %d,last_slot %d)\n",frame,slot2,slot,subframe,last_slot);
+           LOG_I(PHY,"Writing %d.%d (slot %d, subframe %d,last_slot %d)\n",frame,slot2,slot,subframe,last_slot);
 	   oran_sync_info.tti = tti;
            oran_sync_info.sl = slot2;
 	   oran_sync_info.f  = frame;
@@ -230,21 +230,21 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot){
   *frame      = info->f;
   delNotifiedFIFO_elt(res);
 #else
-  LOG_D(PHY,"In  xran_fh_rx_read_slot, first_rx_set %d\n",first_rx_set); 
-  while (first_rx_set ==0) {}
+  LOG_I(PHY,"In  xran_fh_rx_read_slot, first_rx_set %d\n",first_rx_set); 
+  while (1/*first_rx_set ==0*/) {}
 
   *slot = oran_sync_info.sl;
   *frame = oran_sync_info.f;
   uint32_t tti_in=oran_sync_info.tti;
 
-  LOG_D(PHY,"oran slot %d, last_slot %d\n",*slot,last_slot);
+  LOG_I(PHY,"oran slot %d, last_slot %d\n",*slot,last_slot);
   int cnt=0;
   //while (*slot == last_slot)  {
   while (tti_in == oran_sync_info.tti)  {
     //*slot = oran_sync_info.sl;
     cnt++;
   }
-  LOG_D(PHY,"cnt %d, Reading %d.%d\n",cnt,*frame,*slot);
+  LOG_I(PHY,"cnt %d, Reading %d.%d\n",cnt,*frame,*slot);
   last_slot = *slot;
 #endif
   //return(0);