ue add MIB RX primitives and RRC

cmake_targets/CMakeLists.txt

@@ -1319,12 +1319,14 @@ add_library(PHY_RU ${PHY_SRC_RU})
 #Layer 2 library
 #####################
 set(MAC_DIR ${OPENAIR2_DIR}/LAYER2/MAC)
+set(NR_UE_MAC_DIR ${OPENAIR2_DIR}/LAYER2/NR_MAC_UE)
 set(PHY_INTERFACE_DIR ${OPENAIR2_DIR}/PHY_INTERFACE)
 set(RLC_DIR ${OPENAIR2_DIR}/LAYER2/RLC)
 set(RLC_UM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0)
 set(RLC_AM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/AM_v9.3.0)
 set(RLC_TM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/TM_v9.3.0)
 set(RRC_DIR ${OPENAIR2_DIR}/RRC/LTE)
+set(NR_UE_RRC_DIR ${OPENAIR2_DIR}/RRC/NR_UE)
 set(PDCP_DIR  ${OPENAIR2_DIR}/LAYER2/PDCP_v10.1.0)
 set(L2_SRC
   ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
@@ -1411,6 +1413,9 @@ set(L2_SRC_UE
   ${RRC_DIR}/rrc_common.c
   ${RRC_DIR}/L2_interface_common.c
   ${RRC_DIR}/L2_interface_ue.c
+  ${NR_UE_RRC_DIR}/L2_interface_ue.c
+  ${NR_UE_RRC_DIR}/main_ue.c
+  ${NR_UE_RRC_DIR}/rrc_UE.c
   )
 
 set (MAC_SRC
@@ -1442,6 +1447,10 @@ set (MAC_SRC_UE
   ${MAC_DIR}/l1_helpers.c
   ${MAC_DIR}/rar_tools_ue.c
   ${MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/mac_vars.c
+  ${NR_UE_MAC_DIR}/main_ue_nr.c
+  ${NR_UE_MAC_DIR}/nr_ue_procedures.c
  )
 
 set (ENB_APP_SRC

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_ue_interface.h

+/*
+ * Copyright 2017 Cisco Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+
+#ifndef _NFAPI_NR_INTERFACE_NR_EXTENSION_H_
+#define _NFAPI_NR_INTERFACE_NR_EXTENSION_H_
+#define _NFAPI_NR_INTERFACE_H_
+
+#include "stddef.h"
+
+
+
+#define NFAPI_NR_MAX_NUM_DL_ALLOCATIONS 16
+#define NFAPI_NR_MAX_NUM_UL_ALLOCATIONS 16
+#define NFAPI_NR_MAX_NUM_SERVING_CELLS 32
+#define NFAPI_NR_MAX_NUM_ZP_CSI_RS_RESOURCE_PER_SET 16
+
+typedef unsigned int	uint32_t;
+typedef unsigned short	uint16_t;
+typedef unsigned char	uint8_t;
+typedef signed int		int32_t;
+typedef signed short	int16_t;
+typedef signed char		int8_t;
+
+typedef struct {
+	uint16_t phy_id;
+	uint16_t message_id;
+	uint16_t message_length;
+	uint16_t spare;
+} nfapi_nr_p4_p5_message_header_t;
+
+typedef struct {
+	uint16_t phy_id;
+	uint16_t message_id;
+	uint16_t message_length;
+	uint16_t m_segment_sequence; /* This consists of 3 fields - namely, M, Segement & Sequence number*/
+	uint32_t checksum;
+	uint32_t transmit_timestamp;
+} nfapi_nr_p7_message_header_t;
+
+typedef struct {
+	uint16_t tag;
+	uint16_t length;
+} nfapi_nr_tl_t;
+#define NFAPI_NR_TAG_LENGTH_PACKED_LEN 4
+
+
+
+
+
+typedef struct {
+	nfapi_nr_tl_t tl;
+    //  common C-RNTI
+	uint8_t dci_format; 
+    uint8_t frequency_domain_resouce_assignment;    //  38.214 chapter 5.1.2.2
+    uint8_t time_domain_resource_assignment;        //  38.214 chapter 5.1.2.1
+	uint8_t frequency_hopping_enabled_flag;
+	uint8_t frequency_hopping_bits;
+	uint8_t mcs;
+	uint8_t new_data_indication;
+	uint8_t redundancy_version;
+    uint8_t harq_process;
+    uint8_t tpc_command;
+
+    uint8_t ul_sul_ind;
+
+    uint8_t carrier_indicator;
+    uint8_t bwp_indndicator;
+    uint8_t vrb_to_prb_mapping;
+    uint8_t downlink_assignment_index_1;
+    uint8_t downlink_assignment_index_2;
+    uint8_t srs_resource_indicator;
+    uint8_t precoding_information;
+    uint8_t antenna_ports;
+    uint8_t srs_request;
+    uint8_t cqi_csi_request;
+    uint8_t cbg_transmission_information;
+    uint8_t ptrs_dmrs_association;
+    
+    uint8_t downlink_assignment_index;
+    uint8_t pucch_resource_indicator;
+    uint8_t pdsch_to_harq_feedback_timing_indicator;
+
+    uint8_t short_messages_indicator;
+
+    uint8_t prb_bundling_size_indicator;    //  38.214 chapter 5.1.2.3
+    uint8_t rate_matching_indicator;
+    uint8_t zp_csi_rs_trigger;
+    uint8_t transmission_configuration_indication;
+    uint8_t cbg_flushing_out_information;
+    
+    uint8_t slot_format_count;
+    uint8_t *slot_format_indicators;    //  38.213 chapter 11.1.1
+     
+    uint8_t preemption_indication_count;
+    uint8_t *preemption_indications;    //  38.213 chapter 11.2
+
+    uint8_t tpc_command_count;
+    uint8_t *tpc_command_numbers;
+
+    uint8_t block_number_count;
+    uint8_t *block_numbers;
+    uint8_t dci2_3_srs_request;    //  38.212 table 7.3.1.1.2-5   
+    uint8_t dci2_3_tpc_command;
+
+} nfapi_nr_dci_pdu_rel15_t;
+#define NFAPI_NR_HI_DCI0_REQUEST_DCI_PDU_REL8_TAG 0x2020
+
+typedef struct {
+    nfapi_nr_tl_t tl;
+    uint8_t uci_format;
+    uint8_t uci_channel;
+    uint8_t harq_ack_bits;
+    uint32_t harq_ack;
+    uint8_t csi_bits;
+    uint32_t csi;
+    uint8_t sr_bits;
+    uint32_t sr;
+} nfapi_nr_uci_pdu_rel15_t;
+
+
+
+
+//
+// Top level NFAPI messages
+//
+
+
+
+//
+// P7
+//
+
+	typedef struct {
+		uint16_t rnti;
+		uint8_t dci_type;
+		uint8_t dci_size;
+        nfapi_nr_dci_pdu_rel15_t dci;
+	}nfapi_nr_dci_indication_pdu_t;
+
+	typedef struct {
+		nfapi_nr_tl_t tl;
+		uint16_t number_of_dcis;
+		nfapi_nr_dci_indication_pdu_t* dci_list;
+	} nfapi_nr_dci_indication_body_t;
+
+///
+typedef struct {
+  	nfapi_nr_p7_message_header_t header;
+  	uint16_t sfn_sf_slot;
+  	nfapi_nr_dci_indication_body_t dci_indication_body;
+} nfapi_nr_dci_indication_t;
+
+	#define NFAPI_NR_TX_MAX_PDU 100
+	typedef struct {
+		nfapi_nr_tl_t tl;
+		uint8_t* data;
+	} nfapi_nr_rx_request_body_t;
+	#define NFAPI_NR_TX_REQUEST_BODY_TAG 0x2022
+
+///
+typedef struct {
+	nfapi_nr_p7_message_header_t header;
+	uint16_t sfn_sf_slot;
+	nfapi_nr_rx_request_body_t rx_request_body;
+} nfapi_nr_rx_indication_t;
+
+	typedef struct {
+		nfapi_nr_tl_t tl;
+		uint8_t ul_cqi;
+		uint16_t timing_advance;
+	} nfapi_nr_tx_indication_t;
+
+
+    #define NFAPI_NR_TX_MAX_SEGMENTS 32
+	typedef struct {
+		uint16_t pdu_length;
+		uint16_t pdu_index;
+		uint8_t num_segments;
+		struct {
+			uint32_t segment_length;
+			uint8_t* segment_data;
+		} segments[NFAPI_NR_TX_MAX_SEGMENTS];
+
+	} nfapi_nr_tx_indication_pdu_t;
+
+	#define NFAPI_NR_RX_IND_MAX_PDU 100
+	typedef struct {
+		nfapi_nr_tl_t tl;
+		nfapi_nr_tx_indication_t tx_indication;
+		uint16_t number_of_pdus;
+		nfapi_nr_tx_indication_pdu_t* tx_pdu_list;
+	} nfapi_nr_tx_indication_body_t;
+	#define NFAPI_NR_RX_INDICATION_BODY_TAG 0x2023
+
+///
+typedef struct {
+	nfapi_nr_p7_message_header_t header;
+	uint16_t sfn_sf_slot;
+	nfapi_nr_tx_indication_body_t tx_indication_body;
+} nfapi_nr_tx_request_t;
+
+
+	typedef struct {
+		uint8_t pdu_type;
+		uint8_t pdu_size;
+		union {
+			/*nfapi_nr_ul_config_ulsch_pdu				ulsch_pdu;
+			nfapi_nr_ul_config_ulsch_cqi_ri_pdu		ulsch_cqi_ri_pdu;
+			nfapi_nr_ul_config_ulsch_harq_pdu			ulsch_harq_pdu;
+			nfapi_nr_ul_config_ulsch_cqi_harq_ri_pdu	ulsch_cqi_harq_ri_pdu;
+			nfapi_nr_ul_config_uci_cqi_pdu				uci_cqi_pdu;
+			nfapi_nr_ul_config_uci_sr_pdu				uci_sr_pdu;
+			nfapi_nr_ul_config_uci_harq_pdu			uci_harq_pdu;
+			nfapi_nr_ul_config_uci_sr_harq_pdu			uci_sr_harq_pdu;
+			nfapi_nr_ul_config_uci_cqi_harq_pdu		uci_cqi_harq_pdu;
+			nfapi_nr_ul_config_uci_cqi_sr_pdu			uci_cqi_sr_pdu;
+			nfapi_nr_ul_config_uci_cqi_sr_harq_pdu		uci_cqi_sr_harq_pdu;
+			nfapi_nr_ul_config_srs_pdu					srs_pdu;
+			nfapi_nr_ul_config_harq_buffer_pdu			harq_buffer_pdu;
+			nfapi_nr_ul_config_ulsch_uci_csi_pdu		ulsch_uci_csi_pdu;
+			nfapi_nr_ul_config_ulsch_uci_harq_pdu		ulsch_uci_harq_pdu;
+			nfapi_nr_ul_config_ulsch_csi_uci_harq_pdu	ulsch_csi_uci_harq_pdu;*/
+		};
+	} nfapi_nr_ul_config_request_pdu_t;
+
+	typedef struct {
+		nfapi_nr_tl_t tl;
+		nfapi_nr_ul_config_request_pdu_t ul_config_pdu_list;
+	} nfapi_nr_ul_config_request_body_t;
+///
+typedef struct {
+	nfapi_nr_p7_message_header_t header;
+	uint16_t sfn_sf_slot;
+	nfapi_nr_ul_config_request_body_t ul_config_request_body;
+} nfapi_nr_ul_config_request_t;
+
+
+
+	typedef struct {
+		uint8_t pdu_type;
+		uint8_t pdu_size;
+		union {
+			/*nfapi_nr_dl_config_dlsch_pdu	dlsch_pdu;
+			nfapi_nr_dl_config_prs_pdu		prs_pdu;
+			nfapi_nr_dl_config_csi_rs_pdu	csi_rs_pdu;*/
+		};
+	} nfapi_nr_dl_config_request_pdu_t;
+
+///
+typedef struct {
+	nfapi_nr_p7_message_header_t header;
+	uint16_t sfn_sf_slot;
+	nfapi_nr_dl_config_request_pdu_t dl_config_request_body;
+} nfapi_nr_dl_config_request_t;
+
+
+
+//
+// P5
+//
+
+    typedef struct {
+        uint32_t frequency_domain_resource;
+        uint8_t duration;
+        uint8_t cce_reg_mapping_type;                   //  interleaved or noninterleaved
+        uint8_t cce_reg_interleaved_reg_bundle_size;    //  valid if CCE to REG mapping type is interleaved type
+        uint8_t cce_reg_interleaved_interleaver_size;   //  valid if CCE to REG mapping type is interleaved type
+        uint8_t cce_reg_interleaved_shift_index;        //  valid if CCE to REG mapping type is interleaved type
+        uint8_t precoder_granularity;
+        uint8_t tci_state_pdcch;
+        uint8_t tci_present_in_dci;
+        uint16_t pdcch_dmrs_scrambling_id;
+    } nfapi_nr_coreset_t;
+
+    typedef struct {
+        nfapi_nr_coreset_t coreset;
+
+        uint8_t monitoring_slot_peridicity;
+        uint8_t monitoring_slot_offset;
+        uint16_t duration;
+        uint16_t monitoring_symbols_within_slot;
+        uint8_t number_of_candidates[5];            //  aggregation level 1, 2, 4, 8, 16
+
+        uint8_t dci_2_0_number_of_candidates[5];    //  aggregation level 1, 2, 4, 8, 16
+        uint8_t dci_2_3_monitorying_periodicity;
+        uint8_t dci_2_3_number_of_candidates;
+        
+    } nfapi_nr_search_space_t;
+
+    typedef struct {
+        nfapi_nr_search_space_t search_space_sib1;
+        nfapi_nr_search_space_t search_space_others_sib;
+        nfapi_nr_search_space_t search_space_paging;
+        nfapi_nr_coreset_t      coreset_ra;         //  common coreset
+        nfapi_nr_search_space_t search_space_ra;    
+    } nfapi_nr_pdcch_config_common_t;
+
+    typedef struct {
+        uint8_t k0;
+        uint8_t mapping_type;
+        uint8_t symbol_starting;
+        uint8_t symbol_length;
+    } nfapi_nr_pdsch_time_domain_resource_allocation_t;
+
+    typedef struct {
+        nfapi_nr_pdsch_time_domain_resource_allocation_t allocation_list[NFAPI_NR_MAX_NUM_DL_ALLOCATIONS];
+    } nfapi_nr_pdsch_config_common_t;
+
+    typedef struct {
+        uint8_t prach_configuration_index;
+        uint8_t msg1_fdm;
+        uint8_t msg1_frequency_start;
+        uint8_t zero_correlation_zone_config;
+        uint8_t preamble_received_target_power;
+        uint8_t preamble_transmission_max;
+        uint8_t power_ramping_step;
+        uint8_t ra_window_size;
+
+        uint8_t total_number_of_preamble;
+        uint8_t ssb_occasion_per_rach;
+        uint8_t cb_preamble_per_ssb;
+
+        uint8_t group_a_msg3_size;
+        uint8_t group_a_number_of_preamble;
+        uint8_t group_b_power_offset;
+        uint8_t contention_resolution_timer;
+        uint8_t rsrp_threshold_ssb;
+        uint8_t rsrp_threshold_ssb_sul;
+        uint8_t prach_length;   //  l839, l139
+        uint8_t prach_root_sequence_index;  //  0 - 837 for l839, 0 - 137 for l139
+        uint8_t msg1_subcarrier_spacing;
+        uint8_t restrictedset_config;
+        uint8_t msg3_transform_precoding;
+    } nfapi_nr_rach_config_common_t;
+
+    typedef struct {
+        uint8_t k2;
+        uint8_t mapping_type;
+        uint8_t symbol_starting;
+        uint8_t symbol_length;
+    } nfapi_nr_pusch_time_domain_resource_allocation_t;
+      
+    typedef struct {
+        uint8_t group_hopping_enabled_transform_precoding;
+        nfapi_nr_pusch_time_domain_resource_allocation_t allocation_list[NFAPI_NR_MAX_NUM_UL_ALLOCATIONS];
+        uint8_t msg3_delta_preamble;
+        uint8_t p0_nominal_with_grant;
+    } nfapi_nr_pusch_config_common_t;
+
+    typedef struct {
+        uint8_t pucch_resource_common;
+        uint8_t pucch_group_hopping;
+        uint8_t hopping_id;
+        uint8_t p0_nominal;
+    } nfapi_nr_pucch_config_common_t;
+
+    typedef struct {
+        uint8_t subcarrier_spacing_common;
+        uint8_t ssb_subcarrier_offset;
+        uint8_t dmrs_type_a_position;
+        uint8_t pdcch_config_sib1;
+        uint8_t cell_barred;
+        uint8_t intra_frquency_reselection;
+    } nfapi_nr_pbch_config_t;
+
+    typedef struct {
+        nfapi_nr_tl_t tl;
+        
+        nfapi_nr_pdcch_config_common_t pdcch_config_common;
+        nfapi_nr_pdsch_config_common_t pdsch_config_common;
+        
+    } nfapi_nr_dl_bwp_common_config_t;
+
+
+
+    typedef struct {
+        uint16_t int_rnti;
+        uint8_t time_frequency_set;
+        uint8_t dci_payload_size;
+        uint8_t serving_cell_id[NFAPI_NR_MAX_NUM_SERVING_CELLS];    //  interrupt configuration per serving cell
+        uint8_t position_in_dci[NFAPI_NR_MAX_NUM_SERVING_CELLS];    //  interrupt configuration per serving cell
+    } nfapi_nr_downlink_preemption_t;
+
+    typedef struct {
+        uint8_t tpc_index;
+        uint8_t tpc_index_sul;
+        uint8_t target_cell;
+    } nfapi_nr_pusch_tpc_command_config_t;
+
+    typedef struct {
+        uint8_t tpc_index_pcell;
+        uint8_t tpc_index_pucch_scell;
+    } nfapi_nr_pucch_tpc_command_config_t;
+
+    typedef struct {
+        uint8_t starting_bit_of_format_2_3;
+        uint8_t feild_type_format_2_3;
+    } nfapi_nr_srs_tpc_command_config_t;
+
+    typedef struct {
+        nfapi_nr_downlink_preemption_t downlink_preemption;
+        nfapi_nr_pusch_tpc_command_config_t tpc_pusch;
+        nfapi_nr_pucch_tpc_command_config_t tpc_pucch;
+        nfapi_nr_srs_tpc_command_config_t tpc_srs;
+    } nfapi_nr_pdcch_config_dedicated_t;
+
+    typedef struct {
+        uint8_t dmrs_type;
+        uint8_t dmrs_addition_position;
+        uint8_t max_length;
+        uint16_t scrambling_id_0;
+        uint16_t scrambling_id_1;
+        uint8_t ptrs_frequency_density[2];      //  phase tracking rs
+        uint8_t ptrs_time_density[3];           //  phase tracking rs
+        uint8_t ptrs_epre_ratio;                //  phase tracking rs
+        uint8_t ptrs_resource_element_offset;   //  phase tracking rs
+    } nfapi_nr_dmrs_downlink_config_t;
+
+    typedef struct {
+        uint8_t bwp_or_cell_level;
+        uint8_t pattern_type;
+        uint32_t resource_blocks[9];        //  bitmaps type 275 bits
+        uint8_t slot_type;                  //  bitmaps type one/two slot(s)
+        uint32_t symbols_in_resouece_block; //  bitmaps type 14/28 bits
+        uint8_t periodic;                   //  bitmaps type 
+        uint32_t pattern[2];                //  bitmaps type 2/4/5/8/10/20/40 bits
+
+        nfapi_nr_coreset_t coreset;         //  coreset
+
+        uint8_t subcarrier_spacing;
+        uint8_t mode;
+    } nfapi_nr_rate_matching_pattern_group_t;
+
+    typedef struct {
+        //  resource mapping
+        uint8_t row;    //  row1/row2/row4/other
+        uint16_t frequency_domain_allocation; //    4/12/3/6 bits
+        uint8_t number_of_ports;
+        uint8_t first_ofdm_symbol_in_time_domain;
+        uint8_t first_ofdm_symbol_in_time_domain2;
+        uint8_t cdm_type;
+        uint8_t density;            //  .5/1/3
+        uint8_t density_dot5_type;  //  even/odd PRBs
+        
+        uint8_t frequency_band_starting_rb;     //  freqBand
+        uint8_t frequency_band_number_of_rb;    //  freqBand
+
+        //  periodicityAndOffset
+        uint8_t periodicity;    //  slot4/5/8/10/16/20/32/40/64/80/160/320/640
+        uint32_t offset;        //  0..639 bits
+    } nfapi_nr_zp_csi_rs_resource_t;
+
+    typedef struct {
+        uint16_t data_scrambling_id_pdsch;
+        nfapi_nr_dmrs_downlink_config_t dmrs_dl_for_pdsch_mapping_type_a;
+        nfapi_nr_dmrs_downlink_config_t dmrs_dl_for_pdsch_mapping_type_b; 
+        uint8_t vrb_to_prb_interleaver;
+        uint8_t resource_allocation;
+        nfapi_nr_pdsch_time_domain_resource_allocation_t allocation_list[NFAPI_NR_MAX_NUM_DL_ALLOCATIONS];
+        uint8_t pdsch_aggregation_factor;
+        nfapi_nr_rate_matching_pattern_group_t rate_matching_pattern_group1;
+        nfapi_nr_rate_matching_pattern_group_t rate_matching_pattern_group2;
+        uint8_t rbg_size;
+        uint8_t mcs_table;
+        uint8_t max_num_of_code_word_scheduled_by_dci;
+        uint8_t bundle_size;        //  prb_bundling static
+        uint8_t bundle_size_set1;   //  prb_bundling dynamic 
+        uint8_t bundle_size_set2;   //  prb_bundling dynamic
+        nfapi_nr_zp_csi_rs_resource_t periodically_zp_csi_rs_resource_set[NFAPI_NR_MAX_NUM_ZP_CSI_RS_RESOURCE_PER_SET];
+    } nfapi_nr_pdsch_config_dedicated_t;
+
+    typedef struct {
+        uint16_t starting_prb;
+        uint8_t intra_slot_frequency_hopping;
+        uint16_t second_hop_prb;
+        uint8_t format;                 //  pucch format 0..4
+        uint8_t initial_cyclic_shift;
+        uint8_t number_of_symbols;
+        uint8_t starting_symbol_index;
+        uint8_t time_domain_occ;
+        uint8_t number_of_prbs;
+        uint8_t occ_length;
+        uint8_t occ_index;
+    } nfapi_nr_pucch_resource_t;
+
+    typedef struct {
+        uint8_t periodicity;
+        uint8_t number_of_harq_process;
+        nfapi_nr_pucch_resource_t n1_pucch_an;
+    } nfapi_nr_sps_config_t;
+
+    typedef struct {
+        uint8_t beam_failure_instance_max_count;
+        uint8_t beam_failure_detection_timer;
+    } nfapi_nr_radio_link_monitoring_config_t;
+
+    typedef struct {
+        nfapi_nr_pdcch_config_dedicated_t pdcch_config_dedicated;
+        nfapi_nr_pdsch_config_dedicated_t pdsch_config_dedicated;
+        nfapi_nr_sps_config_t sps_config;
+        nfapi_nr_radio_link_monitoring_config_t radio_link_monitoring_config;
+
+    } nfapi_nr_dl_bwp_dedicated_config_t;
+
+    typedef struct {
+        nfapi_nr_rach_config_common_t  rach_config_common;
+        nfapi_nr_pusch_config_common_t pusch_config_common;
+        nfapi_nr_pucch_config_common_t pucch_config_common;
+
+    } nfapi_nr_ul_bwp_common_config_t;
+        
+    typedef struct {
+        uint8_t inter_slot_frequency_hopping;
+        uint8_t additional_dmrs;
+        uint8_t max_code_rate;
+        uint8_t number_of_slots;
+        uint8_t pi2bpsk;
+        uint8_t simultaneous_harq_ack_csi;
+    } nfapi_nr_pucch_format_config_t;
+
+    typedef struct {
+        nfapi_nr_pucch_format_config_t format1;
+        nfapi_nr_pucch_format_config_t format2;
+        nfapi_nr_pucch_format_config_t format3;
+        nfapi_nr_pucch_format_config_t format4;
+        nfapi_nr_pucch_resource_t multi_csi_pucch_resources[2];
+        uint8_t dl_data_to_ul_ack[8];
+        //  pucch power control
+        uint8_t deltaF_pucch_f0;
+        uint8_t deltaF_pucch_f1;
+        uint8_t deltaF_pucch_f2;
+        uint8_t deltaF_pucch_f3;
+        uint8_t deltaF_pucch_f4;
+        uint8_t two_pucch_pc_adjusment_states;
+    } nfapi_nr_ul_bwp_dedicated_config_t;
+
+typedef struct {
+    nfapi_nr_p4_p5_message_header_t header;
+    uint8_t num_tlv;
+
+    nfapi_nr_pbch_config_t pbch_config_common;  //  MIB
+
+    nfapi_nr_dl_bwp_common_config_t     dl_bwp_common;
+    nfapi_nr_dl_bwp_dedicated_config_t  dl_bwp_dedicated;
+
+    nfapi_nr_ul_bwp_common_config_t     ul_bwp_common;
+    nfapi_nr_ul_bwp_dedicated_config_t  ul_bwp_dedicated;
+
+} nfapi_nr_config_request_t;
+
+#endif /* _NFAPI_INTERFACE_H_ */

openair2/LAYER2/NR_MAC_UE/config_ue.c

@@ -29,98 +29,101 @@
  * @ingroup _mac
 
  */
+#include "defs.h"
+#include "proto.h"
 
 int
 nr_rrc_mac_config_req_ue(
-    module_id_t Mod_idP,
+    module_id_t                     module_id,
 	int                             CC_idP,
-	uint8_t eNB_index,
-    MAC_CellGroupConfig_t *mac_cell_group_config,
-    PhysicalCellGroupConfig_t *phy_cell_group_config,
-    SpCellConfig_t *spcell_config){
+	uint8_t                         gNB_index,
+    NR_MIB_t                        *mibP,
+    NR_MAC_CellGroupConfig_t        *mac_cell_group_configP,
+    NR_PhysicalCellGroupConfig_t    *phy_cell_group_configP,
+    NR_SpCellConfig_t               *spcell_configP ){
 
-    NR_UE_MAC_INST *mac = get_mac_inst(Mod_idP);
+    NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
 
-    ServingCellConfig_t *serving_cell_config = spcell_config->spCellConfigDedicated;
+//    NR_ServingCellConfig_t *serving_cell_config = spcell_configP->spCellConfigDedicated;
 //  TODO do something FAPI-like P5 L1/L2 config interface in config_si, config_mib, etc.
 
-    if(mac_cell_group_config != (MAC_CellGroupConfig_t *)0){
-        if(mac_cell_group_config->drx_Config != (drx_Config_t *)0 ){
-            mac->drx_Config = mac_cell_group_config->drx_Config;
+    if(mibP != NULL){
+        ;
     }
 
-        if(mac_cell_group_config->SchedulingRequestConfig != (SchedulingRequestConfig_t *)0 ){
-            mac->SchedulingRequestConfig = mac_cell_group_config->SchedulingRequestConfig;
+    if(mac_cell_group_configP != NULL){
+        if(mac_cell_group_configP->drx_Config != NULL ){
+            mac->drx_Config = mac_cell_group_configP->drx_Config;
         }
 
-        if(mac_cell_group_config->BSR_Config != (BSR_Config_t *)0 ){
-            mac->BSR_Config = mac_cell_group_config->BSR_Config;
+        if(mac_cell_group_configP->schedulingRequestConfig != NULL ){
+            mac->schedulingRequestConfig = mac_cell_group_configP->schedulingRequestConfig;
         }
 
-        if(mac_cell_group_config->TAG_Config != (TAG_Config_t *)0 ){
-            mac->TAG_Config = mac_cell_group_config->TAG_Config;
+        if(mac_cell_group_configP->bsr_Config != NULL ){
+            mac->bsr_Config = mac_cell_group_configP->bsr_Config;
         }
 
-        if(mac_cell_group_config->phr_Config != (phr_Config_t *)0 ){
-            mac->phr_Config = mac_cell_group_config->phr_Config;
+        if(mac_cell_group_configP->tag_Config != NULL ){
+            mac->tag_Config = mac_cell_group_configP->tag_Config;
         }
 
-        if(mac_cell_group_config->cs_RNTI != (cs_RNTI_t *)0 ){
-            mac->cs_RNTI = mac_cell_group_config->cs_RNTI;
+        if(mac_cell_group_configP->phr_Config != NULL ){
+            mac->phr_Config = mac_cell_group_configP->phr_Config;
+        }
+
+        if(mac_cell_group_configP->cs_RNTI != NULL ){
+            mac->cs_RNTI = mac_cell_group_configP->cs_RNTI;
         }
     }
     
-    if(phy_cell_group_config != (PhysicalCellGroupConfig_t *)0){
-        config_phy(phy_cell_group_config, NULL);
+    if(phy_cell_group_configP != NULL ){
+        //config_phy(phy_cell_group_config, NULL);
     }
 
-    if(serving_cell_config_config != (SpCellConfig_t *)0){
-        config_phy(NULL, spcell_config);
+//  TODO check
+#if 0
+    if(serving_cell_config_configP != NULL ){
+        //config_phy(NULL, spcell_config);
         mac->servCellIndex = spcell_config->servCellIndex;
     }
 
 
-    if(serving_cell_config != (spCellConfigDedicated_t *)0){
-        if(serving_cell_config->tdd_UL_DL_ConfigurationDedicated != (TDD_UL_DL_ConfigDedicated_t *)0){
+    if(serving_cell_config != NULL ){
+        if(serving_cell_config->tdd_UL_DL_ConfigurationDedicated != NULL ){
             mac->tdd_UL_DL_ConfigurationDedicated = serving_cell_config->tdd_UL_DL_ConfigurationDedicated;
         }
         
-        if(spcell_config->initialDownlinkBWP != (BWP_DownlinkDedicated_t *)0){
+        if(spcell_config->initialDownlinkBWP != NULL ){
             mac->init_DL_BWP = spcell_config->initialDownlinkBWP;
         }
         
         //  storage list of DL BWP config. TODO should be modify to maintain(add/release) a list inside MAC instance, this implementation just use for one-shot RRC configuration setting.
-        if(spcell_config->downlinkBWP_ToAddModList != (struct ServingCellConfig__downlinkBWP_ToAddModList *)0){
+        if(spcell_config->downlinkBWP_ToAddModList != NULL ){
             mac->BWP_Downlink_list = spcell_config->downlinkBWP_ToAddModList->list;
             mac->BWP_Downlink_count = spcell_config->downlinkBWP_ToAddModList->count;
         }
         
-        if(spcell_config->bwp_InactivityTimer != (long *)0){
+        if(spcell_config->bwp_InactivityTimer != NULL ){
             mac->bwp_InactivityTimer = spcell_config->bwp_InactivityTimer;
         } 
 
-        if(spcell_config->defaultDownlinkBWP_Id != (BWP_Id_t *)0){
+        if(spcell_config->defaultDownlinkBWP_Id != NULL ){
             mac->defaultDownlinkBWP_Id = spcell_config->defaultDownlinkBWP_Id;
         }
 
-        if(spcell_config->pdsch_ServingCellConfig != (PDSCH_ServingCellConfig_t *)0){
+        if(spcell_config->pdsch_ServingCellConfig != NULL ){
             mac->pdsch_ServingCellConfig = spcell_config->pdsch_ServingCellConfig;
         }
 
-        if(spcell_config->csi_MeasConfig != (CSI_MeasConfig_t *)0){
+        if(spcell_config->csi_MeasConfig != NULL ){
             mac->csi_MeasConfig = spcell_config->csi_MeasConfig;
         }
 
         spcell_config->tag_Id = spcell_config.tag_Id;
     }
-
+#endif
     //scell config not yet
 
-
-
-
-
-
-
-    return (0);
+    return 0;
 }
\ No newline at end of file

openair2/LAYER2/NR_MAC_UE/defs.h

@@ -34,8 +34,8 @@
 
 /*@}*/
 
-#ifndef __LAYER2_MAC_DEFS_H__
-#define __LAYER2_MAC_DEFS_H__
+#ifndef __LAYER2_NR_MAC_DEFS_H__
+#define __LAYER2_NR_MAC_DEFS_H__
 
 
 
@@ -43,66 +43,37 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "PHY/defs.h"
-#include "PHY/LTE_TRANSPORT/defs.h"
-#include "COMMON/platform_constants.h"
-#include "BCCH-BCH-Message.h"
-#include "RadioResourceConfigCommon.h"
-#include "RadioResourceConfigDedicated.h"
-#include "MeasGapConfig.h"
-#include "SchedulingInfoList.h"
-#include "TDD-Config.h"
-#include "RACH-ConfigCommon.h"
-#include "MeasObjectToAddModList.h"
-#include "MobilityControlInfo.h"
-#if defined(Rel10) || defined(Rel14)
-#include "MBSFN-AreaInfoList-r9.h"
-#include "MBSFN-SubframeConfigList.h"
-#include "PMCH-InfoList-r9.h"
-#include "SCellToAddMod-r10.h"
-#endif
-#ifdef Rel14
-#include "SystemInformationBlockType1-v1310-IEs.h"
-#endif
-
-#include "nfapi_interface.h"
-#include "PHY_INTERFACE/IF_Module.h"
+#include "platform_types.h"
 
+#include "NR_DRX-Config.h"
+#include "NR_SchedulingRequestConfig.h"
+#include "NR_BSR-Config.h"
+#include "NR_TAG-Config.h"
+#include "NR_PHR-Config.h"
+#include "NR_RNTI-Value.h"
+
+#include "NR_MIB.h"
+#include "NR_MAC-CellGroupConfig.h"
+#include "NR_PhysicalCellGroupConfig.h"
+#include "NR_SpCellConfig.h"
+
+#include "NR_ServingCellConfig.h"
+
+#define NB_NR_UE_MAC_INST 1
 
 /*!\brief Top level UE MAC structure */
 typedef struct {
     
     ////  MAC config
-    drx_Config_t *drx_config;
-    SchedulingRequestConfig_t *SchedulingRequestConfig;
-    BSR_Config_t *BSR_Config;
-    TAG_Config_t *TAG_Config;
-    phr_Config_t *phr_Config;
-    cs_RNTI_t *cs_RNTI;
-    ServCellIndex_t *servCellIndex;
-
-    ////  Serving cell config
-    TDD_UL_DL_ConfigDedicated_t *tdd_UL_DL_ConfigurationDedicated;
-    //  init DL BWP
-    BWP_DownlinkDedicated_t *init_DL_BWP;
-    //  DL BWP list, not default one
-    BWP_Downlink_t **BWP_Downlink_list;
-    int BWP_Downlink_count;
-    //BWP_Id_t *firstActiveDownlinkBWP_Id;
-    long *bwp_InactivityTimer;
-    BWP_Id_t *defaultDownlinkBWP_Id;
-    //struct UplinkConfig *uplinkConfig;
-    //struct UplinkConfig *supplementaryUplink;
-    PDSCH_ServingCellConfig_t *pdsch_ServingCellConfig;
-    CSI_MeasConfig_t *csi_MeasConfig;
-    //SRS_CarrierSwitching_t *carrierSwitching;
-    //long *sCellDeactivationTimer /* OPTIONAL */;
-    //struct CrossCarrierSchedulingConfig *crossCarrierSchedulingConfig   /* OPTIONAL */;
-    TAG_Id_t tag_Id;
-    //long *ue_BeamLockFunction    /* OPTIONAL */;
-    //long *pathlossReferenceLinking   /* OPTIONAL */;    
-
-} UE_MAC_INST;
-#include "proto.h"
+    NR_DRX_Config_t    *drx_Config;    /* OPTIONAL */
+    NR_SchedulingRequestConfig_t   *schedulingRequestConfig;   /* OPTIONAL */
+    NR_BSR_Config_t    *bsr_Config;    /* OPTIONAL */
+    NR_TAG_Config_t    *tag_Config;    /* OPTIONAL */
+    NR_PHR_Config_t    *phr_Config;    /* OPTIONAL */
+    
+    NR_RNTI_Value_t *cs_RNTI;   /* OPTIONAL */
+
+} NR_UE_MAC_INST_t;
+
 /*@}*/
 #endif /*__LAYER2_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/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 LAYER2/MAC/defs.h
+* \brief MAC data structures, constant, and function prototype
+* \author Navid Nikaein and Raymond Knopp
+* \date 2011
+* \version 0.5
+* \email navid.nikaein@eurecom.fr
+
+*/
+/** @defgroup _oai2  openair2 Reference Implementation
+ * @ingroup _ref_implementation_
+ * @{
+ */
+
+/*@}*/
+
+#ifndef __LAYER2_MAC_DEFS_H__
+#define __LAYER2_MAC_DEFS_H__
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "COMMON/platform_constants.h"
+#include "BCCH-BCH-Message.h"
+#include "RadioResourceConfigCommon.h"
+#include "RadioResourceConfigCommonSIB.h"
+#include "RadioResourceConfigDedicated.h"
+#include "MeasGapConfig.h"
+#include "SchedulingInfoList.h"
+#include "TDD-Config.h"
+#include "RACH-ConfigCommon.h"
+#include "MeasObjectToAddModList.h"
+#include "MobilityControlInfo.h"
+#if defined(Rel10) || defined(Rel14)
+#include "MBSFN-AreaInfoList-r9.h"
+#include "MBSFN-SubframeConfigList.h"
+#include "PMCH-InfoList-r9.h"
+#include "SCellToAddMod-r10.h"
+#endif
+#ifdef Rel14
+#include "SystemInformationBlockType1-v1310-IEs.h"
+#endif
+
+#include "nfapi_interface.h"
+#include "PHY_INTERFACE/IF_Module.h"
+
+#include "PHY/TOOLS/time_meas.h"
+
+#include "PHY/defs_common.h" // for PRACH_RESOURCES_t
+
+#include "targets/ARCH/COMMON/common_lib.h"
+
+//solve implicit declaration
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
+
+/** @defgroup _mac  MAC
+ * @ingroup _oai2
+ * @{
+ */
+
+/*!\brief Values of BCCH logical channel (fake)*/
+#define NR_BCCH_DL_SCH 3			// SI
+
+/*!\brief Values of PCCH logical channel (fake) */
+#define NR_BCCH_BCH 5			// MIB
+/*@}*/
+#endif /*__LAYER2_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/vars.c → openair2/LAYER2/NR_MAC_UE/mac_vars.c

@@ -29,6 +29,8 @@
 
 */
 
-UE_MAC_INST_t UE_mac_inst;	//[NB_MODULE_MAX];
+#include "defs.h"
+
+NR_UE_MAC_INST_t UE_mac_inst;	//[NB_MODULE_MAX];
 
 

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -31,17 +31,15 @@
 
 #include "defs.h"
 #include "proto.h"
-#include "extern.h"
-#include "assertions.h"
 
 static NR_UE_MAC_INST_t *nr_ue_mac_inst; 
 
 int
 nr_l2_init_ue(void)
 {
-    LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
+    //LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
 
-    LOG_I(MAC, "[MAIN] init UE MAC functions \n");
+    //LOG_I(MAC, "[MAIN] init UE MAC functions \n");
     
     //init mac here
     nr_ue_mac_inst = (NR_UE_MAC_INST_t *)malloc(sizeof(NR_UE_MAC_INST_t)*NB_NR_UE_MAC_INST);
@@ -50,6 +48,6 @@ nr_l2_init_ue(void)
     return (1);
 }
 
-NR_UE_MAC_INST_t *get_mac_inst(Module_id_t Mod_idP){
+NR_UE_MAC_INST_t *get_mac_inst(module_id_t Mod_idP){
     return &nr_ue_mac_inst[(int)Mod_idP];
 }

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

+/*
+ * 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 ue_procedures.c
+ * \brief procedures related to UE
+ * \author  Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \version 1
+ * \email: navid.nikaein@eurecom.fr
+ * @ingroup _mac
+
+ */
+#include "proto.h"
+#include "RRC/NR_UE/rrc_proto.h"
+
+void
+nr_ue_decode_mib(
+	module_id_t module_id,
+	int 		CC_id,
+	uint8_t 	gNB_index,
+	uint8_t 	extra_bits,
+	uint32_t 	ssb_index,
+	uint32_t 	*frameP,
+	void 		*pduP,
+	uint16_t 	pdu_len){
+
+    nr_mac_rrc_data_ind_ue( module_id, CC_id, gNB_index, frameP,
+		     NR_BCCH_BCH, (uint8_t *) pduP, pdu_len );
+    
+    //	frame calculation
+}

openair2/LAYER2/NR_MAC_UE/proto.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 LAYER2/MAC/proto.h
+ * \brief MAC functions prototypes for eNB and UE
+ * \author Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \email navid.nikaein@eurecom.fr
+ * \version 1.0
+ */
+#ifndef __LAYER2_MAC_PROTO_H__
+#define __LAYER2_MAC_PROTO_H__
+
+#include "defs.h"
+
+/**\brief decode mib pdu in NR_UE, from if_module ul_ind with P7 tx_ind message
+   \param module_id     module id
+   \param CC_id         component carrier id
+   \param gNB_index     gNB index
+   \param extra_bits    extra bits for frame calculation
+   \param ssb_index     SSB index for frame calculation
+   \param frameP        pointer to frame for revising after frame calculation
+   \param pduP          pointer to pdu
+   \param pdu_length    length of pdu*/
+void nr_ue_decode_mib(module_id_t module_id, int CC_id, uint8_t gNB_index, uint8_t extra_bits, uint32_t ssb_index, uint32_t *frameP, void *pduP, uint16_t pdu_len);
+
+
+/**\brief primitive from RRC layer to MAC layer for configuration L1/L2, now supported 4 rrc messages: MIB, cell_group_config for MAC/PHY, spcell_config(serving cell config)
+   \param module_id                 module id
+   \param CC_id                     component carrier id
+   \param gNB_index                 gNB index
+   \param mibP                      pointer to RRC message MIB
+   \param mac_cell_group_configP    pointer to RRC message MAC-related in cell group config 
+   \param phy_cell_group_configP    pointer to RRC message PHY-related in cell group config
+   \param spcell_configP            pointer to RRC message serving cell config*/
+int nr_rrc_mac_config_req_ue( module_id_t module_id, int CC_id, uint8_t gNB_index, NR_MIB_t *mibP, NR_MAC_CellGroupConfig_t *mac_cell_group_configP, NR_PhysicalCellGroupConfig_t *phy_cell_group_configP, NR_SpCellConfig_t *spcell_configP );
+
+int nr_l2_init_ue(void);
+
+NR_UE_MAC_INST_t *get_mac_inst(module_id_t Mod_idP);
+
+#endif
+/** @}*/

openair2/LAYER2/NR_MAC_UE/vars.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 vars.h
-* \brief mac vars
-* \author  Navid Nikaein and Raymond Knopp
-* \date 2010 - 2014
-* \version 1.0
-* \email navid.nikaein@eurecom.fr
-* @ingroup _mac
-
-*/
-
-
-#ifndef __MAC_VARS_H__
-#define __MAC_VARS_H__
-#ifdef USER_MODE
-//#include "stdio.h"
-#endif //USER_MODE
-#include "PHY/defs.h"
-#include "defs.h"
-#include "PHY_INTERFACE/defs.h"
-#include "COMMON/mac_rrc_primitives.h"
-
-const uint32_t BSR_TABLE[BSR_TABLE_SIZE]= {0,10,12,14,17,19,22,26,31,36,42,49,57,67,78,91,
-                                           105,125,146,171,200,234,274,321,376,440,515,603,706,826,967,1132,
-                                           1326,1552,1817,2127,2490,2915,3413,3995,4677,5467,6411,7505,8787,10287,12043,14099,
-                                           16507,19325,22624,26487,31009,36304,42502,49759,58255,68201,79846,93479,109439, 128125,150000, 300000
-                                          };
-// extended bsr table--currently not used										  
-const uint32_t Extended_BSR_TABLE[BSR_TABLE_SIZE] = {0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,
-                                                     181,223,274,337,414,509,625,769,945,1162,1429,
-                                                     1757,2161,2657,3267,4017,4940,6074,7469,9185,
-                                                     11294,13888,17077,20999,25822,31752,39045,48012,
-                                                     59039,72598,89272,109774,134986,165989,204111,
-                                                     250990,308634,379519,466683,573866,705666,867737,
-                                                     1067031,1312097,1613447,1984009,2439678,3000000,
-                                                     6000000};
-
-//#define MAX_SIZE_OF_AGG3   576 
-//#define MAX_SIZE_OF_AGG2   288
-//#define MAX_SIZE_OF_AGG1   144
-//#define MAX_SIZE_OF_AGG0   72
-
-/*
- * If the CQI is low, then scheduler will use a higher aggregation level and lower aggregation level otherwise
- * this is also dependent to transmission mode, where an offset could be defined
- */
-// the follwoing three tables are calibrated for TXMODE 1 and 2
-const uint8_t cqi2fmt0_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE]= { 
-  {3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0}, // 1.4_DCI0_CRC_Size= 37 bits
-  //{3, 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0}, // 5_DCI0_CRC_SIZE = 41
-  {3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0}, // 5_DCI0_CRC_SIZE = 41
-  {3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0}, // 10_DCI0_CRC_SIZE = 43
-  {3, 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0}   // 20_DCI0_CRC_SIZE = 44
-};
-const uint8_t cqi2fmt1x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE]= { 
-  {3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0}, // 1.4_DCI0_CRC_Size < 38 bits
-  {3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0}, // 5_DCI0_CRC_SIZE  < 43
-  {3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0}, // 10_DCI0_CRC_SIZE  < 47
-  {3, 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0}   // 20_DCI0_CRC_SIZE  < 55
-};
-const uint8_t cqi2fmt2x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE]= { 
-  {3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0}, // 1.4_DCI0_CRC_Size= 47 bits
-  {3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0}, // 5_DCI0_CRC_SIZE = 55
-  {3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0}, // 10_DCI0_CRC_SIZE = 59
-  {3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0}   // 20_DCI0_CRC_SIZE = 64
-};
-
-//uint32_t EBSR_Level[63]={0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,181};
-
-MAC_xface *mac_xface;
-
-uint32_t RRC_CONNECTION_FLAG;
-
-UE_MAC_INST *UE_mac_inst; //[NB_MODULE_MAX];
-eNB_MAC_INST *eNB_mac_inst; //[NB_MODULE_MAX];
-MAC_RLC_XFACE *Mac_rlc_xface;
-
-/// Primary component carrier index of eNB
-int pCC_id[NUMBER_OF_eNB_MAX];
-
-
-
-eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
-eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
-
-/*
-#ifndef USER_MODE
-RRC_XFACE *Rrc_xface;
-MAC_xface *mac_xface;
-#else
-#include "PHY_INTERFACE/extern.h"
-#include "RRC/LITE/extern.h"
-#endif
-*/
-
-uint8_t Is_rrc_registered;
-
-#ifdef OPENAIR2
-unsigned char NB_eNB_INST=0;
-unsigned char NB_UE_INST=0;
-unsigned char NB_RN_INST=0;
-unsigned char NB_INST=0;
-#endif
-
-
-DCI0_5MHz_TDD_1_6_t       UL_alloc_pdu;
-
-DCI1A_5MHz_TDD_1_6_t      DLSCH_alloc_pdu1A;
-DCI1A_5MHz_TDD_1_6_t      RA_alloc_pdu;
-DCI1A_5MHz_TDD_1_6_t      BCCH_alloc_pdu;
-
-DCI1A_5MHz_TDD_1_6_t      CCCH_alloc_pdu;
-DCI1_5MHz_TDD_t           DLSCH_alloc_pdu;
-
-#if defined(Rel10) || defined(Rel14)
-DCI1C_5MHz_t                 MCCH_alloc_pdu;
-#endif
-
-DCI0_5MHz_FDD_t       UL_alloc_pdu_fdd;
-
-DCI1A_5MHz_FDD_t      DLSCH_alloc_pdu1A_fdd;
-DCI1A_5MHz_FDD_t      RA_alloc_pdu_fdd;
-DCI1A_5MHz_FDD_t      BCCH_alloc_pdu_fdd;
-
-DCI1A_5MHz_FDD_t      CCCH_alloc_pdu_fdd;
-DCI1_5MHz_FDD_t       DLSCH_alloc_pdu_fdd;
-
-DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu1;
-DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
-
-DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
-
-#endif
-
-

openair2/RRC/NR_UE/rrc_types.h → openair2/RRC/NR_UE/L2_interface_ue.c

@@ -19,53 +19,39 @@
  *      contact@openairinterface.org
  */
 
-/*! \file rrc_types.h
-* \brief rrc types and subtypes
-* \author Navid Nikaein and Raymond Knopp
-* \date 2011 - 2014
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr, raymond.knopp@eurecom.fr
-*/
-
-#ifndef NR_RRC_TYPES_H_
-#define NR_RRC_TYPES_H_
-
-typedef enum nr_rrc_state_e {
-  //RRC_STATE_INACTIVE=0,
-  //RRC_STATE_IDLE,
-  //RRC_STATE_CONNECTED,
-
-  //RRC_STATE_FIRST = RRC_STATE_INACTIVE,
-  //RRC_STATE_LAST = RRC_STATE_CONNECTED,
-	RRC_STATE_IDLE 	= 0,
-	RRC_STATE_INACTIVE,
-	RRC_STATE_CONNECTED,
-
-	RRC_STATE_FIRST = RRC_STATE_IDLE,
-	RRC_STATE_LAST	= RRC_STATE_CONNECTED
-
-} nr_rrc_state_t;
+/*! \file l2_interface.c
+ * \brief layer 2 interface, used to support different RRC sublayer
+ * \author Raymond Knopp and Navid Nikaein
+ * \date 2010-2014
+ * \version 1.0
+ * \company Eurecom
+ * \email: raymond.knopp@eurecom.fr
+ */
 
-typedef enum nr_rrc_sub_state_e {
-  //RRC_SUB_STATE_INACTIVE=0,
+#include "rrc_defs.h"
+#include "rrc_proto.h"
 
-  //RRC_SUB_STATE_IDLE_SEARCHING,
-  //RRC_SUB_STATE_IDLE_RECEIVING_SIB,
-  //RRC_SUB_STATE_IDLE_SIB_COMPLETE,
-  //RRC_SUB_STATE_IDLE_CONNECTING,
-  //RRC_SUB_STATE_IDLE,
+typedef uint32_t channel_t;
 
-  //RRC_SUB_STATE_CONNECTED,
+int8_t
+nr_mac_rrc_data_ind_ue(
+    const module_id_t     module_id,
+    const int             CC_id,
+    const uint8_t         gNB_index,
+    const uint32_t*       frameP,
+    const channel_t       channel,
+    const uint8_t*        pduP,
+    const sdu_size_t      pdu_len){
 
-  //RRC_SUB_STATE_INACTIVE_FIRST = RRC_SUB_STATE_INACTIVE,
-  //RRC_SUB_STATE_INACTIVE_LAST = RRC_SUB_STATE_INACTIVE,
+    switch(channel){
+        case NR_BCCH_BCH:
+            nr_rrc_ue_decode_NR_BCCH_BCH_Message( module_id, gNB_index, (uint8_t*)pduP, pdu_len);
+            break;
+        default:
+            break;
+    }
 
-  //RRC_SUB_STATE_IDLE_FIRST = RRC_SUB_STATE_IDLE_SEARCHING,
-  //RRC_SUB_STATE_IDLE_LAST = RRC_SUB_STATE_IDLE,
 
-  //RRC_SUB_STATE_CONNECTED_FIRST = RRC_SUB_STATE_CONNECTED,
-  //RRC_SUB_STATE_CONNECTED_LAST = RRC_SUB_STATE_CONNECTED,
-} nr_rrc_sub_state_t;
+    return(0);
 
-#endif /* RRC_TYPES_H_ */
+}
\ No newline at end of file

openair2/RRC/NR_UE/defs.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 RRC/LITE/defs.h
-* \brief RRC struct definitions and function prototypes
-* \author Navid Nikaein and Raymond Knopp
-* \date 2010 - 2014
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr, raymond.knopp@eurecom.fr
-*/
-
-#ifndef __OPENAIR_NR_RRC_DEFS_H__
-#define __OPENAIR_NR_RRC_DEFS_H__
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "collection/tree.h"
-#include "rrc_types.h"
-#include "PHY/defs.h"
-#include "LAYER2/RLC/rlc.h"
-
-#include "COMMON/platform_constants.h"
-#include "COMMON/platform_types.h"
-
-#include "LAYER2/MAC/defs.h"
-
-#include "SystemInformationBlockType1.h"
-#include "SystemInformation.h"
-#include "RRCConnectionReconfiguration.h"
-#include "RRCConnectionReconfigurationComplete.h"
-#include "RRCConnectionSetup.h"
-#include "RRCConnectionSetupComplete.h"
-#include "RRCConnectionRequest.h"
-#include "RRCConnectionReestablishmentRequest.h"
-#include "BCCH-DL-SCH-Message.h"
-#include "BCCH-BCH-Message.h"
-#if defined(Rel10) || defined(Rel14)
-#include "MCCH-Message.h"
-#include "MBSFNAreaConfiguration-r9.h"
-#include "SCellToAddMod-r10.h"
-#endif
-#include "AS-Config.h"
-#include "AS-Context.h"
-#include "UE-EUTRA-Capability.h"
-#include "MeasResults.h"
-
-/* for ImsiMobileIdentity_t */
-#include "MobileIdentity.h"
-
-
-typedef struct NR_UE_RRC_INST_s {
-  nr_rrc_state_t     rrc_state;
-  nr_rrc_sub_state_t rrc_sub_state;
-#if 0
-  OAI_UECapability_t *UECap;
-  uint8_t *UECapability;
-  uint8_t UECapability_size;
-  UE_RRC_INFO Info[NB_SIG_CNX_UE];
-  SRB_INFO Srb0[NB_SIG_CNX_UE];
-  SRB_INFO_TABLE_ENTRY Srb1[NB_CNX_UE];
-  SRB_INFO_TABLE_ENTRY Srb2[NB_CNX_UE];
-  HANDOVER_INFO_UE HandoverInfoUe;
-  uint8_t *SIB1[NB_CNX_UE];
-  uint8_t sizeof_SIB1[NB_CNX_UE];
-  uint8_t *SI[NB_CNX_UE];
-  uint8_t sizeof_SI[NB_CNX_UE];
-  uint8_t SIB1Status[NB_CNX_UE];
-  uint8_t SIStatus[NB_CNX_UE];
-  SystemInformationBlockType1_t *sib1[NB_CNX_UE];
-  SystemInformation_t *si[NB_CNX_UE]; //!< Temporary storage for an SI message. Decoding happens in decode_SI().
-  SystemInformationBlockType2_t *sib2[NB_CNX_UE];
-  SystemInformationBlockType3_t *sib3[NB_CNX_UE];
-  SystemInformationBlockType4_t *sib4[NB_CNX_UE];
-  SystemInformationBlockType5_t *sib5[NB_CNX_UE];
-  SystemInformationBlockType6_t *sib6[NB_CNX_UE];
-  SystemInformationBlockType7_t *sib7[NB_CNX_UE];
-  SystemInformationBlockType8_t *sib8[NB_CNX_UE];
-  SystemInformationBlockType9_t *sib9[NB_CNX_UE];
-  SystemInformationBlockType10_t *sib10[NB_CNX_UE];
-  SystemInformationBlockType11_t *sib11[NB_CNX_UE];
-
-#if defined(Rel10) || defined(Rel14)
-  uint8_t                           MBMS_flag;
-  uint8_t *MCCH_MESSAGE[NB_CNX_UE];
-  uint8_t sizeof_MCCH_MESSAGE[NB_CNX_UE];
-  uint8_t MCCH_MESSAGEStatus[NB_CNX_UE];
-  MBSFNAreaConfiguration_r9_t       *mcch_message[NB_CNX_UE];
-  SystemInformationBlockType12_r9_t *sib12[NB_CNX_UE];
-  SystemInformationBlockType13_r9_t *sib13[NB_CNX_UE];
-#endif
-#ifdef CBA
-  uint8_t                         num_active_cba_groups;
-  uint16_t                        cba_rnti[NUM_MAX_CBA_GROUP];
-#endif
-  uint8_t                         num_srb;
-  struct SRB_ToAddMod             *SRB1_config[NB_CNX_UE];
-  struct SRB_ToAddMod             *SRB2_config[NB_CNX_UE];
-  struct DRB_ToAddMod             *DRB_config[NB_CNX_UE][8];
-  rb_id_t                         *defaultDRB; // remember the ID of the default DRB
-  MeasObjectToAddMod_t            *MeasObj[NB_CNX_UE][MAX_MEAS_OBJ];
-  struct ReportConfigToAddMod     *ReportConfig[NB_CNX_UE][MAX_MEAS_CONFIG];
-  struct QuantityConfig           *QuantityConfig[NB_CNX_UE];
-  struct MeasIdToAddMod           *MeasId[NB_CNX_UE][MAX_MEAS_ID];
-  MEAS_REPORT_LIST      *measReportList[NB_CNX_UE][MAX_MEAS_ID];
-  uint32_t           measTimer[NB_CNX_UE][MAX_MEAS_ID][6]; // 6 neighboring cells
-  RSRP_Range_t                    s_measure;
-  struct MeasConfig__speedStatePars *speedStatePars;
-  struct PhysicalConfigDedicated  *physicalConfigDedicated[NB_CNX_UE];
-  struct SPS_Config               *sps_Config[NB_CNX_UE];
-  MAC_MainConfig_t                *mac_MainConfig[NB_CNX_UE];
-  MeasGapConfig_t                 *measGapConfig[NB_CNX_UE];
-  double                          filter_coeff_rsrp; // [7] ???
-  double                          filter_coeff_rsrq; // [7] ???
-  float                           rsrp_db[7];
-  float                           rsrq_db[7];
-  float                           rsrp_db_filtered[7];
-  float                           rsrq_db_filtered[7];
-#if defined(ENABLE_SECURITY)
-  /* KeNB as computed from parameters within USIM card */
-  uint8_t kenb[32];
-  uint8_t nh[32];
-  int8_t  nh_ncc;
-#endif
-
-  /* Used integrity/ciphering algorithms */
-  CipheringAlgorithm_r12_t                          ciphering_algorithm;
-  e_SecurityAlgorithmConfig__integrityProtAlgorithm integrity_algorithm;
-#endif
-
-	MeasConfig_t 		*meas_config;
-	CellGroupConfig_t 	*cell_group_config;
-	RadioBearerConfig_t *radio_bearer_config;
-    
-} NR_UE_RRC_INST_t;
-
-#include "proto.h"
-
-#endif
-/** @} */

openair2/RRC/NR_UE/main_ue.c

 
 
 #include "defs.h"
-#include "proto.h"
-#include "extern.h"
-#include "assertions.h"
-
-
-
-
+#include "rrc_proto.h"
 
 int nr_l3_init_ue(void){
     LOG_I(RRC, "[MAIN] NR UE MAC initialization...\n");

openair2/RRC/NR_UE/rrc_UE.c

@@ -31,216 +31,159 @@
 #define RRC_UE
 #define RRC_UE_C
 
-
-//  header files for RRC message for NR might be change to add prefix in from of the file name.
-#include "assertions.h"
-#include "hashtable.h"
-#include "asn1_conversions.h"
-#include "defs.h"
-#include "PHY/TOOLS/dB_routines.h"
-#include "extern.h"
-#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-#include "LAYER2/RLC/rlc.h"
-#include "COMMON/mac_rrc_primitives.h"
-#include "UTIL/LOG/log.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
-#ifndef CELLULAR
-#include "RRC/LITE/MESSAGES/asn1_msg.h"
-#endif
-#include "RRCConnectionRequest.h"
-#include "RRCConnectionReconfiguration.h"
-#include "UL-CCCH-Message.h"
-#include "DL-CCCH-Message.h"
-#include "UL-DCCH-Message.h"
-#include "DL-DCCH-Message.h"
-#include "BCCH-DL-SCH-Message.h"
-#include "PCCH-Message.h"
-#if defined(Rel10) || defined(Rel14)
-#include "MCCH-Message.h"
-#endif
-#include "MeasConfig.h"
-#include "MeasGapConfig.h"
-#include "MeasObjectEUTRA.h"
-#include "TDD-Config.h"
-#include "UECapabilityEnquiry.h"
-#include "UE-CapabilityRequest.h"
-#include "RRC/NAS/nas_config.h"
-#include "RRC/NAS/rb_config.h"
-#if ENABLE_RAL
-#include "rrc_UE_ral.h"
-#endif
-
-#if defined(ENABLE_SECURITY)
-# include "UTIL/OSA/osa_defs.h"
-#endif
-
-
-#if defined(ENABLE_ITTI)
-#include "intertask_interface.h"
-#endif
-
-
-
-// from NR SRB3
-uint8_t nr_rrc_ue_decode_dcch(
-    const uint8_t *buffer,
-    const uint32_t size
-){
-    //  uper_decode by nr R15 rrc_connection_reconfiguration
-    
-    NR_RRC_DL_DCCH_Message_t *nr_dl_dcch_msg = (NR_RRC_DL_DCCH_Message_t *)0;
-
-    uper_decode(NULL,
-                &asn_DEF_NR_RRC_DL_DCCH_Message,    //might be added prefix later
-                (void**)&nr_dl_dcch_msg,
-                (uint8_t *)buffer,
-                size, 0, 0); 
-
-    if(nr_dl_dcch_msg != NULL){
-        switch(nr_dl_dcch_msg->message.present){            
-            case DL_DCCH_MessageType_PR_c1:
-
-                switch(nr_dl_dcch_msg->message.choice.c1.present){
-                    case DL_DCCH_MessageType__c1_PR_rrcReconfiguration:
-                        nr_rrc_ue_process_rrcReconfiguration(&nr_dl_dcch_msg->message.choice.c1.choice.rrcReconfiguration);
-                        break;
-
-                    case DL_DCCH_MessageType__c1_PR_NOTHING:
-                    case DL_DCCH_MessageType__c1_PR_spare15:
-                    case DL_DCCH_MessageType__c1_PR_spare14:
-                    case DL_DCCH_MessageType__c1_PR_spare13:
-                    case DL_DCCH_MessageType__c1_PR_spare12:
-                    case DL_DCCH_MessageType__c1_PR_spare11:
-                    case DL_DCCH_MessageType__c1_PR_spare10:
-                    case DL_DCCH_MessageType__c1_PR_spare9:
-                    case DL_DCCH_MessageType__c1_PR_spare8:
-                    case DL_DCCH_MessageType__c1_PR_spare7:
-                    case DL_DCCH_MessageType__c1_PR_spare6:
-                    case DL_DCCH_MessageType__c1_PR_spare5:
-                    case DL_DCCH_MessageType__c1_PR_spare4:
-                    case DL_DCCH_MessageType__c1_PR_spare3:
-                    case DL_DCCH_MessageType__c1_PR_spare2:
-                    case DL_DCCH_MessageType__c1_PR_spare1:
-                    default:
-                        //  not support or unuse
-                        break;
-                }   
-                break;
-            case DL_DCCH_MessageType_PR_NOTHING:
-            case DL_DCCH_MessageType_PR_messageClassExtension:
-            default:
-                //  not support or unuse
-                break;
-        }
-        
-        //  release memory allocation
-        free(nr_dl_dcch_msg);
-    }else{
-        //  log..
-    }
-
-    return 0;
-
-}
+#include "rrc_list.h"
+#include "rrc_defs.h"
+#include "rrc_proto.h"
+#include "rrc_vars.h"
+#include "LAYER2/NR_MAC_UE/proto.h"
 
 // from LTE-RRC DL-DCCH RRCConnectionReconfiguration nr-secondary-cell-group-config (encoded)
-uint8_t nr_rrc_ue_decode_secondary_cellgroup_config(
+int8_t nr_rrc_ue_decode_secondary_cellgroup_config(
     const uint8_t *buffer,
     const uint32_t size
 ){
-    CellGroupConfig_t *cellGroupConfig = (CellGroupConfig_t *)0;
+    NR_CellGroupConfig_t *cellGroupConfig = NULL;
 
     uper_decode(NULL,
-                &asn_DEF_CellGroupConfig,   //might be added prefix later
+                &asn_DEF_NR_CellGroupConfig,   //might be added prefix later
                 (void **)&cellGroupConfig,
                 (uint8_t *)buffer,
                 size, 0, 0); 
 
-    if(NR_UE_rrc_inst->cell_group_config == (CellGroupConfig_t *)0){
+    if(NR_UE_rrc_inst->cell_group_config == NULL){
         NR_UE_rrc_inst->cell_group_config = cellGroupConfig;
         nr_rrc_ue_process_scg_config(cellGroupConfig);
     }else{
         nr_rrc_ue_process_scg_config(cellGroupConfig);
-        asn_DEF_CellGroupConfig.free_struct(asn_DEF_CellGroupConfig, cellGroupConfig, 0);
+        //asn_DEF_NR_CellGroupConfig.free_struct(asn_DEF_NR_CellGroupConfig, cellGroupConfig, 0);
+        SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)cellGroupConfig, 0);
     }
 
-    nr_rrc_mac_config_req_ue(); 
+    //nr_rrc_mac_config_req_ue( module_id_t module_id, int CC_id, uint8_t gNB_index, NR_MIB_t *mibP, NR_MAC_CellGroupConfig_t *mac_cell_group_configP, NR_PhysicalCellGroupConfig_t *phy_cell_group_configP, NR_SpCellConfig_t *spcell_configP );
+
+    return 0;
 }
 
 
 // from LTE-RRC DL-DCCH RRCConnectionReconfiguration nr-secondary-cell-group-config (decoded)
 // RRCReconfiguration
-uint8_t nr_rrc_ue_process_rrcReconfiguration(RRCReconfiguration_t *rrcReconfiguration){
+int8_t nr_rrc_ue_process_rrcReconfiguration(NR_RRCReconfiguration_t *rrcReconfiguration){
 
-    switch(rrcReconfiguration.criticalExtensions.present){
-        case RRCReconfiguration__criticalExtensions_PR_rrcReconfiguration:
-            if(rrcReconfiguration.criticalExtensions.rrcReconfiguration->radioBearerConfig != (RadioBearerConfig_t *)0){
-                if(NR_UE_rrc_inst->radio_bearer_config == (RadioBearerConfig_t *)0){
-                    NR_UE_rrc_inst->radio_bearer_config = rrcReconfiguration->radioBearerConfig;                
+    switch(rrcReconfiguration->criticalExtensions.present){
+        case NR_RRCReconfiguration__criticalExtensions_PR_rrcReconfiguration:
+            if(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.radioBearerConfig != NULL){
+                if(NR_UE_rrc_inst->radio_bearer_config == NULL){
+                    NR_UE_rrc_inst->radio_bearer_config = rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.radioBearerConfig;                
                 }else{
-                    nr_rrc_ue_process_radio_bearer_config(rrcReconfiguration->radioBearerConfig);
+                    nr_rrc_ue_process_radio_bearer_config(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.radioBearerConfig);
                 }
             }
 
-            if(rrcReconfiguration.criticalExtensions.rrcReconfiguration->secondaryCellGroup != (OCTET_STRING_t *)0){
-                CellGroupConfig_t *cellGroupConfig = (CellGroupConfig_t *)0;
+            if(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.secondaryCellGroup != NULL){
+                NR_CellGroupConfig_t *cellGroupConfig = NULL;
                 uper_decode(NULL,
-                            &asn_DEF_CellGroupConfig,   //might be added prefix later
+                            &asn_DEF_NR_CellGroupConfig,   //might be added prefix later
                             (void **)&cellGroupConfig,
-                            (uint8_t *)rrcReconfiguration->secondaryCellGroup->buffer,
-                            rrcReconfiguration->secondaryCellGroup.size, 0, 0); 
+                            (uint8_t *)rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.secondaryCellGroup->buf,
+                            rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.secondaryCellGroup->size, 0, 0); 
 
-                if(NR_UE_rrc_inst->cell_group_config == (CellGroupConfig_t *)0){
+                if(NR_UE_rrc_inst->cell_group_config == NULL){
                     //  first time receive the configuration, just use the memory allocated from uper_decoder. TODO this is not good implementation, need to maintain RRC_INST own structure every time.
                     NR_UE_rrc_inst->cell_group_config = cellGroupConfig;
                     nr_rrc_ue_process_scg_config(cellGroupConfig);
                 }else{
                     //  after first time, update it and free the memory after.
                     nr_rrc_ue_process_scg_config(cellGroupConfig);
-                    asn_DEF_CellGroupConfig.free_struct(asn_DEF_CellGroupConfig, cellGroupConfig, 0);
+                    //asn_DEF_NR_CellGroupConfig.free_struct(asn_DEF_NR_CellGroupConfig, cellGroupConfig, 0);
+                    SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)cellGroupConfig, 0);
                 }
                 
             }
 
-            if(rrcReconfiguration.criticalExtensions.rrcReconfiguration->measConfig != (MeasConfig *)0){
-                if(NR_UE_rrc_inst->meas_config == (MeasConfig_t *)0){
-                    NR_UE_rrc_inst->meas_config = rrcReconfiguration->measConfig;
+            if(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.measConfig != NULL){
+                if(NR_UE_rrc_inst->meas_config == NULL){
+                    NR_UE_rrc_inst->meas_config = rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.measConfig;
                 }else{
                     //  if some element need to be updated
-                    nr_rrc_ue_process_meas_config(rrcReconfiguration->measConfig);
+                    nr_rrc_ue_process_meas_config(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.measConfig);
                 }
                
             }
 
-            if(rrcReconfiguration.criticalExtensions.rrcReconfiguration->lateNonCriticalExtension != (OCTET_STRING_t *)0){
+            if(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.lateNonCriticalExtension != NULL){
                 //  unuse now
             }
 
-            if(rrcReconfiguration.criticalExtensions.rrcReconfiguration->nonCriticalExtension != (RRCReconfiguration_IEs__nonCriticalExtension *)0){
+            if(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration.nonCriticalExtension != NULL){
                 // unuse now
             }
             break;
-        case RRCReconfiguration__criticalExtensions_PR_NOTHING:
-        case RRCReconfiguration__criticalExtensions_PR_criticalExtensionsFuture:
+        case NR_RRCReconfiguration__criticalExtensions_PR_NOTHING:
+        case NR_RRCReconfiguration__criticalExtensions_PR_criticalExtensionsFuture:
         default:
             break;
     }
-    nr_rrc_mac_config_req_ue(); 
+    //nr_rrc_mac_config_req_ue(); 
+
+    return 0;
 }
 
-uint8_t nr_rrc_ue_process_meas_config(MeasConfig_t *meas_config){
+int8_t nr_rrc_ue_process_meas_config(NR_MeasConfig_t *meas_config){
 
+    return 0;
 }
 
-uint8_t nr_rrc_ue_process_scg_config(CellGroupConfig_t *cell_group_config){
+int8_t nr_rrc_ue_process_scg_config(NR_CellGroupConfig_t *cell_group_config){
+    int i;
+    if(NR_UE_rrc_inst->cell_group_config==NULL){
+        //  initial list
+      
+        if(cell_group_config->spCellConfig != NULL){
+            if(cell_group_config->spCellConfig->spCellConfigDedicated != NULL){
+                if(cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList != NULL){
+                    for(i=0; i<cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count; ++i){
+                        RRC_LIST_MOD_ADD(NR_UE_rrc_inst->BWP_Downlink_list, cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[i], bwp_Id);
+                    }
+                }
+            }
+        } 
+       
 
+    }else{
+        //  maintain list
+        if(cell_group_config->spCellConfig != NULL){
+            if(cell_group_config->spCellConfig->spCellConfigDedicated != NULL){
+                //  process element of list to be add by RRC message
+                if(cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList != NULL){
+                    for(i=0; i<cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count; ++i){
+                        RRC_LIST_MOD_ADD(NR_UE_rrc_inst->BWP_Downlink_list, cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[i], bwp_Id);
+                    }
+                }
+                
+
+                //  process element of list to be release by RRC message
+                if(cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToReleaseList != NULL){
+                    for(i=0; i<cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToReleaseList->list.count; ++i){
+                        NR_BWP_Downlink_t *freeP = NULL;
+                        RRC_LIST_MOD_REL(NR_UE_rrc_inst->BWP_Downlink_list, bwp_Id, *cell_group_config->spCellConfig->spCellConfigDedicated->downlinkBWP_ToReleaseList->list.array[i], freeP);
+                        if(freeP != NULL){
+                            SEQUENCE_free(&asn_DEF_NR_BWP_Downlink, (void *)freeP, 0);
+                        }
+                    }
+                }
+            }
+        }
+    } 
+
+    return 0;
 }
-uint8_t nr_rrc_ue_process_radio_bearer_config(RadioBearerConfig_t *radio_bearer_config){
+int8_t nr_rrc_ue_process_radio_bearer_config(NR_RadioBearerConfig_t *radio_bearer_config){
 
+    return 0;
 }
 
 
-uint8_t openair_rrc_top_init_ue_nr(void){
+int8_t openair_rrc_top_init_ue_nr(void){
 
     if(NB_NR_UE_INST > 0){
         NR_UE_rrc_inst = (NR_UE_RRC_INST_t *)malloc(NB_NR_UE_INST * sizeof(NR_UE_RRC_INST_t));
@@ -248,29 +191,206 @@ uint8_t openair_rrc_top_init_ue_nr(void){
 
         // fill UE-NR-Capability @ UE-CapabilityRAT-Container here.
 
-
+        //  init RRC lists
+        RRC_LIST_INIT(NR_UE_rrc_inst->RLC_Bearer_Config_list, NR_maxLC_ID);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SchedulingRequest_list, NR_maxNrofSR_ConfigPerCellGroup);
+        RRC_LIST_INIT(NR_UE_rrc_inst->TAG_list, NR_maxNrofTAGs);
+        RRC_LIST_INIT(NR_UE_rrc_inst->TDD_UL_DL_SlotConfig_list, NR_maxNrofSlots);
+        RRC_LIST_INIT(NR_UE_rrc_inst->BWP_Downlink_list, NR_maxNrofBWPs);
+        RRC_LIST_INIT(NR_UE_rrc_inst->ControlResourceSet_list[0], 3);   //  for init-dl-bwp
+        RRC_LIST_INIT(NR_UE_rrc_inst->ControlResourceSet_list[1], 3);   //  for dl-bwp id=0
+        RRC_LIST_INIT(NR_UE_rrc_inst->ControlResourceSet_list[2], 3);   //  for dl-bwp id=1
+        RRC_LIST_INIT(NR_UE_rrc_inst->ControlResourceSet_list[3], 3);   //  for dl-bwp id=2
+        RRC_LIST_INIT(NR_UE_rrc_inst->ControlResourceSet_list[4], 3);   //  for dl-bwp id=3
+        RRC_LIST_INIT(NR_UE_rrc_inst->SearchSpace_list[0], 10);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SearchSpace_list[1], 10);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SearchSpace_list[2], 10);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SearchSpace_list[3], 10);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SearchSpace_list[4], 10);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SlotFormatCombinationsPerCell_list[0], NR_maxNrofAggregatedCellsPerCellGroup);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SlotFormatCombinationsPerCell_list[1], NR_maxNrofAggregatedCellsPerCellGroup);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SlotFormatCombinationsPerCell_list[2], NR_maxNrofAggregatedCellsPerCellGroup);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SlotFormatCombinationsPerCell_list[3], NR_maxNrofAggregatedCellsPerCellGroup);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SlotFormatCombinationsPerCell_list[4], NR_maxNrofAggregatedCellsPerCellGroup);
+        RRC_LIST_INIT(NR_UE_rrc_inst->TCI_State_list[0], NR_maxNrofTCI_States);
+        RRC_LIST_INIT(NR_UE_rrc_inst->TCI_State_list[1], NR_maxNrofTCI_States);
+        RRC_LIST_INIT(NR_UE_rrc_inst->TCI_State_list[2], NR_maxNrofTCI_States);
+        RRC_LIST_INIT(NR_UE_rrc_inst->TCI_State_list[3], NR_maxNrofTCI_States);
+        RRC_LIST_INIT(NR_UE_rrc_inst->TCI_State_list[4], NR_maxNrofTCI_States);
+        RRC_LIST_INIT(NR_UE_rrc_inst->RateMatchPattern_list[0], NR_maxNrofRateMatchPatterns);
+        RRC_LIST_INIT(NR_UE_rrc_inst->RateMatchPattern_list[1], NR_maxNrofRateMatchPatterns);
+        RRC_LIST_INIT(NR_UE_rrc_inst->RateMatchPattern_list[2], NR_maxNrofRateMatchPatterns);
+        RRC_LIST_INIT(NR_UE_rrc_inst->RateMatchPattern_list[3], NR_maxNrofRateMatchPatterns);
+        RRC_LIST_INIT(NR_UE_rrc_inst->RateMatchPattern_list[4], NR_maxNrofRateMatchPatterns);
+        RRC_LIST_INIT(NR_UE_rrc_inst->ZP_CSI_RS_Resource_list[0], NR_maxNrofZP_CSI_RS_Resources);
+        RRC_LIST_INIT(NR_UE_rrc_inst->ZP_CSI_RS_Resource_list[1], NR_maxNrofZP_CSI_RS_Resources);
+        RRC_LIST_INIT(NR_UE_rrc_inst->ZP_CSI_RS_Resource_list[2], NR_maxNrofZP_CSI_RS_Resources);
+        RRC_LIST_INIT(NR_UE_rrc_inst->ZP_CSI_RS_Resource_list[3], NR_maxNrofZP_CSI_RS_Resources);
+        RRC_LIST_INIT(NR_UE_rrc_inst->ZP_CSI_RS_Resource_list[4], NR_maxNrofZP_CSI_RS_Resources);
+        RRC_LIST_INIT(NR_UE_rrc_inst->Aperidic_ZP_CSI_RS_ResourceSet_list[0], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->Aperidic_ZP_CSI_RS_ResourceSet_list[1], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->Aperidic_ZP_CSI_RS_ResourceSet_list[2], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->Aperidic_ZP_CSI_RS_ResourceSet_list[3], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->Aperidic_ZP_CSI_RS_ResourceSet_list[4], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SP_ZP_CSI_RS_ResourceSet_list[0], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SP_ZP_CSI_RS_ResourceSet_list[1], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SP_ZP_CSI_RS_ResourceSet_list[2], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SP_ZP_CSI_RS_ResourceSet_list[3], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->SP_ZP_CSI_RS_ResourceSet_list[4], NR_maxNrofZP_CSI_RS_Sets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->NZP_CSI_RS_Resource_list, NR_maxNrofNZP_CSI_RS_Resources);
+        RRC_LIST_INIT(NR_UE_rrc_inst->NZP_CSI_RS_ResourceSet_list, NR_maxNrofNZP_CSI_RS_ResourceSets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->CSI_IM_Resource_list, NR_maxNrofCSI_IM_Resources);
+        RRC_LIST_INIT(NR_UE_rrc_inst->CSI_IM_ResourceSet_list, NR_maxNrofCSI_IM_ResourceSets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->CSI_SSB_ResourceSet_list, NR_maxNrofCSI_SSB_ResourceSets);
+        RRC_LIST_INIT(NR_UE_rrc_inst->CSI_ResourceConfig_list, NR_maxNrofCSI_ResourceConfigurations);
+        RRC_LIST_INIT(NR_UE_rrc_inst->CSI_ReportConfig_list, NR_maxNrofCSI_ReportConfigurations);
     }else{
-        NR_UE_rrc_inst = (NR_UE_RRC_INST_t *)0;
+        NR_UE_rrc_inst = NULL;
     }
+
+    return 0;
 }
 
 
-uint8_t nr_ue_process_rlc_bearer_list(CellGroupConfig_t *cell_group_config){
+int8_t nr_ue_process_rlc_bearer_list(NR_CellGroupConfig_t *cell_group_config){
 
+    return 0;
 };
 
-uint8_t nr_ue_process_secondary_cell_list(CellGroupConfig_t *cell_group_config){
+int8_t nr_ue_process_secondary_cell_list(NR_CellGroupConfig_t *cell_group_config){
 
+    return 0;
 };
 
-uint8_t nr_ue_process_mac_cell_group_config(MAC_CellGroupConfig_t *mac_cell_group_config){
+int8_t nr_ue_process_mac_cell_group_config(NR_MAC_CellGroupConfig_t *mac_cell_group_config){
 
+    return 0;
 };
 
-uint8_t nr_ue_process_physical_cell_group_config(PhysicalCellGroupConfig_t *phy_cell_group_config){
+int8_t nr_ue_process_physical_cell_group_config(NR_PhysicalCellGroupConfig_t *phy_cell_group_config){
 
+    return 0;
 };
 
-uint8_t nr_ue_process_spcell_config(SpCellConfig_t *spcell_config){
+int8_t nr_ue_process_spcell_config(NR_SpCellConfig_t *spcell_config){
 
+    return 0;
 };
+
+/*brief decode BCCH-BCH (MIB) message*/
+int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
+    const module_id_t module_id,
+    const uint8_t     gNB_index,
+    uint8_t           *const bufferP,
+    const uint8_t     buffer_len){
+    int i;
+    NR_BCCH_BCH_Message_t *bcch_message = NULL;
+    NR_MIB_t *mib = NR_UE_rrc_inst->mib;
+
+    asn_dec_rval_t dec_rval = uper_decode_complete( NULL,
+                            &asn_DEF_NR_BCCH_BCH_Message,
+                            (void **)&bcch_message,
+                            (const void *)bufferP,
+                            buffer_len );
+
+    if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
+        LOG_E( RRC, "[UE %"PRIu8"] Failed to decode BCCH_DLSCH_MESSAGE (%zu bits)\n",
+               module_id,
+               dec_rval.consumed );
+
+        for (i=0; i<buffer_len; i++)
+            printf("%02x ",bufferP[i]);
+
+        printf("\n");
+        // free the memory
+        SEQUENCE_free( &asn_DEF_NR_BCCH_BCH_Message, (void *)bcch_message, 1 );
+        return -1;
+    }
+
+    //  copy into rrc instance
+    memcpy( (void *)mib,
+        (void *)&bcch_message->message.choice.mib,
+        sizeof(NR_MIB_t) );
+
+    nr_rrc_mac_config_req_ue( 0, 0, 0, mib, NULL, NULL, NULL);
+
+    return 0;
+}
+
+
+// from NR SRB3
+int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
+    const module_id_t module_id,
+    const uint8_t     gNB_index,
+    const uint8_t    *bufferP,
+    const uint32_t    buffer_len){
+    //  uper_decode by nr R15 rrc_connection_reconfiguration
+    int32_t i;
+    NR_DL_DCCH_Message_t *nr_dl_dcch_msg = NULL;
+
+    asn_dec_rval_t dec_rval = uper_decode(  NULL,
+                                            &asn_DEF_NR_DL_DCCH_Message,    
+                                            (void**)&nr_dl_dcch_msg,
+                                            (uint8_t *)bufferP,
+                                            buffer_len, 0, 0); 
+
+    if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
+        LOG_E( RRC, "[UE %"PRIu8"] Failed to decode NR_DL_DCCH_Message (%zu bits)\n",
+               module_id,
+               dec_rval.consumed );
+
+        for (i=0; i<buffer_len; i++)
+            printf("%02x ",bufferP[i]);
+
+        printf("\n");
+        // free the memory
+        SEQUENCE_free( &asn_DEF_NR_DL_DCCH_Message, (void *)nr_dl_dcch_msg, 1 );
+        return -1;
+    }
+
+    if(nr_dl_dcch_msg != NULL){
+        switch(nr_dl_dcch_msg->message.present){            
+            case NR_DL_DCCH_MessageType_PR_c1:
+
+                switch(nr_dl_dcch_msg->message.choice.c1.present){
+                    case NR_DL_DCCH_MessageType__c1_PR_rrcReconfiguration:
+                        nr_rrc_ue_process_rrcReconfiguration(&nr_dl_dcch_msg->message.choice.c1.choice.rrcReconfiguration);
+                        break;
+
+                    case NR_DL_DCCH_MessageType__c1_PR_NOTHING:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare15:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare14:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare13:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare12:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare11:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare10:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare9:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare8:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare7:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare6:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare5:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare4:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare3:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare2:
+                    case NR_DL_DCCH_MessageType__c1_PR_spare1:
+                    default:
+                        //  not support or unuse
+                        break;
+                }   
+                break;
+            case NR_DL_DCCH_MessageType_PR_NOTHING:
+            case NR_DL_DCCH_MessageType_PR_messageClassExtension:
+            default:
+                //  not support or unuse
+                break;
+        }
+        
+        //  release memory allocation
+        SEQUENCE_free( &asn_DEF_NR_DL_DCCH_Message, (void *)nr_dl_dcch_msg, 1 );
+    }else{
+        //  log..
+    }
+
+    return 0;
+
+}

openair2/RRC/NR_UE/rrc_defs.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 RRC/LITE/defs.h
+* \brief RRC struct definitions and function prototypes
+* \author Navid Nikaein and Raymond Knopp
+* \date 2010 - 2014
+* \version 1.0
+* \company Eurecom
+* \email: navid.nikaein@eurecom.fr, raymond.knopp@eurecom.fr
+*/
+
+#ifndef __OPENAIR_NR_RRC_DEFS_H__
+#define __OPENAIR_NR_RRC_DEFS_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "platform_types.h"
+
+#include "LAYER2/NR_MAC_UE/mac.h"
+#include "rrc_list.h"
+#include "NR_asn_constant.h"
+#include "NR_MeasConfig.h"
+#include "NR_CellGroupConfig.h"
+#include "NR_RadioBearerConfig.h"
+#include "NR_RLC-Bearer-Config.h"
+#include "asn1_constants.h"
+#include "NR_SchedulingRequestToAddMod.h"
+#include "NR_MIB.h"
+#include "NR_BCCH-BCH-Message.h"
+#include "NR_DL-DCCH-Message.h"
+
+#define NB_NR_UE_INST 1
+
+typedef uint32_t channel_t;
+
+typedef struct NR_UE_RRC_INST_s {
+
+    NR_MeasConfig_t        *meas_config;
+    NR_CellGroupConfig_t   *cell_group_config;
+    NR_RadioBearerConfig_t *radio_bearer_config;
+
+    NR_MIB_t *mib;
+  
+    //  lists
+    //  CellGroupConfig.rlc-BearerToAddModList
+    RRC_LIST_TYPE(NR_RLC_Bearer_Config_t, NR_maxLC_ID) RLC_Bearer_Config_list;
+    //  CellGroupConfig.mac-CellGroupConfig.schedulingrequest
+    RRC_LIST_TYPE(NR_SchedulingRequestToAddMod_t, NR_maxNrofSR_ConfigPerCellGroup) SchedulingRequest_list;
+    //  CellGroupConfig.mac-CellGroupConfig.TAG
+    RRC_LIST_TYPE(NR_TAG_ToAddMod_t, NR_maxNrofTAGs) TAG_list;
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.tdduldlslotconfig
+    RRC_LIST_TYPE(NR_TDD_UL_DL_SlotConfig_t, NR_maxNrofSlots) TDD_UL_DL_SlotConfig_list;
+   
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.bwps 
+    RRC_LIST_TYPE(NR_BWP_Downlink_t, NR_maxNrofBWPs) BWP_Downlink_list;
+    //BWP-DownlinkDedicated 0=INIT-DL-BWP, 1..4 for DL-BWPs
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdcchconfig.controlresourceset
+    RRC_LIST_TYPE(NR_ControlResourceSet_t, 3) ControlResourceSet_list[5];
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdcchconfig.searchspace
+    RRC_LIST_TYPE(NR_SearchSpace_t, 10) SearchSpace_list[5];
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdcchconfig.slotformatindicator
+    RRC_LIST_TYPE(NR_SlotFormatCombinationsPerCell_t, NR_maxNrofAggregatedCellsPerCellGroup) SlotFormatCombinationsPerCell_list[5];
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdschconfig
+    RRC_LIST_TYPE(NR_TCI_State_t, NR_maxNrofTCI_States) TCI_State_list[5];
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdschconfig
+    RRC_LIST_TYPE(NR_RateMatchPattern_t, NR_maxNrofRateMatchPatterns) RateMatchPattern_list[5];
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdschconfig
+    RRC_LIST_TYPE(NR_ZP_CSI_RS_Resource_t, NR_maxNrofZP_CSI_RS_Resources) ZP_CSI_RS_Resource_list[5];
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdschconfig
+    RRC_LIST_TYPE(NR_ZP_CSI_RS_ResourceSet_t, NR_maxNrofZP_CSI_RS_Sets) Aperidic_ZP_CSI_RS_ResourceSet_list[5];
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated.initialdlbwp.pdschconfig
+    RRC_LIST_TYPE(NR_ZP_CSI_RS_ResourceSet_t, NR_maxNrofZP_CSI_RS_Sets) SP_ZP_CSI_RS_ResourceSet_list[5];
+
+    //  TODO check the way to implement mutiple list inside bwps
+    //  uplink bwp also
+
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated
+    RRC_LIST_TYPE(NR_NZP_CSI_RS_Resource_t, NR_maxNrofNZP_CSI_RS_Resources) NZP_CSI_RS_Resource_list;
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated
+    RRC_LIST_TYPE(NR_NZP_CSI_RS_ResourceSet_t, NR_maxNrofNZP_CSI_RS_ResourceSets) NZP_CSI_RS_ResourceSet_list;
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated
+    RRC_LIST_TYPE(NR_CSI_IM_Resource_t, NR_maxNrofCSI_IM_Resources) CSI_IM_Resource_list;
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated
+    RRC_LIST_TYPE(NR_CSI_IM_ResourceSet_t, NR_maxNrofCSI_IM_ResourceSets) CSI_IM_ResourceSet_list;
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated
+    RRC_LIST_TYPE(NR_CSI_SSB_ResourceSet_t, NR_maxNrofCSI_SSB_ResourceSets) CSI_SSB_ResourceSet_list;
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated
+    RRC_LIST_TYPE(NR_CSI_ResourceConfig_t, NR_maxNrofCSI_ResourceConfigurations) CSI_ResourceConfig_list;
+    //  CellGroupConfig.spCellConfig.spCellConfigDedicated
+    RRC_LIST_TYPE(NR_CSI_ReportConfig_t, NR_maxNrofCSI_ReportConfigurations) CSI_ReportConfig_list;
+  
+} NR_UE_RRC_INST_t;
+
+#endif
+/** @} */

openair2/RRC/NR_UE/rrc_list.h

+#ifndef _RRC_LIST_H_
+#define _RRC_LIST_H_
+
+
+#define RRC_LIST_TYPE(T, N)     \
+    struct {                    \
+        T *entries[N];          \
+        int next[N];            \
+        int prev[N];            \
+        int start;              \
+        int count;              \
+    }
+
+//  initial function for the certain list, storage number of entry, initial pointer and corresponding links
+#define RRC_LIST_INIT(list, c)                      \
+    do {                                            \
+        int iterator;                               \
+        (list).count = (c);                         \
+        for(iterator=0; iterator<c; ++iterator){    \
+            (list).entries[iterator] = NULL;        \
+            (list).next[iterator] = -1;             \
+            (list).prev[iterator] = -1;             \
+            (list).start = -1;                      \
+        }                                           \
+    }while(0)
+
+
+//  check the entry by id first then update or create new entry.
+#define RRC_LIST_MOD_ADD(list, new, id_name)                                        \
+    do {                                                                            \
+        int iterator;                                                               \
+        for(iterator=(list).start; iterator!=-1; iterator=(list).next[iterator]){   \
+            if((new)->id_name == (list).entries[iterator]->id_name){                \
+                (list).entries[iterator] = (new);                                   \
+                break;                                                              \
+            }                                                                       \
+        }                                                                           \
+        if(iterator==-1){                                                           \
+            for(iterator=0; iterator<(list).count; ++iterator){                     \
+                if((list).entries[iterator] == NULL){                               \
+                    (list).next[iterator] = (list).start;                           \
+                    (list).prev[iterator] = -1;                                     \
+                    if((list).start != -1){                                         \
+                        (list).prev[list.start] = iterator;                         \
+                    }                                                               \
+                    (list).start = iterator;                                        \
+                    (list).entries[iterator] = (new);                               \
+                    break;                                                          \
+                }                                                                   \
+            }                                                                       \
+        }                                                                           \
+    }while(0)
+
+//  search entries by id, unlink from the list and output free pointer for upper function to release memory
+#define RRC_LIST_MOD_REL(list, id_name, id, free)                                   \
+    do{                                                                             \
+        int iterator;                                                               \
+        for(iterator=(list).start; iterator!=-1; iterator=(list).next[iterator]){   \
+            if(id == (list).entries[iterator]->id_name){                            \
+                if((list).prev[iterator] == -1){                                    \
+                    (list).start = (list).next[iterator];                           \
+                }else{                                                              \
+                    (list).next[(list).prev[iterator]] = (list).next[iterator];     \
+                }                                                                   \
+                if((list).next[iterator] != -1){                                    \
+                    (list).prev[(list).next[iterator]] = (list).prev[iterator];     \
+                }                                                                   \
+                (free) = (list).entries[iterator];                                  \
+                (list).entries[iterator] = NULL;                                    \
+                break;                                                              \
+            }                                                                       \
+        }                                                                           \
+    }while(0)
+
+
+#define RRC_LIST_FOREACH(list, i)       \
+        for((i)=(list).start; (i) != -1; (i)=(list).next[i])
+
+#define RRC_LIST_ENTRY(list, i)         \
+        list.entries[i]
+
+#endif
\ No newline at end of file

openair2/RRC/NR_UE/proto.h → openair2/RRC/NR_UE/rrc_proto.h

@@ -30,9 +30,15 @@
 /** \addtogroup _rrc
  *  @{
  */
+#ifndef _RRC_PROTO_H_
+#define _RRC_PROTO_H_
 
-#include "defs.h"
 
+#include "rrc_defs.h"
+#include "NR_RRCReconfiguration.h"
+#include "NR_MeasConfig.h"
+#include "NR_CellGroupConfig.h"
+#include "NR_RadioBearerConfig.h"
 //
 //  main_rrc.c
 //
@@ -44,12 +50,9 @@ int nr_l3_init_ue(void);
 //
 
 /**\brief Initial the top level RRC structure instance*/
-uint8_t openair_rrc_top_init_ue_nr(void);
+int8_t openair_rrc_top_init_ue_nr(void);
+
 
-/**\brief Decode DCCH from gNB, sent from lower layer through SRB3
-   \param buffer encoded DCCH bytes stream message
-   \param size length of buffer*/
-int8_t nr_rrc_ue_decode_dcch(const uint8_t *buffer, const uint32_t size);
 
 /**\brief Decode RRC Connection Reconfiguration, sent from E-UTRA RRC Connection Reconfiguration v1510 carring EN-DC config
    \param buffer  encoded NR-RRC-Connection-Reconfiguration/Secondary-Cell-Group-Config message.
@@ -61,19 +64,44 @@ int8_t nr_rrc_ue_decode_secondary_cellgroup_config(const uint8_t *buffer, const
 
 /**\brief Process NR RRC connection reconfiguration via SRB3
    \param rrcReconfiguration  decoded rrc connection reconfiguration*/
-int8_t nr_rrc_ue_process_rrcReconfiguration(RRCReconfiguration_t *rrcReconfiguration);
+int8_t nr_rrc_ue_process_rrcReconfiguration(NR_RRCReconfiguration_t *rrcReconfiguration);
 
 /**\prief Process measurement config from NR RRC connection reconfiguration message
    \param meas_config   measurement configuration*/
-int8_t nr_rrc_ue_process_meas_config(MeasConfig_t *meas_config);
+int8_t nr_rrc_ue_process_meas_config(NR_MeasConfig_t *meas_config);
 
 /**\prief Process secondary cell group config from NR RRC connection reconfiguration message or EN-DC primitives
    \param cell_group_config   secondary cell group configuration*/
 //TODO check EN-DC function call flow.
-int8_t nr_rrc_ue_process_scg_config(CellGroupConfig_t *cell_group_config);
+int8_t nr_rrc_ue_process_scg_config(NR_CellGroupConfig_t *cell_group_config);
 
 /**\prief Process radio bearer config from NR RRC connection reconfiguration message
    \param radio_bearer_config    radio bearer configuration*/
-int8_t nr_rrc_ue_process_radio_bearer_config(RadioBearerConfig_t *radio_bearer_config);
+int8_t nr_rrc_ue_process_radio_bearer_config(NR_RadioBearerConfig_t *radio_bearer_config);
+
+/**\brief decode NR BCCH-BCH (MIB) message
+   \param module_idP    module id
+   \param gNB_index     gNB index
+   \param sduP          pointer to buffer of ASN message BCCH-BCH
+   \param sdu_len       length of buffer*/
+int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(const module_id_t module_id, const uint8_t gNB_index, uint8_t *const bufferP, const uint8_t buffer_len);
+
+/**\brief Decode NR DCCH from gNB, sent from lower layer through SRB3
+   \param module_id  module id
+   \param gNB_index  gNB index
+   \param buffer     encoded DCCH bytes stream message
+   \param size       length of buffer*/
+int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(const module_id_t module_id, const uint8_t gNB_index, const uint8_t *buffer, const uint32_t size);
+
+/**\brief interface between MAC and RRC thru SRB0 (RLC TM/no PDCP)
+   \param module_id  module id
+   \param CC_id      component carrier id
+   \param gNB_index  gNB index
+   \param frameP     pointer to frame for calculation
+   \param channel    indicator for channel of the pdu
+   \param pduP       pointer to pdu
+   \param pdu_len    data length of pdu*/
+int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id, const int CC_id, const uint8_t gNB_index, const uint32_t *frameP, const channel_t channel, const uint8_t* pduP, const sdu_size_t pdu_len);
 
 /** @}*/
+#endif
\ No newline at end of file

openair2/RRC/NR_UE/vars.h → openair2/RRC/NR_UE/rrc_vars.h

@@ -32,10 +32,8 @@
 #ifndef __OPENAIR_NR_RRC_VARS_H__
 #define __OPENAIR_NR_RRC_VARS_H__
 
-#include "defs.h"
-#include "LAYER2/RLC/rlc.h"
-#include "COMMON/mac_rrc_primitives.h"
-#include "LAYER2/MAC/defs.h"
+#include "rrc_defs.h"
 
 NR_UE_RRC_INST_t *NR_UE_rrc_inst;
+
 #endif

openair2/UTIL/OMG/defs.h

@@ -36,6 +36,7 @@
 
 //typedef char bool;
 #include <stdbool.h>
+#include "omg_constants.h"
 
 #ifdef STANDALONE
 typedef struct {