Fix Msg3 and Msg4 procedure.

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -339,6 +339,7 @@ typedef struct {
 #define UL_SCH_LCID_SRB2                           0x02
 #define UL_SCH_LCID_SRB3                           0x03
 #define UL_SCH_LCID_DTCH                           0x04
+#define UL_SCH_LCID_CCCH_48                        0x34
 #define UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY      0x35
 #define UL_SCH_LCID_MULTI_ENTRY_PHR_4_OCT          0x36
 #define UL_SCH_LCID_CONFIGURED_GRANT_CONFIRMATION  0x37

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -1030,7 +1030,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
            * such that TBS is full */
           const rlc_buffer_occupancy_t ndata = min(sched_ctrl->rlc_status[lcid].bytes_in_buffer, size);
           len = mac_rlc_data_req(module_id,
-                                 0x1234,
+                                 rnti,
                                  module_id,
                                  frame,
                                  ENB_FLAG_YES,
@@ -1045,7 +1045,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
                 "%4d.%2d RNTI %04x: %d bytes from DTCH %d (ndata %d, remaining size %d)\n",
                 frame,
                 slot,
-                0x1234,
+                rnti,
                 len,
                 lcid,
                 ndata,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -269,6 +269,19 @@ void nr_process_mac_pdu(
                               pdu_len-mac_subheader_len,
                               0);
               break;
+        case UL_SCH_LCID_CCCH_48:
+          mac_subheader_len = 1;
+          nr_mac_rrc_data_ind(module_idP,
+                              CC_id,
+                              frameP,
+                              0,
+                              0,
+                              rnti,
+                              CCCH,
+                              pdu_ptr+mac_subheader_len,
+                              pdu_len-mac_subheader_len,
+                              0);
+              break;
         case UL_SCH_LCID_DTCH:
                 //  check if LCID is valid at current time.
                 if(((NR_MAC_SUBHEADER_SHORT *)pdu_ptr)->F){

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -912,7 +912,7 @@ static void add_srb(int is_gnb, int rnti, struct NR_SRB_ToAddMod *s)
   nr_pdcp_ue_t *ue;
 
   int srb_id = s->srb_Identity;
-  int t_reordering = decode_t_reordering(*s->pdcp_Config->t_Reordering);
+  int t_reordering = 0;// TODO decode_t_reordering(*s->pdcp_Config->t_Reordering);
   int sn_size = 12;
 
   if (srb_id > 3) {