Continue with unfinished merge with develop branch.

Info_on_merge.txt

@@ -71,6 +71,23 @@ openair2/LAYER2/RLC/rlc.h
 openair2/LAYER2/RLC/rlc_mac.c
 openair2/LAYER2/RLC/rlc_mpls.c
 openair2/LAYER2/RLC/rlc_rrc.c
+openair2/NETWORK_DRIVER/UE_IP/common.c
+openair2/NETWORK_DRIVER/UE_IP/device.c
+openair2/NETWORK_DRIVER/UE_IP/local.h
+openair2/PHY_INTERFACE/IF_Module.c
+openair2/PHY_INTERFACE/UE_MAC_interface.h (Should be completely deleted)
+openair2/PHY_INTERFACE/phy_stub_UE.c
+openair2/PHY_INTERFACE/phy_stub_UE.h
+openair2/RRC/LTE/L2_interface.c
+openair2/RRC/LTE/L2_interface_ue.c
+openair2/RRC/LTE/MESSAGES/asn1_msg.c (Inside do_sib23() there are some lines ASN_SEQUENCE_ADD(...) corresponding to the addition of
+                                      SIB18, 19,21 which are commented out in the develop-version whereas they were intially integrated from 
+                                      Thinh in the sidelink branches. Is this the removal that Cedric did for RF operation because 
+                                      the SIB2/3 message turned out to be very large with these new elements?. 
+                                      Additional not sure whether lines 1646-1663 should be included or not. They were in the sidelink branch
+                                      version)
+openair2/RRC/LTE/MESSAGES/asn1_msg.h
+openair2/RRC/LTE/rrc_UE.c             (Some clonflicts were comlicated)
 
 
 
@@ -81,18 +98,6 @@ openair2/LAYER2/RLC/rlc_rrc.c
 
 	deleted by them: openair1/PHY/TOOLS/file_output.c
         deleted by them: openair1/SCHED/pusch_pc.c		
-	both modified:   openair2/NETWORK_DRIVER/UE_IP/common.c
-	both modified:   openair2/NETWORK_DRIVER/UE_IP/device.c
-	both modified:   openair2/NETWORK_DRIVER/UE_IP/local.h
-	both modified:   openair2/PHY_INTERFACE/IF_Module.c
-	both added:      openair2/PHY_INTERFACE/UE_MAC_interface.h
-	both added:      openair2/PHY_INTERFACE/phy_stub_UE.c
-	both added:      openair2/PHY_INTERFACE/phy_stub_UE.h
-	both modified:   openair2/RRC/LTE/L2_interface.c
-	both modified:   openair2/RRC/LTE/L2_interface_ue.c
-	both modified:   openair2/RRC/LTE/MESSAGES/asn1_msg.c
-	both modified:   openair2/RRC/LTE/MESSAGES/asn1_msg.h
-	both modified:   openair2/RRC/LTE/rrc_UE.c
 	both modified:   openair2/RRC/LTE/rrc_defs.h
 	both modified:   openair2/RRC/LTE/rrc_eNB.c
 	both modified:   openair2/RRC/LTE/rrc_proto.h
@@ -183,7 +188,7 @@ openair2/LAYER2/RLC/rlc_rrc.c
 	both modified:   openair2/LAYER2/RLC/rlc.h
 	both modified:   openair2/LAYER2/RLC/rlc_mac.c
 	both modified:   openair2/LAYER2/RLC/rlc_mpls.c
-	both modified:   openair2/LAYER2/RLC/rlc_rrc.c		    #Conflicts solved up to here
+	both modified:   openair2/LAYER2/RLC/rlc_rrc.c		    
 	both modified:   openair2/NETWORK_DRIVER/UE_IP/common.c
 	both modified:   openair2/NETWORK_DRIVER/UE_IP/device.c
 	both modified:   openair2/NETWORK_DRIVER/UE_IP/local.h
@@ -192,10 +197,10 @@ openair2/LAYER2/RLC/rlc_rrc.c
 	both added:      openair2/PHY_INTERFACE/phy_stub_UE.c
 	both added:      openair2/PHY_INTERFACE/phy_stub_UE.h
 	both modified:   openair2/RRC/LTE/L2_interface.c
