Fix merge conflict

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -523,7 +523,7 @@ typedef struct gNB_MAC_INST_s {
 
   /// UL handle
   uint32_t ul_handle;
-  UE_info_t UE_info;
+  //UE_info_t UE_info;
 
   // MAC function execution peformance profiler
   /// processing time of eNB scheduler

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1193,10 +1193,6 @@ LOG_D(NR_RRC,"RRCSetupComplete Encoded %zd bits (%zd bytes)\n",enc_rval.encoded,
 return((enc_rval.encoded+7)/8);
 }
 
-int do_DLInformationTransfer_NR (void * p) {
-	return 0;
-}
-
 //------------------------------------------------------------------------------
 uint8_t 
 do_NR_DLInformationTransfer(

openair2/RRC/NR/nr_ngap_gNB.c

@@ -47,7 +47,7 @@ void rrc_gNB_send_NGAP_NAS_FIRST_REQ(void ) {
    rrc_gNB_process_NGAP_DOWNLINK_NAS();
 }
 
-void nr_rrc_rx_tx() {
+void nr_rrc_rx_tx(void) {
   // check timers 
 
   // check if UEs are lost, to remove them from upper layers

openair2/RRC/NR/nr_rrc_defs.h

@@ -345,8 +345,6 @@ typedef struct gNB_RRC_UE_s {
   uint8_t                            nb_of_e_rabs;
   /* Total number of pdu session already setup in the list */
   uint8_t                           setup_pdu_sessions;
-  /* Number of e_rab to be setup in the list */
-  uint8_t                            nb_of_e_rabs;
   /* Number of pdu session to be setup in the list */
   uint8_t                            nb_of_pdusessions;
   /* Number of e_rab to be modified in the list */

openair2/RRC/NR_UE/rrc_UE.c

@@ -1393,9 +1393,9 @@ static void rrc_ue_generate_RRCSetupComplete(
 #ifdef ITTI_SIM
   MessageDef *message_p;
   uint8_t *message_buffer;
-  message_buffer = itti_malloc (TASK_RRC_UE_SIM, TASK_RRC_GNB_SIM, size);
+  message_buffer = itti_malloc (TASK_RRC_NRUE, TASK_RRC_GNB_SIM, size);
   memcpy (message_buffer, buffer, size);
-  message_p = itti_alloc_new_message (TASK_RRC_UE_SIM, UE_RRC_DCCH_DATA_IND);
+  message_p = itti_alloc_new_message (TASK_RRC_NRUE, UE_RRC_DCCH_DATA_IND);
   UE_RRC_DCCH_DATA_IND (message_p).rbid = 1;
   UE_RRC_DCCH_DATA_IND (message_p).sdu = message_buffer;
   UE_RRC_DCCH_DATA_IND (message_p).size  = size;
@@ -1483,7 +1483,6 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
         }
       }
     }
-  }
   
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_CCCH, VCD_FUNCTION_OUT);
   return rval;
@@ -1725,11 +1724,11 @@ nr_rrc_ue_process_securityModeCommand(
 #ifdef ITTI_SIM
     MessageDef *message_p;
     uint8_t *message_buffer;
-    message_buffer = itti_malloc (TASK_RRC_UE_SIM,TASK_RRC_GNB_SIM,
+    message_buffer = itti_malloc (TASK_RRC_NRUE,TASK_RRC_GNB_SIM,
                        (enc_rval.encoded + 7) / 8);
     memcpy (message_buffer, buffer, (enc_rval.encoded + 7) / 8);
 
-    message_p = itti_alloc_new_message (TASK_RRC_UE_SIM, UE_RRC_DCCH_DATA_IND);
+    message_p = itti_alloc_new_message (TASK_RRC_NRUE, UE_RRC_DCCH_DATA_IND);
     GNB_RRC_DCCH_DATA_IND (message_p).rbid  = DCCH;
     GNB_RRC_DCCH_DATA_IND (message_p).sdu   = message_buffer;
     GNB_RRC_DCCH_DATA_IND (message_p).size    = (enc_rval.encoded + 7) / 8;
@@ -2733,11 +2732,11 @@ nr_rrc_ue_process_ueCapabilityEnquiry(
 #ifdef ITTI_SIM
       MessageDef *message_p;
       uint8_t *message_buffer;
-      message_buffer = itti_malloc (TASK_RRC_UE_SIM,TASK_RRC_GNB_SIM,
+      message_buffer = itti_malloc (TASK_RRC_NRUE,TASK_RRC_GNB_SIM,
                (enc_rval.encoded + 7) / 8);
       memcpy (message_buffer, buffer, (enc_rval.encoded + 7) / 8);
 
-      message_p = itti_alloc_new_message (TASK_RRC_UE_SIM, UE_RRC_DCCH_DATA_IND);
+      message_p = itti_alloc_new_message (TASK_RRC_NRUE, UE_RRC_DCCH_DATA_IND);
       GNB_RRC_DCCH_DATA_IND (message_p).rbid  = DCCH;
       GNB_RRC_DCCH_DATA_IND (message_p).sdu   = message_buffer;
       GNB_RRC_DCCH_DATA_IND (message_p).size  = (enc_rval.encoded + 7) / 8;

openair3/NAS/NR_UE/nr_nas_msg_sim.h

@@ -49,32 +49,13 @@
 #define REGISTRATION_REQUEST                               0b01000001 /* 65 = 0x41 */
 #define REGISTRATION_ACCEPT                                0b01000010 /* 66 = 0x42 */
 #define REGISTRATION_COMPLETE                              0b01000011 /* 67 = 0x43 */
-#define REGISTRATION_REJECT                                0b01000100 /* 68 = 0x44 */
-#define DEREGISTRATION_REQUEST_UE_ORIGINATING              0b01000101 /* 69 = 0x45 */
-#define DEREGISTRATION_ACCEPT_UE_ORIGINATING               0b01000110 /* 70 = 0x46 */
-#define DEREGISTRATION_REQUEST_UE_TERMINATED               0b01000111 /* 71 = 0x47 */
-#define DEREGISTRATION_ACCEPT_UE_TERMINATED                0b01001000 /* 72 = 0x48 */
-
-#define FIVEGMM_SERVICE_REQUEST                            0b01001100 /* 76 = 0x4c */
-#define FIVEGMM_SERVICE_REJECT                             0b01001101 /* 77 = 0x4d */
-#define FIVEGMM_SERVICE_ACCEPT                             0b01001110 /* 78 = 0x4e */
-#define CONFIGURATION_UPDATE_COMMAND                       0b01010100 /* 84 = 0x54 */
-#define CONFIGURATION_UPDATE_COMPLETE                      0b01010101 /* 85 = 0x55 */
 #define FGS_AUTHENTICATION_REQUEST                         0b01010110 /* 86 = 0x56 */
 #define FGS_AUTHENTICATION_RESPONSE                        0b01010111 /* 87 = 0x57 */
-#define AUTHENTICATION_REJECT                              0b01011000 /* 88 = 0x58 */
-#define AUTHENTICATION_FAILURE                             0b01011001 /* 89 = 0x59 */
-#define AUTHENTICATION_RESULT                              0b01011010 /* 90 = 0x5a */
 #define FGS_IDENTITY_REQUEST                               0b01011011 /* 91 = 0x5b */
 #define FGS_IDENTITY_RESPONSE                              0b01011100 /* 92 = 0x5c */
 #define FGS_SECURITY_MODE_COMMAND                          0b01011101 /* 93 = 0x5d */
 #define FGS_SECURITY_MODE_COMPLETE                         0b01011110 /* 94 = 0x5e */
-#define FIVEGMM_SECURITY_MODE_REJECT 	                     0b01011111 /* 95 = 0x5f */
-#define FIVEGMM_STATUS                                     0b01100100 /* 100 = 0x64 */
-#define NOTIFICATION                                       0b01100101 /* 101 = 0x65 */
-#define NOTIFICATION_RESPONSE                              0b01100110 /* 102 = 0x66 */
 #define FGS_UPLINK_NAS_TRANSPORT                           0b01100111 /* 103= 0x67 */
-#define DL_NAS_TRANSPORT                                   0b01101000 /* 104 = 0x68 */
 
 // message type for 5GS session management
 #define FGS_PDU_SESSION_ESTABLISHMENT_REQ                  0b11000001 /* 193= 0xc1 */

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -1417,22 +1417,6 @@ int ngap_gNB_pdusession_release_resp(instance_t instance,
   ie->value.choice.RAN_UE_NGAP_ID = pdusession_release_resp_p->gNB_ue_ngap_id;
   ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
 
-  /* optional */
-  if (pdusession_release_resp_p->nb_of_pdusessions_released > 0) {
-    ie = (NGAP_PDUSessionResourceReleaseResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleaseResponseIEs_t));
-    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceReleasedListRelRes;
-    ie->criticality = NGAP_Criticality_ignore;
-    ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_AMF_UE_NGAP_ID;
-    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
-    ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
-    /* mandatory */
-    ie = (NGAP_PDUSessionResourceReleaseResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleaseResponseIEs_t));
-    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-    ie->criticality = NGAP_Criticality_ignore;
-    ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_RAN_UE_NGAP_ID;
-    ie->value.choice.RAN_UE_NGAP_ID = pdusession_release_resp_p->gNB_ue_ngap_id;
-    ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
-
     /* optional */
     if (pdusession_release_resp_p->nb_of_pdusessions_released > 0) {
         ie = (NGAP_PDUSessionResourceReleaseResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleaseResponseIEs_t));
@@ -1469,15 +1453,6 @@ int ngap_gNB_pdusession_release_resp(instance_t instance,
             ASN_SEQUENCE_ADD(&ie->value.choice.PDUSessionResourceReleasedListRelRes.list, item);
         }
 
-    for (i = 0; i < pdusession_release_resp_p->nb_of_pdusessions_released; i++) {
-        NGAP_PDUSessionResourceReleasedItemRelRes_t *item;
-        item = (NGAP_PDUSessionResourceReleasedItemRelRes_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleasedItemRelRes_t));
-    
-        item->pDUSessionID = pdusession_release_resp_p->pdusession_release[i].pdusession_id;
-        NGAP_DEBUG("pdusession_release_resp: pdusession ID %ld\n", item->pDUSessionID);
-        ASN_SEQUENCE_ADD(&ie->value.choice.PDUSessionResourceReleasedListRelRes.list, item);
-    }
-
     ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
   }