nr-ip-UL-nos1: Integrate NR MAC PDU structures for the Uplink. Currently...

nr-ip-UL-nos1: Integrate NR MAC PDU structures for the Uplink. Currently supporting only data SDUs, Control Elements to be added.

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -180,7 +180,7 @@ uint8_t nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
     			memcpy(harq_process_ul_ue->a, ulsch_input_buffer, harq_process_ul_ue->TBS/8);
 
     			#ifdef DEBUG_MAC_PDU
-    				LOG_I(PHY, "Printing MAC PDU to be encoded: \n");
+    				LOG_I(PHY, "Printing MAC PDU to be encoded, TBS is: %d \n", harq_process_ul_ue->TBS/8);
     				for (i = 0; i < harq_process_ul_ue->TBS / 8; i++) {
     					printf("0x%02x",harq_process_ul_ue->a[i]);
     				}

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -316,6 +316,7 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id,
 
  gNB->UL_INFO.rx_ind.sfn_sf                    = frame<<4| slot_rx;
  gNB->UL_INFO.rx_ind.rx_indication_body.tl.tag = NFAPI_RX_INDICATION_BODY_TAG;
+ gNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list->rx_indication_rel8.length = gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->TBS>>3;
 
  pdu                                    = &gNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list[gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus];
 

openair2/LAYER2/MAC/mac_proto.h

@@ -1295,14 +1295,3 @@ uint8_t ul_subframe2_k_phich(COMMON_channels_t *cc, sub_frame_t ul_subframe);
 /* Main loop of MAC itti message handling */
 void *mac_enb_task(void *arg);
 
-unsigned char
-nr_generate_ulsch_header(uint8_t *mac_header,
-                      uint8_t num_sdus,
-                      uint8_t short_padding,
-                      uint16_t *sdu_lengths,
-                      uint8_t *sdu_lcids,
-                      POWER_HEADROOM_CMD *power_headroom,
-                      uint16_t *crnti,
-                      BSR_SHORT *truncated_bsr,
-                      BSR_SHORT *short_bsr,
-                      BSR_LONG *long_bsr, unsigned short post_padding);

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/* \file       nr_mac.h
+ * \brief      common MAC data structures, constant, and function prototype
+ * \author     R. Knopp, K.H. HSU, G. Casati
+ * \date       2019
+ * \version    0.1
+ * \company    Eurecom / NTUST / Fraunhofer IIS 
+ * \email:     knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr, guido.casati@iis.fraunhofer.de 
+ * \note
+ * \warning
+ */
+
+#ifndef __LAYER2_NR_MAC_H__
+#define __LAYER2_NR_MAC_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define NR_BCCH_DL_SCH 3 // SI
+
+#define NR_BCCH_BCH 5    // MIB
+
+//  For both DL/UL-SCH
+//  Except:
+//   - UL/DL-SCH: fixed-size MAC CE(known by LCID)
+//   - UL/DL-SCH: padding
+//   - UL-SCH:    MSG3 48-bits
+//  |0|1|2|3|4|5|6|7|  bit-wise
+//  |R|F|   LCID    |
+//  |       L       |
+//  |0|1|2|3|4|5|6|7|  bit-wise
+//  |R|F|   LCID    |
+//  |       L       |
+//  |       L       |
+
+//  For both DL/UL-SCH
+//  For:
+//   - UL/DL-SCH: fixed-size MAC CE(known by LCID)
+//   - UL/DL-SCH: padding, for single/multiple 1-oct padding CE(s)
+//   - UL-SCH:    MSG3 48-bits
+//  |0|1|2|3|4|5|6|7|  bit-wise
+//  |R|R|   LCID    |
+//  LCID: The Logical Channel ID field identifies the logical channel instance of the corresponding MAC SDU or the type of the corresponding MAC CE or padding as described in Tables 6.2.1-1 and 6.2.1-2 for the DL-SCH and UL-SCH respectively. There is one LCID field per MAC subheader. The LCID field size is 6 bits;
+//  L: The Length field indicates the length of the corresponding MAC SDU or variable-sized MAC CE in bytes. There is one L field per MAC subheader except for subheaders corresponding to fixed-sized MAC CEs and padding. The size of the L field is indicated by the F field;
+//  F: lenght of L is 0:8 or 1:16 bits wide
+//  R: Reserved bit, set to zero.
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L:8;        // octet 2 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_SHORT;
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L1:8;       // octet 2 [7:0]
+    uint8_t L2:8;       // octet 3 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_LONG;
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t R:2;        // octet 1 [7:6]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
+
+// 38.321 ch. 6.1.3.4
+typedef struct {
+    uint8_t TA_COMMAND:6;   // octet 1 [5:0]
+    uint8_t TAGID:2;        // octet 1 [7:6]
+} __attribute__ ((__packed__)) NR_MAC_CE_TA;
+
+//  38.321 ch6.2.1, 38.331
+#define DL_SCH_LCID_CCCH                           0x00
+#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
+#define DL_SCH_LCID_SP_SRS_ACTIVATION              0x32
+#define DL_SCH_LCID_SP_CSI_REP_PUCCH_ACT           0x33
+#define DL_SCH_LCID_TCI_STATE_IND_UE_SPEC_PDCCH    0x34
+#define DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH    0x35
+#define DL_SCH_LCID_APERIODIC_CSI_TRI_STATE_SUBSEL 0x36
+#define DL_SCH_LCID_SP_CSI_RS_CSI_IM_RES_SET_ACT   0X37 
+#define DL_SCH_LCID_DUPLICATION_ACT                0X38
+#define DL_SCH_LCID_SCell_ACT_4_OCT                0X39
+#define DL_SCH_LCID_SCell_ACT_1_OCT                0X3A
+#define DL_SCH_LCID_L_DRX                          0x3B
+#define DL_SCH_LCID_DRX                            0x3C
+#define DL_SCH_LCID_TA_COMMAND                     0x3D
+#define DL_SCH_LCID_CON_RES_ID                     0x3E
+#define DL_SCH_LCID_PADDING                        0x3F
+
+#define UL_SCH_LCID_CCCH                           0x00
+#define UL_SCH_LCID_SRB1                           0x01
+#define UL_SCH_LCID_SRB2                           0x02
+#define UL_SCH_LCID_DTCH						   0x03
+#define UL_SCH_LCID_SRB3                           0x04
+#define UL_SCH_LCID_CCCH_MSG3                      0x21
+#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
+#define UL_SCH_LCID_MULTI_ENTRY_PHR_1_OCT          0x38
+#define UL_SCH_LCID_SINGLE_ENTRY_PHR               0x39
+#define UL_SCH_LCID_C_RNTI                         0x3A
+#define UL_SCH_LCID_S_TRUNCATED_BSR                0x3B
+#define UL_SCH_LCID_L_TRUNCATED_BSR                0x3C
+#define UL_SCH_LCID_S_BSR                          0x3D
+#define UL_SCH_LCID_L_BSR                          0x3E
+#define UL_SCH_LCID_PADDING                        0x3F
+
+
+#endif /*__LAYER2_MAC_H__ */
+

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -53,6 +53,13 @@
 #include "PHY/defs_nr_common.h"
 
 #define NB_NR_UE_MAC_INST 1