-	both modified:   openair2/RRC/LTE/L2_interface_ue.c
+	both modified:   openair2/RRC/LTE/L2_interface_ue.c		    
 	both modified:   openair2/RRC/LTE/MESSAGES/asn1_msg.c
 	both modified:   openair2/RRC/LTE/MESSAGES/asn1_msg.h
-	both modified:   openair2/RRC/LTE/rrc_UE.c
+	both modified:   openair2/RRC/LTE/rrc_UE.c		   #Conflicts solved up to here
 	both modified:   openair2/RRC/LTE/rrc_defs.h
 	both modified:   openair2/RRC/LTE/rrc_eNB.c
 	both modified:   openair2/RRC/LTE/rrc_proto.h

openair2/NETWORK_DRIVER/UE_IP/common.c

@@ -255,11 +255,7 @@ ue_ip_common_ip2wireless(
   //---------------------------------------------------------------------------
   struct pdcp_data_req_header_s     pdcph;
   ue_ip_priv_t                     *priv_p=netdev_priv(ue_ip_dev[instP]);
-<<<<<<< HEAD
-#ifdef Rel14
-=======
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
->>>>>>> main/develop
   ipversion_t         *ipv_p             = NULL;
   unsigned int         hard_header_len   = 0;
   unsigned char       *src_addr          = 0;
@@ -309,7 +305,6 @@ ue_ip_common_ip2wireless(
 
   case 4:
      src_addr = (unsigned char *)&((struct iphdr *)&skb_pP->data[hard_header_len])->saddr;
-<<<<<<< HEAD
      dst_addr = (unsigned char *)&((struct iphdr *)&skb_pP->data[hard_header_len])->daddr;
 
 #ifdef OAI_DRV_DEBUG_SEND
@@ -339,21 +334,6 @@ ue_ip_common_ip2wireless(
     //pdcph.destinationL2Id = ntohl( ((struct iphdr *)&skb_pP->data[hard_header_len])->daddr) & 0x00FFFFFF;
     printk("[UE_IP_DRV] source Id: 0x%08x\n",pdcph.sourceL2Id );
     printk("[UE_IP_DRV] destinationL2Id Id: 0x%08x\n",pdcph.destinationL2Id );
-=======
-    if (src_addr) {
-      printk("[UE_IP_DRV][%s] Source %d.%d.%d.%d\n",__FUNCTION__, src_addr[0],src_addr[1],src_addr[2],src_addr[3]);
-    }
-    dst_addr = (unsigned char *)&((struct iphdr *)&skb_pP->data[hard_header_len])->daddr;
-    if (dst_addr) {
-      printk("[UE_IP_DRV][%s] Dest %d.%d.%d.%d\n",__FUNCTION__, dst_addr[0],dst_addr[1],dst_addr[2],dst_addr[3]);
-    }
-
-    //get Ipv4 address and pass to PCDP header
-    printk("[UE_IP_DRV] source Id: 0x%08x\n",pdcph.sourceL2Id );
-    printk("[UE_IP_DRV] destinationL2Id Id: 0x%08x\n",pdcph.destinationL2Id );
-    pdcph.sourceL2Id = ntohl( ((struct iphdr *)&skb_pP->data[hard_header_len])->saddr) & 0x00FFFFFF;
-    pdcph.destinationL2Id = ntohl( ((struct iphdr *)&skb_pP->data[hard_header_len])->daddr) & 0x00FFFFFF;
->>>>>>> main/develop
     break;
 
   default:

openair2/NETWORK_DRIVER/UE_IP/device.c

@@ -99,12 +99,6 @@ void *ue_ip_interrupt(void)
 }
 #endif //NETLINK
 //---------------------------------------------------------------------------
-<<<<<<< HEAD
-
-
-
-=======
->>>>>>> main/develop
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
 void ue_ip_timer(struct timer_list *t)
 #else
@@ -268,11 +262,7 @@ int ue_ip_hard_start_xmit(struct sk_buff *skb_pP, struct net_device *dev_pP)
 
     // End debug information
     netif_stop_queue(dev_pP);
-<<<<<<< HEAD
-#if  (LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) || defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796)
-=======
 #if  LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) || (defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796)
->>>>>>> main/develop
     netif_trans_update(dev_pP);
 #else
     dev_pP->trans_start = jiffies;

openair2/NETWORK_DRIVER/UE_IP/local.h

@@ -91,11 +91,7 @@ typedef struct pdcp_data_req_header_s {
   sdu_size_t          data_size;
   signed int          inst;
   ip_traffic_type_t   traffic_type;
-<<<<<<< HEAD
-#ifdef Rel14
-=======
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
->>>>>>> main/develop
   uint32_t sourceL2Id;
   uint32_t destinationL2Id;
 #endif
@@ -106,11 +102,7 @@ typedef struct pdcp_data_ind_header_s {
   sdu_size_t          data_size;
   signed int          inst;
   ip_traffic_type_t   dummy_traffic_type;
-<<<<<<< HEAD
-#ifdef Rel14
-=======
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
->>>>>>> main/develop
   uint32_t sourceL2Id;
   uint32_t destinationL2Id;
 #endif

openair2/PHY_INTERFACE/IF_Module.c

@@ -583,11 +583,7 @@ void UL_indication(UL_IND_t *UL_info)
       sched_info->DL_req      = &mac->DL_req[CC_id];
       sched_info->HI_DCI0_req = &mac->HI_DCI0_req[CC_id][sched_info->subframe];
       if ((mac->common_channels[CC_id].tdd_Config==NULL) ||
-<<<<<<< HEAD
-          (is_UL_sf(&mac->common_channels[CC_id],(sched_info->subframe+sf_ahead)%10)>0)) 
-=======
           (is_UL_sf(&mac->common_channels[CC_id],sched_info->subframe)>0))
->>>>>>> main/develop
         sched_info->UL_req      = &mac->UL_req[CC_id];
       else
         sched_info->UL_req      = NULL;

openair2/PHY_INTERFACE/phy_stub_UE.h

@@ -21,11 +21,7 @@ UL_IND_t *UL_INFO;
 
 nfapi_tx_request_pdu_t* tx_request_pdu_list;
 // New
-<<<<<<< HEAD
-/// Panos: Pointers to config_request types. Used from nfapi callback functions.
-=======
 /// Pointers to config_request types. Used from nfapi callback functions.
->>>>>>> main/develop
 nfapi_dl_config_request_t* dl_config_req;
 nfapi_ul_config_request_t* ul_config_req;
 nfapi_hi_dci0_request_t* hi_dci0_req;
@@ -39,11 +35,7 @@ eth_params_t         stub_eth_params;
 
 
 
-<<<<<<< HEAD
-// Panos: This function should return all the sched_response config messages which concern a specific UE. Inside this
-=======
 // This function should return all the sched_response config messages which concern a specific UE. Inside this
->>>>>>> main/develop
 // 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);
 

openair2/RRC/LTE/L2_interface.c

@@ -259,36 +259,7 @@ mac_rrc_data_ind(
     if((srb_idP & RAB_OFFSET) == CCCH) {
     Srb_info = &RC.rrc[module_idP]->carrier[CC_id].Srb0;
     LOG_D(RRC,"[eNB %d] Received SDU for CCCH on SRB %d\n",module_idP,Srb_info->Srb_id);
-<<<<<<< HEAD:openair2/RRC/LITE/L2_interface.c
-
-#if 0 //defined(ENABLE_ITTI)
-    {
-      MessageDef *message_p;
-      int msg_sdu_size = sizeof(RRC_MAC_CCCH_DATA_IND (message_p).sdu);
-
-      if (sdu_lenP > msg_sdu_size) {
-        LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_lenP, msg_sdu_size);
-        sdu_size = msg_sdu_size;
-      } else {
-        sdu_size = sdu_lenP;
-      }
-
-      message_p = itti_alloc_new_message (TASK_MAC_ENB, RRC_MAC_CCCH_DATA_IND);
-      RRC_MAC_CCCH_DATA_IND (message_p).frame     = frameP;
-      RRC_MAC_CCCH_DATA_IND (message_p).sub_frame = sub_frameP;
-      RRC_MAC_CCCH_DATA_IND (message_p).rnti      = rntiP;
-      RRC_MAC_CCCH_DATA_IND (message_p).sdu_size  = sdu_size;
-      RRC_MAC_CCCH_DATA_IND (message_p).CC_id = CC_id;
-      memset (RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
-      memcpy (RRC_MAC_CCCH_DATA_IND (message_p).sdu, sduP, sdu_size);
-      LOG_D(RRC,"[eNB %d] Sending message to RRC task\n",module_idP);
-      itti_send_msg_to_task (TASK_RRC_ENB, ctxt.instance, message_p);
-    }
-#else
-
-=======
     
->>>>>>> main/develop:openair2/RRC/LTE/L2_interface.c
     //    msg("\n******INST %d Srb_info %p, Srb_id=%d****\n\n",Mod_id,Srb_info,Srb_info->Srb_id);
     if (sdu_lenP > 0) {
       memcpy(Srb_info->Rx_buffer.Payload,sduP,sdu_lenP);

openair2/RRC/LTE/L2_interface_ue.c

@@ -59,8 +59,6 @@ mac_rrc_data_req_ue(
 )
 //--------------------------------------------------------------------------
 {
-
-<<<<<<< HEAD:openair2/RRC/LITE/L2_interface_ue.c
   protocol_ctxt_t ctxt;
 
   PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, Mod_idP, 0, 0, frameP/10, frameP%10,eNB_indexP);
@@ -68,23 +66,6 @@ mac_rrc_data_req_ue(
 #ifdef DEBUG_RRC
   int i;
   LOG_I(RRC,"[eNB %d] mac_rrc_data_req to SRB ID=%d\n",Mod_idP,Srb_idP);
-=======
-  LOG_D(RRC,"[eNB %d] mac_rrc_data_req to SRB ID=%d\n",Mod_idP,Srb_id);
-
-
-#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
-     LOG_D(RRC,"[UE %d] Frame %d Filling SL DISCOVERY SRB_ID %d\n",Mod_idP,frameP,Srb_id);
-     LOG_D(RRC,"[UE %d] Frame %d buffer_pP status %d,\n",Mod_idP,frameP, UE_rrc_inst[Mod_idP].SL_Discovery[eNB_index].Tx_buffer.payload_size);
-
-   //TTN (for D2D)
-     if (Srb_id  == SL_DISCOVERY && UE_rrc_inst[Mod_idP].SL_Discovery[eNB_index].Tx_buffer.payload_size > 0){
-        memcpy(&buffer_pP[0],&UE_rrc_inst[Mod_idP].SL_Discovery[eNB_index].Tx_buffer.Payload[0],UE_rrc_inst[Mod_idP].SL_Discovery[eNB_index].Tx_buffer.payload_size);
-        uint8_t Ret_size=UE_rrc_inst[Mod_idP].SL_Discovery[eNB_index].Tx_buffer.payload_size;
-        LOG_I(RRC,"[UE %d] Sending SL_Discovery, size %d bytes\n",Mod_idP,Ret_size);
-        UE_rrc_inst[Mod_idP].SL_Discovery[eNB_index].Tx_buffer.payload_size = 0;
-        return(Ret_size);
-     }
->>>>>>> main/develop:openair2/RRC/LTE/L2_interface_ue.c
 #endif
 
   LOG_D(RRC,"[UE %d] Frame %d Filling CCCH SRB_ID %d\n",Mod_idP,frameP,Srb_idP);
@@ -93,7 +74,7 @@ mac_rrc_data_req_ue(
   AssertFatal(Srb_idP==MIBCH || Srb_idP==CCCH || Srb_idP==SL_DISCOVERY,"SRB_id %d is not possible should be (MIBCH %d or CCCH %d or SL_DISCOVERY %d)\n",
 	      Srb_idP,MIBCH,CCCH,SL_DISCOVERY);
 
-#ifdef Rel14
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
      LOG_D(RRC,"[UE %d] Frame %d Filling SL DISCOVERY SRB_ID %d\n",Mod_idP,frameP,Srb_idP);
      LOG_D(RRC,"[UE %d] Frame %d buffer_pP status %d,\n",Mod_idP,frameP, UE_rrc_inst[Mod_idP].SL_Discovery[eNB_indexP].Tx_buffer.payload_size);
 
@@ -153,7 +134,7 @@ mac_rrc_data_req_ue(
     return(Ret_size);
   }
 
-#ifdef Rel14
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
   
   //TTN (for D2D)
   else if (Srb_idP  == SL_DISCOVERY && UE_rrc_inst[Mod_idP].SL_Discovery[eNB_indexP].Tx_buffer.payload_size > 0){
@@ -404,11 +385,7 @@ rrc_data_req_ue(
            sdu_sizeP,
            buffer_pP,
            modeP
-<<<<<<< HEAD:openair2/RRC/LITE/L2_interface_ue.c
-#ifdef Rel14
-=======
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
->>>>>>> main/develop:openair2/RRC/LTE/L2_interface_ue.c
            ,NULL, NULL
 #endif
            );

openair2/RRC/LTE/MESSAGES/asn1_msg.h

@@ -38,14 +38,8 @@
 
 #include <asn_application.h>
 #include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */
-
-<<<<<<< HEAD:openair2/RRC/LITE/MESSAGES/asn1_msg.h
-#include "RRC/LITE/defs.h"
-#include "SL-DestinationInfoList-r12.h"
-=======
 #include "RRC/LTE/rrc_defs.h"
 #include "LTE_SL-DestinationInfoList-r12.h"
->>>>>>> main/develop:openair2/RRC/LTE/MESSAGES/asn1_msg.h
 
 /*
  * The variant of the above function which dumps the BASIC-XER (XER_F_BASIC)
@@ -115,11 +109,7 @@ uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv);
 @param discTxResourceReq Pointer to  number of discovery messages for discovery announcements for which  UE requests E-UTRAN to assign dedicated resources
 @param mode Indicates different requests from upper layers
 @returns Size of encoded bit stream in bytes*/
-<<<<<<< HEAD:openair2/RRC/LITE/MESSAGES/asn1_msg.h
-uint8_t do_SidelinkUEInformation(uint8_t Mod_id, uint8_t *buffer, SL_DestinationInfoList_r12_t  *destinationInfoList, long *discTxResourceReq, SL_TRIGGER_t mode);
-=======
 uint8_t do_SidelinkUEInformation(uint8_t Mod_id, uint8_t *buffer, LTE_SL_DestinationInfoList_r12_t  *destinationInfoList, long *discTxResourceReq, SL_TRIGGER_t mode);
->>>>>>> main/develop:openair2/RRC/LTE/MESSAGES/asn1_msg.h
 
 /** \brief Generate an RRCConnectionSetupComplete UL-DCCH-Message (UE)
 @param buffer Pointer to PER-encoded ASN.1 description of UL-DCCH-Message PDU
@@ -189,28 +179,6 @@ do_RRCConnectionReconfiguration(
   const protocol_ctxt_t*        const ctxt_pP,
     uint8_t                            *buffer,
     uint8_t                             Transaction_id,
-<<<<<<< HEAD:openair2/RRC/LITE/MESSAGES/asn1_msg.h
-    SRB_ToAddModList_t                 *SRB_list,
-    DRB_ToAddModList_t                 *DRB_list,
-    DRB_ToReleaseList_t                *DRB_list2,
-    struct SPS_Config                  *sps_Config,
-    struct PhysicalConfigDedicated     *physicalConfigDedicated,
-    MeasObjectToAddModList_t           *MeasObj_list,
-    ReportConfigToAddModList_t         *ReportConfig_list,
-    QuantityConfig_t                   *quantityConfig,
-    MeasIdToAddModList_t               *MeasId_list,
-    MAC_MainConfig_t                   *mac_MainConfig,
-    MeasGapConfig_t                    *measGapConfig,
-    MobilityControlInfo_t              *mobilityInfo,
-    struct MeasConfig__speedStatePars  *speedStatePars,
-    RSRP_Range_t                       *rsrp,
-    C_RNTI_t                           *cba_rnti,
-  struct RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList* dedicatedInfoNASList,
-  SL_CommConfig_r12_t                *sl_CommConfig,
-  SL_DiscConfig_r12_t                *sl_DiscConfig
-#if defined(Rel10) || defined(Rel14)
-    , SCellToAddMod_r10_t  *SCell_config
-=======
     LTE_SRB_ToAddModList_t                 *SRB_list,
     LTE_DRB_ToAddModList_t                 *DRB_list,
     LTE_DRB_ToReleaseList_t                *DRB_list2,
@@ -231,7 +199,6 @@ do_RRCConnectionReconfiguration(
   LTE_SL_DiscConfig_r12_t                *sl_DiscConfig
 #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
     , LTE_SCellToAddMod_r10_t  *SCell_config
->>>>>>> main/develop:openair2/RRC/LTE/MESSAGES/asn1_msg.h
 #endif
                                         );
 /**