Successful build of eNB. Warnings need to be reduced.

openair1/PHY/LTE_ESTIMATION/lte_sync_time.c

@@ -27,7 +27,7 @@
 
 //#include <string.h>
 #include "PHY/defs_UE.h"
-#include "PHY/phy_vars_ue.h"
+//#include "PHY/phy_vars_ue.h"
 #include "PHY/phy_extern_ue.h"
 #include <math.h>
 

openair1/PHY/phy_extern_ue.h

@@ -50,6 +50,8 @@ extern PHY_VARS_UE * PHY_vars_UE_g[MAX_UE][MAX_NUM_CCs];
 extern short primary_synch0[144];
 extern short primary_synch1[144];
 extern short primary_synch2[144];
+extern short primary_synch0SL[144];
+extern short primary_synch1SL[144];
 extern unsigned char primary_synch0_tab[72];
 extern unsigned char primary_synch1_tab[72];
 extern unsigned char primary_synch2_tab[72];
@@ -60,6 +62,11 @@ extern int64_t *sync_corr_ue0; //!< index [0..10*samples_per_tti[
 extern int64_t *sync_corr_ue1; //!< index [0..10*samples_per_tti[
 extern int64_t *sync_corr_ue2; //!< index [0..10*samples_per_tti[
 
+extern int16_t *primary_synch0SL_time;
+extern int16_t *primary_synch1SL_time;
+extern int16_t *primary_synch0SL_time_rx;
+extern int16_t *primary_synch1SL_time_rx;
+
 extern int flagMag;
 //extern short **txdataF_rep_tmp;
 

openair1/PHY/phy_vars.h

@@ -33,8 +33,7 @@ char* namepointer_log2;
 
 
 
-// Panos: Removal based on the new seperation eNB-UE
-/*#include "PHY/LTE_REFSIG/primary_synch.h"
+#include "PHY/LTE_REFSIG/primary_synch.h"
 #include "PHY/LTE_REFSIG/primary_synch_SL.h"
 int16_t *primary_synch0_time;
 int16_t *primary_synch1_time;
@@ -45,7 +44,7 @@ int16_t *primary_synch0SL_time;
 int16_t *primary_synch1SL_time;
 int16_t *primary_synch0SL_time_rx;
 int16_t *primary_synch1SL_time_rx;
-*/
+
 
 //#include "PHY/CODING/vars.h"
 #include "PHY/LTE_TRANSPORT/transport_vars.h"

openair1/PHY/phy_vars_ue.h

@@ -32,7 +32,6 @@ char *namepointer_chMag ;
 char fmageren_name2[512];
 char *namepointer_log2;
 
-
 #include "PHY/LTE_REFSIG/primary_synch.h"
 #include "PHY/LTE_REFSIG/primary_synch_SL.h"
 int16_t *primary_synch0_time;

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -245,125 +245,65 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
   return((enc_rval.encoded+7)/8);
 }
 
