first version of sr bsr.

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -63,6 +63,11 @@ typedef enum frequency_range_e {
   FR2
 } frequency_range_t;
 
+#define NR_BSR_TRIGGER_NONE      (0) /* No BSR Trigger */
+#define NR_BSR_TRIGGER_REGULAR   (1) /* For Regular and ReTxBSR Expiry Triggers */
+#define NR_BSR_TRIGGER_PERIODIC  (2) /* For BSR Periodic Timer Expiry Trigger */
+#define NR_BSR_TRIGGER_PADDING   (4) /* For Padding BSR Trigger */
+
 //  For both DL/UL-SCH
 //  Except:
 //   - UL/DL-SCH: fixed-size MAC CE(known by LCID)

openair2/LAYER2/NR_MAC_UE/config_ue.c

@@ -754,6 +754,15 @@ int nr_rrc_mac_config_req_ue(
         // Setup the SSB to Rach Occasions mapping according to the config
         build_ssb_to_ro_map(mac);
       }
+      mac->scheduling_info.periodicBSR_SF =
+        MAC_UE_BSR_TIMER_NOT_RUNNING;
+      mac->scheduling_info.retxBSR_SF =
+        MAC_UE_BSR_TIMER_NOT_RUNNING;
+      mac->BSR_reporting_active = NR_BSR_TRIGGER_NONE;
+      LOG_D(MAC, "[UE %d]: periodic BSR %d (SF), retx BSR %d (SF)\n",
+			module_id,
+            mac->scheduling_info.periodicBSR_SF,
+            mac->scheduling_info.retxBSR_SF);
 
       /*      
       if(mac_cell_group_configP != NULL){

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -325,15 +325,6 @@ typedef struct {
 
 } RAR_grant_t;
 
-typedef struct {
-
-  uint8_t  phr_reporting;
-  uint16_t truncated_bsr;
-  uint16_t short_bsr;
-  uint16_t long_bsr;
-
-} NR_UE_MAC_CE_t;
-
 typedef struct {
   int n_HARQ_ACK;
   uint32_t ack_payload;
@@ -349,6 +340,7 @@ typedef struct {
   int8_t delta_pucch;
 } PUCCH_sched_t;
 
+
 /*!\brief Top level UE MAC structure */
 typedef struct {
 
@@ -415,8 +407,12 @@ typedef struct {
   nr_ue_if_module_t       *if_module;
   nr_phy_config_t         phy_config;
 
+  /// BSR report flag management
+  uint8_t BSR_reporting_active;
   NR_UE_SCHEDULING_INFO   scheduling_info;
-  NR_UE_MAC_CE_t          nr_ue_mac_ce;
+
+  /// PHR
+  uint8_t PHR_reporting_active;
 
   NR_Type0_PDCCH_CSS_config_t type0_PDCCH_CSS_config;
   NR_SearchSpace_t *search_space_zero;

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -125,7 +125,53 @@ void fill_scheduled_response(nr_scheduled_response_t *scheduled_response,
                              int slot,
                              int thread_id);
 
-int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, int slotP);
+/*! \fn int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
+   \brief Called by PHY to get sdu for PUSCH transmission.  It performs the following operations: Checks BSR for DCCH, DCCH1 and DTCH corresponding to previous values computed either in SR or BSR procedures.  It gets rlc status indications on DCCH,DCCH1 and DTCH and forms BSR elements and PHR in MAC header.  CRNTI element is not supported yet.  It computes transport block for up to 3 SDUs and generates header and forms the complete MAC SDU.
+\param[in] Mod_id Instance id of UE in machine
+\param[in] frameP subframe number
+\param[in] slotP slot number
+*/
+int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
+
+/*! \fn  boolean_t update_bsr(module_id_t module_idP, frame_t frameP, slot_t slotP, uint8_t gNB_index)
+   \brief get the rlc stats and update the bsr level for each lcid
+\param[in] Mod_id instance of the UE
+\param[in] frameP Frame index
+\param[in] slot slotP number
+\param[in] uint8_t gNB_index
+*/
+boolean_t nr_update_bsr(module_id_t module_idP, frame_t frameP, slot_t slotP, uint8_t gNB_index);
+
+/*! \fn  nr_locate_BsrIndexByBufferSize (int *table, int size, int value)
+   \brief locate the BSR level in the table as defined in 36.321. This function requires that he values in table to be monotonic, either increasing or decreasing. The returned value is not less than 0, nor greater than n-1, where n is the size of table.
+\param[in] *table Pointer to BSR table
+\param[in] size Size of the table
+\param[in] value Value of the buffer
+\return the index in the BSR_LEVEL table
+*/
+uint8_t nr_locate_BsrIndexByBufferSize(const uint32_t *table, int size,
+                                    int value);
+
+/*! \fn  int nr_get_sf_periodicBSRTimer(uint8_t periodicBSR_Timer)
+   \brief get the number of subframe from the periodic BSR timer configured by the higher layers
+\param[in] periodicBSR_Timer timer for periodic BSR
+\return the number of subframe
+*/
+int nr_get_sf_periodicBSRTimer(uint8_t bucketSize);
+
+/*! \fn  int nr_get_ms_bucketsizeduration(uint8_t bucketSize)
+   \brief get the time in ms form the bucket size duration configured by the higher layer
+\param[in]  bucketSize the bucket size duration
+\return the time in ms
+*/
+int nr_get_ms_bucketsizeduration(uint8_t bucketsizeduration);
+
+/*! \fn  int nr_get_sf_retxBSRTimer(uint8_t retxBSR_Timer)
+   \brief get the number of subframe form the bucket size duration configured by the higher layer
+\param[in]  retxBSR_Timer timer for regular BSR
+\return the time in sf
+*/
+int nr_get_sf_retxBSRTimer(uint8_t retxBSR_Timer);
 
 int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, frame_t frame, int slot, dci_pdu_rel15_t *dci, fapi_nr_dci_indication_pdu_t *dci_ind);
 int nr_ue_process_dci_indication_pdu(module_id_t module_id, int cc_id, int gNB_index, frame_t frame, int slot, fapi_nr_dci_indication_pdu_t *dci);
@@ -170,7 +216,13 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
                            int pdu_id);
 
 int nr_write_ce_ulsch_pdu(uint8_t *mac_ce,
-                          NR_UE_MAC_INST_t *mac);
+                          NR_UE_MAC_INST_t *mac,
+                          uint8_t power_headroom, // todo: NR_POWER_HEADROOM_CMD *power_headroom,
+						  uint16_t *crnti,
+                          NR_BSR_SHORT *truncated_bsr,
+                          NR_BSR_SHORT *short_bsr,
+                          NR_BSR_LONG  *long_bsr
+						  );
 
 void fill_dci_search_candidates(NR_SearchSpace_t *ss,fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15);
 

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -572,7 +572,7 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
 
       } else {
 
-        size_sdu = nr_write_ce_ulsch_pdu(pdu, mac);
+        size_sdu = nr_write_ce_ulsch_pdu(pdu, mac, 0,  &(mac->crnti), NULL, NULL, NULL);
         pdu += size_sdu;
         ra->Msg3_size = size_sdu;