fixing compilation errors and one file left behind

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -163,7 +163,8 @@ unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload,
                                     uint16_t truncated_bsr,
                                     uint16_t short_bsr,
                                     uint16_t long_bsr,
-                                    unsigned short post_padding);
+                                    unsigned short post_padding,
+                                    uint16_t buflen);
 
 int8_t nr_ue_process_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_indication_t *dci_ind, void *pduP, uint32_t pdu_len);
 

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -470,7 +470,8 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
                                        0,                                 // truncated bsr
                                        0,                                 // short bsr
                                        0,                                 // long_bsr
-                                       post_padding);                     // post_padding
+                                       post_padding,
+                                       0);
 
         // Padding: fill remainder with 0
         if (post_padding > 0){

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -33,6 +33,7 @@
 #include "executables/softmodem-common.h"
 //#define ENABLE_MAC_PAYLOAD_DEBUG 1
 
+
 void nr_process_mac_pdu(
     module_id_t module_idP,
     uint8_t CC_id,
@@ -88,7 +89,13 @@ void nr_process_mac_pdu(
             /*#ifdef DEBUG_HEADER_PARSING
               LOG_D(MAC, "[UE] LCID %d, PDU length %d\n", ((NR_MAC_SUBHEADER_FIXED *)pdu_ptr)->LCID, pdu_len);
             #endif*/
-
+        case UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY:
+              // 38.321 Ch6.1.3.20
+              mac_ce_len = 2;
+              break;
+        case UL_SCH_LCID_CONFIGURED_GRANT_CONFIRMATION:
+                // 38.321 Ch6.1.3.7
+                break;
         case UL_SCH_LCID_S_BSR:
         	//38.321 section 6.1.3.1
         	//fixed length
@@ -171,6 +178,24 @@ void nr_process_mac_pdu(
         	//  end of MAC PDU, can ignore the rest.
         	break;
 
+        // MAC SDUs
+        case UL_SCH_LCID_SRB1:
+              // todo
+              break;
+        case UL_SCH_LCID_SRB2:
+              // todo
+              break;
+        case UL_SCH_LCID_SRB3:
+              // todo
+              break;
+        case UL_SCH_LCID_CCCH_MSG3:
+              // todo
+              break;
+        case UL_SCH_LCID_CCCH:
+              // todo
+              mac_subheader_len = 2;
+              break;
+
         case UL_SCH_LCID_DTCH:
                 //  check if LCID is valid at current time.
                 if(((NR_MAC_SUBHEADER_SHORT *)pdu_ptr)->F){
@@ -230,7 +255,6 @@ void nr_process_mac_pdu(
     }
 }
 
-
 /*
 * When data are received on PHY and transmitted to MAC
 */