Cleaned up behemoth

nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h

@@ -2723,7 +2723,7 @@ typedef struct {
 } nfapi_preamble_pdu_rel13_t;
 #define NFAPI_PREAMBLE_REL13_TAG 0x2051
 
-typedef struct { 
+typedef struct {
 	uint16_t					instance_length;
 	nfapi_preamble_pdu_rel8_t	preamble_rel8;
 	nfapi_preamble_pdu_rel9_t	preamble_rel9;
@@ -2734,7 +2734,7 @@ typedef struct {
 typedef struct {
 	nfapi_tl_t tl;
 	uint16_t number_of_preambles;
-	nfapi_preamble_pdu_t*			preamble_list;
+	nfapi_preamble_pdu_t* preamble_list;
 } nfapi_rach_indication_body_t;
 #define NFAPI_RACH_INDICATION_BODY_TAG 0x2031
 
@@ -2749,13 +2749,13 @@ typedef struct {
 } nfapi_srs_indication_fdd_rel8_t;
 #define NFAPI_SRS_INDICATION_FDD_REL8_TAG 0x2035
 
-typedef struct { 
+typedef struct {
 	nfapi_tl_t tl;
 	uint16_t timing_advance_r9;
 } nfapi_srs_indication_fdd_rel9_t;
 #define NFAPI_SRS_INDICATION_FDD_REL9_TAG 0x2036
 
-typedef struct { 
+typedef struct {
 	nfapi_tl_t tl;
 	uint8_t uppts_symbol;
 } nfapi_srs_indication_ttd_rel10_t;

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -50,8 +50,7 @@ queue_t tx_req_pdu_queue;
 queue_t ul_config_req_queue;
 queue_t hi_dci0_req_queue;
 
-int subframe_sf = 0;
-int frame_sfn = 0;
+int current_sfn_sf;
 
 static int ue_sock_descriptor = -1;
 
@@ -244,7 +243,7 @@ void fill_rach_indication_UE_MAC(int Mod_id,
   // Andrew - send proxy specific socket instead of oai_nfapi_rach_ind Send the whole UL_INFO struct
   // as soon as numberof preambles
   if (NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) {
-    send_standalone_rach(&UL_INFO->rach_ind);
+    send_standalone_rach(&UL_INFO->rach_ind); // dont
   } else {
     oai_nfapi_rach_ind(&UL_INFO->rach_ind);
   }
@@ -1115,7 +1114,7 @@ void ue_init_standalone_socket(const char *addr, int port)
 
 void *ue_standalone_pnf_task(void *context)
 {
-  uint16_t sfn_sf = 0;
+
   char buffer[1024];
 
   int sd = ue_sock_descriptor;
@@ -1131,9 +1130,9 @@ void *ue_standalone_pnf_task(void *context)
 
     if (len == sizeof(uint16_t))
     {
+      uint16_t sfn_sf = 0;
       memcpy((void *)&sfn_sf, buffer, sizeof(sfn_sf));
-      subframe_sf = NFAPI_SFNSF2SF(sfn_sf);
-      frame_sfn = NFAPI_SFNSF2SFN(sfn_sf);
+      current_sfn_sf = sfn_sf;
     }
     else
     {

openair2/PHY_INTERFACE/phy_stub_UE.h

@@ -146,7 +146,6 @@ extern queue_t hi_dci0_req_queue;
 extern nfapi_ul_config_request_t* ul_config_req;
 extern nfapi_hi_dci0_request_t* hi_dci0_req;
 
-extern int subframe_sf;
-extern int frame_sfn;
+extern int current_sfn_sf;
 
 #endif /* PHY_STUB_UE_H_ */

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) {