+/*!\brief Maximum number of logical channl group IDs */
+#define MAX_NUM_LCGID 4
+/*!\brief Maximum number of logical chanels */
+#define MAX_NUM_LCID 11
+
+/*!\brief value for indicating BSR Timer is not running */
+#define NR_MAC_UE_BSR_TIMER_NOT_RUNNING   (0xFFFF)
 
 typedef enum {
     SFN_C_MOD_2_EQ_0, 
@@ -60,6 +67,86 @@ typedef enum {
     SFN_C_IMPOSSIBLE
 } SFN_C_TYPE;
 
+#define UL_SCH_LCID_CCCH                           0x00
+#define UL_SCH_LCID_SRB1                           0x01
+#define UL_SCH_LCID_SRB2                           0x02
+#define UL_SCH_LCID_DTCH						   0x03
+#define UL_SCH_LCID_SRB3                           0x04
+#define UL_SCH_LCID_CCCH_MSG3                      0x21
+#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
+#define UL_SCH_LCID_MULTI_ENTRY_PHR_1_OCT          0x38
+#define UL_SCH_LCID_SINGLE_ENTRY_PHR               0x39
+#define UL_SCH_LCID_C_RNTI                         0x3A
+#define UL_SCH_LCID_S_TRUNCATED_BSR                0x3B
+#define UL_SCH_LCID_L_TRUNCATED_BSR                0x3C
+#define UL_SCH_LCID_S_BSR                          0x3D
+#define UL_SCH_LCID_L_BSR                          0x3E
+#define UL_SCH_LCID_PADDING                        0x3F
+
+// LTE structure, might need to be adapted for NR
+typedef struct {
+  /// buffer status for each lcgid
+  uint8_t  BSR[MAX_NUM_LCGID]; // should be more for mesh topology
+  /// keep the number of bytes in rlc buffer for each lcgid
+  int32_t  BSR_bytes[MAX_NUM_LCGID];
+  /// after multiplexing buffer remain for each lcid
+  int32_t  LCID_buffer_remain[MAX_NUM_LCID];
+  /// sum of all lcid buffer size
+  uint16_t  All_lcid_buffer_size_lastTTI;
+  /// buffer status for each lcid
+  uint8_t  LCID_status[MAX_NUM_LCID];
+  /// SR pending as defined in 36.321
+  uint8_t  SR_pending;
+  /// SR_COUNTER as defined in 36.321
+  uint16_t SR_COUNTER;
+  /// logical channel group ide for each LCID
+  uint8_t  LCGID[MAX_NUM_LCID];
+  /// retxBSR-Timer, default value is sf2560
+  uint16_t retxBSR_Timer;
+  /// retxBSR_SF, number of subframe before triggering a regular BSR
+  uint16_t retxBSR_SF;
+  /// periodicBSR-Timer, default to infinity
+  uint16_t periodicBSR_Timer;
+  /// periodicBSR_SF, number of subframe before triggering a periodic BSR
+  uint16_t periodicBSR_SF;
+  /// default value is 0: not configured
+  uint16_t sr_ProhibitTimer;
+  /// sr ProhibitTime running
+  uint8_t sr_ProhibitTimer_Running;
+  ///  default value to n5
+  uint16_t maxHARQ_Tx;
+  /// default value is false
+  uint16_t ttiBundling;
+  /// default value is release
+  struct DRX_Config *drx_config;
+  /// default value is release
+  struct MAC_MainConfig__phr_Config *phr_config;
+  ///timer before triggering a periodic PHR
+  uint16_t periodicPHR_Timer;
+  ///timer before triggering a prohibit PHR
+  uint16_t prohibitPHR_Timer;
+  ///DL Pathloss change value
+  uint16_t PathlossChange;
+  ///number of subframe before triggering a periodic PHR
+  int16_t periodicPHR_SF;
+  ///number of subframe before triggering a prohibit PHR
+  int16_t prohibitPHR_SF;
+  ///DL Pathloss Change in db
+  uint16_t PathlossChange_db;
+
+  /// default value is false
+  uint16_t extendedBSR_Sizes_r10;
+  /// default value is false
+  uint16_t extendedPHR_r10;
+
+  //Bj bucket usage per  lcid
+  int16_t Bj[MAX_NUM_LCID];
+  // Bucket size per lcid
+  int16_t bucket_size[MAX_NUM_LCID];
+} NR_UE_SCHEDULING_INFO;
+
 
 /*!\brief Top level UE MAC structure */
 typedef struct {
@@ -82,6 +169,7 @@ typedef struct {
   
   ///     Random access parameter
   uint16_t ra_rnti;
+  uint16_t crnti;
 
    //BWP params
   NR_BWP_PARMS initial_bwp_dl;
@@ -96,6 +184,13 @@ typedef struct {
   nr_ue_if_module_t       *if_module;
   nr_scheduled_response_t scheduled_response;
   nr_phy_config_t         phy_config;
+
+  /// BSR report flag management
+  uint8_t BSR_reporting_active;
+  NR_UE_SCHEDULING_INFO   scheduling_info;
+
+  /// PHR
+  uint8_t PHR_reporting_active;
 } NR_UE_MAC_INST_t;
 
 typedef enum seach_space_mask_e {

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -140,5 +140,14 @@ uint8_t nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
            sub_frame_t subframe, uint8_t eNB_index,
            uint8_t *ulsch_buffer, uint16_t buflen, uint8_t *access_mode);
 
+unsigned char
+nr_generate_ulsch_pdu(uint8_t *mac_pdu,
+					  uint8_t *sdus_payload,
+                      uint8_t num_sdus,
+                      uint16_t *sdu_lengths,
+                      uint8_t *sdu_lcids,
+                      uint16_t *crnti,
+                      uint16_t buflen);
+
 #endif
 /** @}*/

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -145,15 +145,21 @@ void config_nr_mib(int Mod_idP,
                    int cellBarred,
                    int intraFreqReselection);
 
-void
-nr_rx_sdu(const module_id_t enb_mod_idP,
-       const int CC_idP,
-       const frame_t frameP,
-       const sub_frame_t subframeP,
-       const rnti_t rntiP,
-       uint8_t *sduP,
-       const uint16_t sdu_lenP,
-       const uint16_t timing_advance,
-       const uint8_t ul_cqi);
+void nr_rx_sdu(module_id_t module_idP,
+                    uint8_t CC_id,
+                    frame_t frameP,
+                    uint8_t ttiP,
+                    const rnti_t rntiP,
+                    uint8_t * pdu,
+                    uint16_t pdu_len,
+                    const uint16_t timing_advance,
+                    const uint8_t ul_cqi);
+
+void nr_process_mac_pdu(
+    module_id_t module_idP,
+    uint8_t CC_id,
+    frame_t frameP,
+    uint8_t *pduP,
+    uint16_t mac_pdu_len);
 
 #endif /*__LAYER2_NR_MAC_PROTO_H__*/

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -192,7 +192,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info) {
                      UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.timing_advance,
                      UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.ul_cqi);
             } else {
-              LOG_D(MAC,"Frame %d, Slot %d Calling rx_sdu (CRC ok) \n",UL_info->frame,UL_info->slot);
+              LOG_I(MAC,"Frame %d, Slot %d Calling rx_sdu (CRC ok), received length: %d \n",UL_info->frame,UL_info->slot, UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.length);
               nr_rx_sdu(UL_info->module_id,
                      UL_info->CC_id,
                      NFAPI_SFNSF2SFN(UL_info->rx_ind.sfn_sf), //UL_info->frame,