-//TTN for D2D
-// 3GPP 36.331 (Section 5.10.7.4)
-uint8_t do_MIB_SL(const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index, uint32_t frame, uint8_t subframe, uint8_t in_coverage, uint8_t mode) {
-  asn_enc_rval_t enc_rval;
-  LTE_SBCCH_SL_BCH_MessageType_t *mib_sl = &UE_rrc_inst[ctxt_pP->module_id].mib_sl[eNB_index];
-  uint8_t sfn = (uint8_t)((frame>>2)&0xff);
-  UE_rrc_inst[ctxt_pP->module_id].MIB = (uint8_t *) malloc16(4);
-
-  if (in_coverage > 0 ) {
-    //in coverage
-    mib_sl->inCoverage_r12 = TRUE;
-    mib_sl->sl_Bandwidth_r12 = *UE_rrc_inst[ctxt_pP->module_id].sib2[eNB_index]->freqInfo.ul_Bandwidth;
-
-    if (UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->tdd_Config) {
-      mib_sl->tdd_ConfigSL_r12.subframeAssignmentSL_r12 = UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->tdd_Config->subframeAssignment;
-    } else {
-      mib_sl->tdd_ConfigSL_r12.subframeAssignmentSL_r12 = LTE_TDD_ConfigSL_r12__subframeAssignmentSL_r12_none;
-    }
-
-    //if triggered by sl communication
-    if (UE_rrc_inst[ctxt_pP->module_id].sib18[eNB_index]->commConfig_r12->commSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12) {
-      mib_sl->reserved_r12 = *UE_rrc_inst[ctxt_pP->module_id].sib18[eNB_index]->commConfig_r12->commSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12;
-    }
-
-    //if triggered by sl discovery
-    if (UE_rrc_inst[ctxt_pP->module_id].sib19[eNB_index]->discConfig_r12->discSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12) {
-      mib_sl->reserved_r12 = *UE_rrc_inst[ctxt_pP->module_id].sib19[eNB_index]->discConfig_r12->discSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12;
-    }
-
-    //Todo - if triggered by v2x
-  } else {
-    //Todo - out of coverage for V2X
-    // Todo - UE has a selected SyncRef UE
-    mib_sl->inCoverage_r12 = FALSE;
-    //set sl-Bandwidth, subframeAssignmentSL and reserved from the pre-configured parameters
-  }
-
-  //set FrameNumber, subFrameNumber
-  mib_sl->directFrameNumber_r12.buf =  &sfn;
-  mib_sl->directFrameNumber_r12.size = 1;
-  mib_sl->directFrameNumber_r12.bits_unused=0;
-  mib_sl->directSubframeNumber_r12 = subframe;
-  LOG_I(RRC,"[MIB-SL] sfn %x, subframe %x\n", (uint32_t)sfn, (uint8_t)subframe);
-  enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_SBCCH_SL_BCH_Message,
-                                   NULL,
-                                   (void *)mib_sl,
-                                   UE_rrc_inst[ctxt_pP->module_id].MIB,
-                                   24);
-  AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
-               enc_rval.failed_type->name, enc_rval.encoded);
-
-  if (enc_rval.encoded==-1) {
-    return(-1);
-  }
-
-  return((enc_rval.encoded+7)/8);
-}
-
 //TTN for D2D
 // 3GPP 36.331 (Section 5.10.7.4)
 uint8_t do_MIB_SL(const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_index, int absSF, uint8_t in_coverage)
 {
-
    asn_enc_rval_t enc_rval;
-
-
    uint16_t frame = absSF/10;
    uint8_t subframe = absSF%10;
    uint32_t reserved = 0;
    UE_RRC_INST *UE = &UE_rrc_inst[ctxt_pP->module_id];
-   SBCCH_SL_BCH_Message_t *sl_mib = &UE->SL_mib_tx;
+   LTE_SBCCH_SL_BCH_MessageType_t *sl_mib = &UE->SL_mib_tx;
  
    AssertFatal(eNB_index==0,"eNB_index needs to be 0\n");
 
 
    if (in_coverage > 0 ){
       //in coverage
-      sl_mib->message.inCoverage_r12 = TRUE;
-      sl_mib->message.sl_Bandwidth_r12 = UE->sib2[eNB_index]->freqInfo.ul_Bandwidth;
+      sl_mib->inCoverage_r12 = TRUE;
+      sl_mib->sl_Bandwidth_r12 = UE->sib2[eNB_index]->freqInfo.ul_Bandwidth;
       if (UE->sib1[eNB_index]->tdd_Config) {
-         sl_mib->message.tdd_ConfigSL_r12.subframeAssignmentSL_r12 = UE->sib1[eNB_index]->tdd_Config->subframeAssignment;
+         sl_mib->tdd_ConfigSL_r12.subframeAssignmentSL_r12 = UE->sib1[eNB_index]->tdd_Config->subframeAssignment;
       } else {
-         sl_mib->message.tdd_ConfigSL_r12.subframeAssignmentSL_r12 = TDD_ConfigSL_r12__subframeAssignmentSL_r12_none;
+         sl_mib->tdd_ConfigSL_r12.subframeAssignmentSL_r12 = LTE_TDD_ConfigSL_r12__subframeAssignmentSL_r12_none;
       }
       //if triggered by sl communication
       if (UE->sib18[eNB_index]->commConfig_r12->commSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12){
-         sl_mib->message.reserved_r12 = *UE->sib18[eNB_index]->commConfig_r12->commSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12;
+         sl_mib->reserved_r12 = *UE->sib18[eNB_index]->commConfig_r12->commSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12;
       }
       //if triggered by sl discovery
       if (UE->sib19[eNB_index]->discConfig_r12->discSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12){
-              sl_mib->message.reserved_r12 = *UE->sib19[eNB_index]->discConfig_r12->discSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12;
+              sl_mib->reserved_r12 = *UE->sib19[eNB_index]->discConfig_r12->discSyncConfig_r12->list.array[0]->txParameters_r12->syncInfoReserved_r12;
        }
       //Todo - if triggered by v2x
    } else {
      //Todo - out of coverage for V2X
      // Todo - UE has a selected SyncRef UE
-     sl_mib->message.inCoverage_r12 = FALSE;
-     sl_mib->message.sl_Bandwidth_r12                  = UE->SL_Preconfiguration[eNB_index]->preconfigGeneral_r12.sl_bandwidth_r12;
-     sl_mib->message.tdd_ConfigSL_r12.subframeAssignmentSL_r12 = UE->SL_Preconfiguration[eNB_index]->preconfigGeneral_r12.tdd_ConfigSL_r12.subframeAssignmentSL_r12;
+     sl_mib->inCoverage_r12 = FALSE;
+     sl_mib->sl_Bandwidth_r12                  = UE->SL_Preconfiguration[eNB_index]->preconfigGeneral_r12.sl_bandwidth_r12;
+     sl_mib->tdd_ConfigSL_r12.subframeAssignmentSL_r12 = UE->SL_Preconfiguration[eNB_index]->preconfigGeneral_r12.tdd_ConfigSL_r12.subframeAssignmentSL_r12;
      //set sl-Bandwidth, subframeAssignmentSL and reserved from the pre-configured parameters
-     sl_mib->message.reserved_r12.buf                          = &reserved;
-     sl_mib->message.reserved_r12.size                         = 3;
-     sl_mib->message.reserved_r12.bits_unused                  = 5;
+     sl_mib->reserved_r12.buf                          = &reserved;
+     sl_mib->reserved_r12.size                         = 3;
+     sl_mib->reserved_r12.bits_unused                  = 5;
    }
 
    //set FrameNumber, subFrameNumber
    uint8_t buf[2];
    buf[1] = frame&3;
    buf[0] = (frame>>2)&255; 
-   sl_mib->message.directFrameNumber_r12.buf =  &buf[0];
-   sl_mib->message.directFrameNumber_r12.size = 2;
-   sl_mib->message.directFrameNumber_r12.bits_unused=6;
-   sl_mib->message.directSubframeNumber_r12 = subframe;
+   sl_mib->directFrameNumber_r12.buf =  &buf[0];
+   sl_mib->directFrameNumber_r12.size = 2;
+   sl_mib->directFrameNumber_r12.bits_unused=6;
+   sl_mib->directSubframeNumber_r12 = subframe;
    
 
    if ((frame&255) == 0) LOG_D(RRC,"[MIB-SL] sfn %x, subframe %x\n", (uint32_t)frame, (uint8_t)subframe);
 
 
-  enc_rval = uper_encode_to_buffer(&asn_DEF_SBCCH_SL_BCH_Message,
+  enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_SBCCH_SL_BCH_Message,
+		  	  	  	  	  	  	   NULL,
                                    (void*)sl_mib,
                                    UE->SL_MIB,
                                    40);
@@ -374,6 +314,7 @@ uint8_t do_MIB_SL(const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_index,
   return((enc_rval.encoded+7)/8);
 }
 
+
 uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
                 int Mod_id,int CC_id
 #if defined(ENABLE_ITTI)

targets/RT/USER/lte-softmodem.c

@@ -123,8 +123,6 @@ uint16_t sf_ahead=4;
 
 char emul_iface[100];
 
-uint16_t sf_ahead=4;
-
 pthread_cond_t sync_cond;
 pthread_mutex_t sync_mutex;
 int sync_var=-1; //!< protected by mutex \ref sync_mutex.