Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr

openair2/LAYER2/NR_MAC_UE/mac.h

@@ -69,12 +69,45 @@ typedef struct {
     uint8_t R:2;        // octet 1 [7:6]
 } __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
 
-#define DL_SCH_LCID_CCCH 0x0
-#define DL_SCH_LCID_R_BITRATE 0x2f
-#define DL_SCH_LCID_L_DRX 0x3b
-#define DL_SCH_LCID_DRX 0x3c
-#define DL_SCH_LCID_TA 0x3d
-#define DL_SCH_LCID_CONTENTION_RESOLUTION_ID 0x3e
-#define DL_SCH_LCID_PADDING 0x3f
+//  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_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_SRB3                           0x03
+#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_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -115,10 +115,17 @@ uint32_t ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP,
 
 int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type);
 
-uint32_t get_ssb_frame(void);
+uint32_t get_ssb_frame(uint32_t test);
 uint32_t get_ssb_slot(uint32_t ssb_index);
 
 
 uint32_t mr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t eNB_id, uint16_t rnti, sub_frame_t subframe);
+
+void nr_ue_process_mac_pdu(
+    module_id_t module_idP,
+    uint8_t CC_id,
+    uint8_t *pduP, 
+    uint16_t mac_pdu_len, 
+    uint8_t eNB_index);
 #endif
 /** @}*/
\ No newline at end of file

targets/RT/USER/nr-ue.c

@@ -630,7 +630,8 @@ static void *UE_thread_rxn_txnp4(void *arg) {
                 UE->ul_indication.module_id = 0;
                 UE->ul_indication.gNB_index = 0;
                 UE->ul_indication.cc_id = 0;
-
+                UE->ul_indication.slot = 0;     //  to be fill
+                UE->ul_indication.frame = 0;    //  to be fill
                 //  [TODO] mapping right after NR initial sync
                 //UE->ul_indication.frame = ; 
                 //UE->ul_indication.slot = ;