Checkpoint.

nfapi/oai_integration/nfapi.c

@@ -23,7 +23,16 @@
 #include <pthread.h>
 #include "nfapi/oai_integration/vendor_ext.h"
 #include "common/utils/LOG/log.h"
-static char nfapi_str_mode[][24] = {"MONOLITHIC","PNF","VNF","UE_STUB_PNF","UE_STUB_OFFNET","STANDALONE_PNF","<UNKNOWN NFAPI MODE>"};
+
+static char nfapi_str_mode[][24] = {
+    "MONOLITHIC",
+    "PNF",
+    "VNF",
+    "UE_STUB_PNF",
+    "UE_STUB_OFFNET",
+    "STANDALONE_PNF",
+    "<UNKNOWN NFAPI MODE>"
+};
 
 typedef struct {
   nfapi_mode_t nfapi_mode;

openair2/LAYER2/MAC/ra_procedures.c

@@ -199,9 +199,8 @@ get_prach_resources(module_id_t module_idP,
     UE_mac_inst[module_idP].
     RA_prach_resources.ra_PREAMBLE_RECEIVED_TARGET_POWER =
       get_Po_NOMINAL_PUSCH(module_idP, CC_id);
-  } else {
+  } else {      // Msg3 is being retransmitted
     LOG_E(MAC, "Didnt set UE Mode Correctly\n");
-               // Msg3 is being retransmitted
     if (UE_mac_inst[module_idP].RA_usedGroupA == 1) {
       if (rach_ConfigCommon->preambleInfo.preamblesGroupAConfig) {
         UE_mac_inst[module_idP].RA_prach_resources.

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -902,7 +902,7 @@ void hi_dci0_req_UE_MAC(int sfn,
 
 // The following set of memcpy functions should be getting called as callback
 // functions from pnf_p7_subframe_ind.
-int memcpy_dl_config_req(L1_rxtx_proc_t *proc,
+int memcpy_dl_config_req(L1_rxtx_proc_t *proc, 
 			nfapi_pnf_p7_config_t *pnf_p7,
                          nfapi_dl_config_request_t *req) {
 
@@ -937,7 +937,6 @@ int memcpy_dl_config_req(L1_rxtx_proc_t *proc,
 
 int memcpy_ul_config_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfapi_ul_config_request_t* req)
 {
-  // make same changes as in dl_config_req
   nfapi_ul_config_request_t *p = malloc(sizeof(nfapi_ul_config_request_t));
 
   p->sfn_sf = req->sfn_sf;
@@ -992,10 +991,9 @@ int memcpy_tx_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_tx_request_t *req) {
   return 0;
 }
 
-int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc,
-			nfapi_pnf_p7_config_t* pnf_p7,
+int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc, 
+			nfapi_pnf_p7_config_t* pnf_p7, 
 			nfapi_hi_dci0_request_t* req) {
-  // make same changes as in dl_config_req
   nfapi_hi_dci0_request_t *p = (nfapi_hi_dci0_request_t *)malloc(sizeof(nfapi_hi_dci0_request_t));
 	//if(req!=0){
 

openair2/PHY_INTERFACE/phy_stub_UE.h

@@ -35,6 +35,9 @@ int	tx_req_num_elems;
 //module_id_t next_Mod_id;
 eth_params_t         stub_eth_params;
 
+
+
+
 // This function should return all the sched_response config messages which concern a specific UE. Inside this
 // function we should somehow make the translation of config message's rnti to Mod_ID.
 Sched_Rsp_t get_nfapi_sched_response(uint8_t Mod_id);
@@ -129,10 +132,10 @@ int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfa
 
 void UE_config_stub_pnf(void);
 
-// This function is used to open an SCTP socket with a standalone PNF module
+// open an SCTP socket with a standalone PNF module
 void ue_init_standalone_socket(const char *addr, int port);
 
-// This function is used to read from standalone pnf socket call corresponding memcpy functions
+// read from standalone pnf socket call corresponding memcpy functions
 void *ue_standalone_pnf_task(void *context);
 
 extern queue_t dl_config_req_queue;

targets/RT/USER/lte-uesoftmodem.c

@@ -653,10 +653,10 @@ int main( int argc, char **argv ) {
   }
 
   cpuf=get_cpu_freq_GHz();
-
-
+  
+  
 #if 0 // #ifndef DEADLINE_SCHEDULER
-
+  
   printf("NO deadline scheduler\n");
   /* Currently we set affinity for UHD to CPU 0 for eNB/UE and only if number of CPUS >2 */
   cpu_set_t cpuset;
@@ -668,7 +668,7 @@ int main( int argc, char **argv ) {
   if (get_nprocs() > 2) {
     for (j = 2; j < get_nprocs(); j++)
       CPU_SET(j, &cpuset);
-
+    
     s = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
 
     if (s != 0) {
@@ -709,7 +709,6 @@ int main( int argc, char **argv ) {
     UE_config_stub_pnf();
   }
 
-  // end of test
   printf("ITTI tasks created\n");
   mlockall(MCL_CURRENT | MCL_FUTURE);
   rt_sleep_ns(10*100000000ULL);
@@ -729,8 +728,7 @@ int main( int argc, char **argv ) {
     config_sync_var=0;
     init_UE_stub_single_thread(NB_UE_INST,eMBMS_active,uecap_xer_in,emul_iface);
     init_UE_standalone_thread();
-  }
-  else {
+  } else {
     init_UE(NB_UE_INST,eMBMS_active,uecap_xer_in,0,get_softmodem_params()->phy_test,UE_scan,UE_scan_carrier,mode,(int)rx_gain[0][0],tx_max_power[0],
             frame_parms[0]);
   }