Bugfix - missing call to mac_rlc_data_ind in the noS1 mode:

- now the UE is passing again data to the upper layers in noS1 mode
- minor cleanups

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -94,9 +94,9 @@ typedef struct {
 
 //  38.321 ch6.2.1, 38.331
 #define DL_SCH_LCID_CCCH                           0x00
-#define DL_SCH_LCID_SRB1                           0x01
-#define DL_SCH_LCID_SRB2                           0x02
-#define DL_SCH_LCID_SRB3                           0x03
+#define DL_SCH_LCID_DCCH                           0x01
+#define DL_SCH_LCID_DCCH1                          0x02
+#define DL_SCH_LCID_DTCH                           0x03
 #define DL_SCH_LCID_RECOMMENDED_BITRATE            0x2F
 #define DL_SCH_LCID_SP_ZP_CSI_RS_RES_SET_ACT       0x30
 #define DL_SCH_LCID_PUCCH_SPATIAL_RELATION_ACT     0x31

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -142,6 +142,7 @@ void nr_ue_send_sdu(module_id_t module_idP,uint8_t CC_id, frame_t frameP, uint8_
 void nr_ue_process_mac_pdu(
     module_id_t module_idP,
     uint8_t CC_id,
+    frame_t frameP,
     uint8_t *pduP, 
     uint16_t mac_pdu_len,
     uint8_t eNB_index,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -21,9 +21,9 @@
 
 /*! \file gNB_scheduler_phytest.c
  * \brief gNB scheduling procedures in phy_test mode
- * \author  Guy De Souza
+ * \author  Guy De Souza, G. Casati
  * \date 07/2018
- * \email: desouza@eurecom.fr
+ * \email: desouza@eurecom.fr, guido.casati@iis.fraunhofer.de
  * \version 1.0
  * @ingroup _mac
  */
@@ -311,16 +311,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
     //through the LTE stack
     if (IS_SOFTMODEM_NOS1){
 
-      /* TODO
-      // RLC data on DCCH
-      if (TBS_bytes - ta_len - header_length_total - sdu_length_total - 3 > 0) {
-      }*/
-
-      /* TODO
-      // RLC data on DCCH1
-      if (TBS_bytes - ta_len - header_length_total - sdu_length_total - 3 > 0) {
-      }*/
-
       for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
         LOG_D(MAC, "[gNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (TBS %d bytes, len %d)\n",
           module_idP, frameP, lcid, TBS_bytes, TBS_bytes - ta_len - header_length_total - sdu_length_total - 3);