Skip to content

O
OpenXG-RAN
Commit c9e741e0 authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files
Options

Merge remote-tracking branch 'origin/nr-polar-encoder-optimizations' into... 

Merge remote-tracking branch 'origin/nr-polar-encoder-optimizations' into nr-polar-encoder-optimizations

Conflicts:
	nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
parents 3ae239a1 6868e745
Hide whitespace changes
Inline Side-by-side
Showing with 736 additions and 707 deletions
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
View file @ c9e741e0
...@@ -24,119 +24,119 @@ ...@@ -24,119 +24,119 @@
#include "PHY/impl_defs_nr.h" #include "PHY/impl_defs_nr.h"
/* /*
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
typedef unsigned short uint16_t; typedef unsigned short uint16_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef signed int int32_t; typedef signed int int32_t;
typedef signed short int16_t; typedef signed short int16_t;
typedef signed char int8_t; typedef signed char int8_t;
*/ */
typedef struct { typedef struct {
uint8_t identifier_dci_formats ; // 0 IDENTIFIER_DCI_FORMATS: uint8_t identifier_dci_formats ; // 0 IDENTIFIER_DCI_FORMATS:
uint8_t carrier_ind ; // 1 CARRIER_IND: 0 or 3 bits, as defined in Subclause x.x of [5, TS38.213] uint8_t carrier_ind ; // 1 CARRIER_IND: 0 or 3 bits, as defined in Subclause x.x of [5, TS38.213]
uint8_t sul_ind_0_1 ; // 2 SUL_IND_0_1: uint8_t sul_ind_0_1 ; // 2 SUL_IND_0_1:
uint8_t slot_format_ind ; // 3 SLOT_FORMAT_IND: size of DCI format 2_0 is configurable by higher layers up to 128 bits, according to Subclause 11.1.1 of [5, TS 38.213] uint8_t slot_format_ind ; // 3 SLOT_FORMAT_IND: size of DCI format 2_0 is configurable by higher layers up to 128 bits, according to Subclause 11.1.1 of [5, TS 38.213]
uint8_t pre_emption_ind ; // 4 PRE_EMPTION_IND: size of DCI format 2_1 is configurable by higher layers up to 126 bits, according to Subclause 11.2 of [5, TS 38.213]. Each pre-emption indication is 14 bits uint8_t pre_emption_ind ; // 4 PRE_EMPTION_IND: size of DCI format 2_1 is configurable by higher layers up to 126 bits, according to Subclause 11.2 of [5, TS 38.213]. Each pre-emption indication is 14 bits
uint8_t block_number ; // 5 BLOCK_NUMBER: starting position of a block is determined by the parameter startingBitOfFormat2_3 uint8_t block_number ; // 5 BLOCK_NUMBER: starting position of a block is determined by the parameter startingBitOfFormat2_3
uint8_t close_loop_ind ; // 6 CLOSE_LOOP_IND: uint8_t close_loop_ind ; // 6 CLOSE_LOOP_IND:
uint8_t bandwidth_part_ind ; // 7 BANDWIDTH_PART_IND: uint8_t bandwidth_part_ind ; // 7 BANDWIDTH_PART_IND:
uint8_t short_message_ind ; // 8 SHORT_MESSAGE_IND: uint8_t short_message_ind ; // 8 SHORT_MESSAGE_IND:
uint8_t short_messages ; // 9 SHORT_MESSAGES: uint8_t short_messages ; // 9 SHORT_MESSAGES:
uint16_t freq_dom_resource_assignment_UL; // 10 FREQ_DOM_RESOURCE_ASSIGNMENT_UL: PUSCH hopping with resource allocation type 1 not considered uint16_t freq_dom_resource_assignment_UL; // 10 FREQ_DOM_RESOURCE_ASSIGNMENT_UL: PUSCH hopping with resource allocation type 1 not considered
// (NOTE 1) If DCI format 0_0 is monitored in common search space // (NOTE 1) If DCI format 0_0 is monitored in common search space
// and if the number of information bits in the DCI format 0_0 prior to padding // and if the number of information bits in the DCI format 0_0 prior to padding
// is larger than the payload size of the DCI format 1_0 monitored in common search space // is larger than the payload size of the DCI format 1_0 monitored in common search space
// the bitwidth of the frequency domain resource allocation field in the DCI format 0_0 // the bitwidth of the frequency domain resource allocation field in the DCI format 0_0
// is reduced such that the size of DCI format 0_0 equals to the size of the DCI format 1_0 // is reduced such that the size of DCI format 0_0 equals to the size of the DCI format 1_0
uint16_t freq_dom_resource_assignment_DL; // 11 FREQ_DOM_RESOURCE_ASSIGNMENT_DL: uint16_t freq_dom_resource_assignment_DL; // 11 FREQ_DOM_RESOURCE_ASSIGNMENT_DL:
uint8_t time_dom_resource_assignment ; // 12 TIME_DOM_RESOURCE_ASSIGNMENT: 0, 1, 2, 3, or 4 bits as defined in Subclause 6.1.2.1 of [6, TS 38.214]. The bitwidth for this field is determined as log2(I) bits, uint8_t time_dom_resource_assignment ; // 12 TIME_DOM_RESOURCE_ASSIGNMENT: 0, 1, 2, 3, or 4 bits as defined in Subclause 6.1.2.1 of [6, TS 38.214]. The bitwidth for this field is determined as log2(I) bits,
// where I the number of entries in the higher layer parameter pusch-AllocationList // where I the number of entries in the higher layer parameter pusch-AllocationList
uint8_t vrb_to_prb_mapping ; // 13 VRB_TO_PRB_MAPPING: 0 bit if only resource allocation type 0 uint8_t vrb_to_prb_mapping ; // 13 VRB_TO_PRB_MAPPING: 0 bit if only resource allocation type 0
uint8_t prb_bundling_size_ind ; // 14 PRB_BUNDLING_SIZE_IND:0 bit if the higher layer parameter PRB_bundling is not configured or is set to 'static', or 1 bit if the higher layer parameter PRB_bundling is set to 'dynamic' according to Subclause 5.1.2.3 of [6, TS 38.214] uint8_t prb_bundling_size_ind ; // 14 PRB_BUNDLING_SIZE_IND:0 bit if the higher layer parameter PRB_bundling is not configured or is set to 'static', or 1 bit if the higher layer parameter PRB_bundling is set to 'dynamic' according to Subclause 5.1.2.3 of [6, TS 38.214]
uint8_t rate_matching_ind ; // 15 RATE_MATCHING_IND: 0, 1, or 2 bits according to higher layer parameter rate-match-PDSCH-resource-set uint8_t rate_matching_ind ; // 15 RATE_MATCHING_IND: 0, 1, or 2 bits according to higher layer parameter rate-match-PDSCH-resource-set
uint8_t zp_csi_rs_trigger ; // 16 ZP_CSI_RS_TRIGGER: uint8_t zp_csi_rs_trigger ; // 16 ZP_CSI_RS_TRIGGER:
uint8_t freq_hopping_flag ; // 17 FREQ_HOPPING_FLAG: 0 bit if only resource allocation type 0 uint8_t freq_hopping_flag ; // 17 FREQ_HOPPING_FLAG: 0 bit if only resource allocation type 0
uint8_t tb1_mcs ; // 18 TB1_MCS: uint8_t tb1_mcs ; // 18 TB1_MCS:
uint8_t tb1_ndi ; // 19 TB1_NDI: uint8_t tb1_ndi ; // 19 TB1_NDI:
uint8_t tb1_rv ; // 20 TB1_RV: uint8_t tb1_rv ; // 20 TB1_RV:
uint8_t tb2_mcs ; // 21 TB2_MCS: uint8_t tb2_mcs ; // 21 TB2_MCS:
uint8_t tb2_ndi ; // 22 TB2_NDI: uint8_t tb2_ndi ; // 22 TB2_NDI:
uint8_t tb2_rv ; // 23 TB2_RV: uint8_t tb2_rv ; // 23 TB2_RV:
uint8_t mcs ; // 24 MCS: uint8_t mcs ; // 24 MCS:
uint8_t ndi ; // 25 NDI: uint8_t ndi ; // 25 NDI:
uint8_t rv ; // 26 RV: uint8_t rv ; // 26 RV:
uint8_t harq_process_number ; // 27 HARQ_PROCESS_NUMBER: uint8_t harq_process_number ; // 27 HARQ_PROCESS_NUMBER:
uint8_t dai ; // 28 DAI: For format1_1: 4 if more than one serving cell are configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 MSB bits are the counter DAI and the 2 LSB bits are the total DAI uint8_t dai ; // 28 DAI: For format1_1: 4 if more than one serving cell are configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 MSB bits are the counter DAI and the 2 LSB bits are the total DAI
// 2 if one serving cell is configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 bits are the counter DAI // 2 if one serving cell is configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 bits are the counter DAI
// 0 otherwise // 0 otherwise
uint8_t first_dai ; // 29 FIRST_DAI: (1 or 2 bits) 1 bit for semi-static HARQ-ACK uint8_t first_dai ; // 29 FIRST_DAI: (1 or 2 bits) 1 bit for semi-static HARQ-ACK
uint8_t second_dai ; // 30 SECOND_DAI: (0 or 2 bits) 2 bits for dynamic HARQ-ACK codebook with two HARQ-ACK sub-codebooks uint8_t second_dai ; // 30 SECOND_DAI: (0 or 2 bits) 2 bits for dynamic HARQ-ACK codebook with two HARQ-ACK sub-codebooks
uint8_t tb_scaling ; // 31 TB_SCALING: uint8_t tb_scaling ; // 31 TB_SCALING:
uint8_t tpc_pusch ; // 32 TPC_PUSCH: uint8_t tpc_pusch ; // 32 TPC_PUSCH:
uint8_t tpc_pucch ; // 33 TPC_PUCCH: uint8_t tpc_pucch ; // 33 TPC_PUCCH:
uint8_t pucch_resource_ind ; // 34 PUCCH_RESOURCE_IND: uint8_t pucch_resource_ind ; // 34 PUCCH_RESOURCE_IND:
uint8_t pdsch_to_harq_feedback_time_ind ; // 35 PDSCH_TO_HARQ_FEEDBACK_TIME_IND: uint8_t pdsch_to_harq_feedback_time_ind ; // 35 PDSCH_TO_HARQ_FEEDBACK_TIME_IND:
uint8_t srs_resource_ind ; // 36 SRS_RESOURCE_IND: uint8_t srs_resource_ind ; // 36 SRS_RESOURCE_IND:
uint8_t precod_nbr_layers ; // 37 PRECOD_NBR_LAYERS: uint8_t precod_nbr_layers ; // 37 PRECOD_NBR_LAYERS:
uint8_t antenna_ports ; // 38 ANTENNA_PORTS: uint8_t antenna_ports ; // 38 ANTENNA_PORTS:
uint8_t tci ; // 39 TCI: 0 bit if higher layer parameter tci-PresentInDCI is not enabled; otherwise 3 bits uint8_t tci ; // 39 TCI: 0 bit if higher layer parameter tci-PresentInDCI is not enabled; otherwise 3 bits
uint8_t srs_request ; // 40 SRS_REQUEST: uint8_t srs_request ; // 40 SRS_REQUEST:
uint8_t tpc_cmd ; // 41 TPC_CMD: uint8_t tpc_cmd ; // 41 TPC_CMD:
uint8_t csi_request ; // 42 CSI_REQUEST: uint8_t csi_request ; // 42 CSI_REQUEST:
uint8_t cbgti ; // 43 CBGTI: 0, 2, 4, 6, or 8 bits determined by higher layer parameter maxCodeBlockGroupsPerTransportBlock for the PDSCH uint8_t cbgti ; // 43 CBGTI: 0, 2, 4, 6, or 8 bits determined by higher layer parameter maxCodeBlockGroupsPerTransportBlock for the PDSCH
uint8_t cbgfi ; // 44 CBGFI: 0 or 1 bit determined by higher layer parameter codeBlockGroupFlushIndicator uint8_t cbgfi ; // 44 CBGFI: 0 or 1 bit determined by higher layer parameter codeBlockGroupFlushIndicator
uint8_t ptrs_dmrs ; // 45 PTRS_DMRS: uint8_t ptrs_dmrs ; // 45 PTRS_DMRS:
uint8_t beta_offset_ind ; // 46 BETA_OFFSET_IND: uint8_t beta_offset_ind ; // 46 BETA_OFFSET_IND:
uint8_t dmrs_seq_ini ; // 47 DMRS_SEQ_INI: 1 bit if the cell has two ULs and the number of bits for DCI format 1_0 before padding uint8_t dmrs_seq_ini ; // 47 DMRS_SEQ_INI: 1 bit if the cell has two ULs and the number of bits for DCI format 1_0 before padding
// is larger than the number of bits for DCI format 0_0 before padding; 0 bit otherwise // is larger than the number of bits for DCI format 0_0 before padding; 0 bit otherwise
uint8_t ul_sch_ind ; // 48 UL_SCH_IND: value of "1" indicates UL-SCH shall be transmitted on the PUSCH and a value of "0" indicates UL-SCH shall not be transmitted on the PUSCH uint8_t ul_sch_ind ; // 48 UL_SCH_IND: value of "1" indicates UL-SCH shall be transmitted on the PUSCH and a value of "0" indicates UL-SCH shall not be transmitted on the PUSCH
uint16_t padding_nr_dci ; // 49 PADDING_NR_DCI: (Note 2) If DCI format 0_0 is monitored in common search space uint16_t padding_nr_dci ; // 49 PADDING_NR_DCI: (Note 2) If DCI format 0_0 is monitored in common search space
// and if the number of information bits in the DCI format 0_0 prior to padding // and if the number of information bits in the DCI format 0_0 prior to padding
// is less than the payload size of the DCI format 1_0 monitored in common search space // is less than the payload size of the DCI format 1_0 monitored in common search space
// zeros shall be appended to the DCI format 0_0 // zeros shall be appended to the DCI format 0_0
// until the payload size equals that of the DCI format 1_0 // until the payload size equals that of the DCI format 1_0
uint8_t sul_ind_0_0 ; // 50 SUL_IND_0_0: uint8_t sul_ind_0_0 ; // 50 SUL_IND_0_0:
uint8_t ra_preamble_index ; // 51 RA_PREAMBLE_INDEX: uint8_t ra_preamble_index ; // 51 RA_PREAMBLE_INDEX:
uint8_t sul_ind_1_0 ; // 52 SUL_IND_1_0: uint8_t sul_ind_1_0 ; // 52 SUL_IND_1_0:
uint8_t ss_pbch_index ; // 53 SS_PBCH_INDEX uint8_t ss_pbch_index ; // 53 SS_PBCH_INDEX
uint8_t prach_mask_index ; // 54 PRACH_MASK_INDEX uint8_t prach_mask_index ; // 54 PRACH_MASK_INDEX
uint8_t reserved_nr_dci ; // 55 RESERVED_NR_DCI uint8_t reserved_nr_dci ; // 55 RESERVED_NR_DCI
} fapi_nr_dci_pdu_rel15_t; } fapi_nr_dci_pdu_rel15_t;
typedef struct { typedef struct {
uint8_t uci_format; uint8_t uci_format;
uint8_t uci_channel; uint8_t uci_channel;
uint8_t harq_ack_bits; uint8_t harq_ack_bits;
uint32_t harq_ack; uint32_t harq_ack;
uint8_t csi_bits; uint8_t csi_bits;
uint32_t csi; uint32_t csi;
uint8_t sr_bits; uint8_t sr_bits;
uint32_t sr; uint32_t sr;
} fapi_nr_uci_pdu_rel15_t; } fapi_nr_uci_pdu_rel15_t;
typedef struct { typedef struct {
/// frequency_domain_resource; /// frequency_domain_resource;
//uint32_t rb_start; //uint32_t rb_start;
//uint32_t rb_end; //uint32_t rb_end;
uint64_t frequency_domain_resource; uint64_t frequency_domain_resource;
uint16_t rb_offset; uint16_t rb_offset;
uint8_t duration; uint8_t duration;
uint8_t cce_reg_mapping_type; // interleaved or noninterleaved 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_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_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 cce_reg_interleaved_shift_index; // valid if CCE to REG mapping type is interleaved type
uint8_t precoder_granularity; uint8_t precoder_granularity;
uint16_t pdcch_dmrs_scrambling_id; uint16_t pdcch_dmrs_scrambling_id;
uint8_t tci_state_pdcch; uint8_t tci_state_pdcch;
uint8_t tci_present_in_dci; uint8_t tci_present_in_dci;
} fapi_nr_coreset_t; } fapi_nr_coreset_t;
// //
// Top level FAPI messages // Top level FAPI messages
...@@ -148,79 +148,79 @@ typedef struct { ...@@ -148,79 +148,79 @@ typedef struct {
// P7 // P7
// //
typedef struct { typedef struct {
uint16_t rnti; uint16_t rnti;
uint8_t dci_format; uint8_t dci_format;
// n_CCE index of first CCE for PDCCH reception // n_CCE index of first CCE for PDCCH reception
int n_CCE; int n_CCE;
// N_CCE is L, or number of CCEs for DCI // N_CCE is L, or number of CCEs for DCI
int N_CCE; int N_CCE;
fapi_nr_dci_pdu_rel15_t dci; fapi_nr_dci_pdu_rel15_t dci;
} fapi_nr_dci_indication_pdu_t; } fapi_nr_dci_indication_pdu_t;
/// ///
typedef struct { typedef struct {
uint32_t sfn_slot; uint32_t sfn_slot;
uint16_t number_of_dcis; uint16_t number_of_dcis;
fapi_nr_dci_indication_pdu_t dci_list[10]; fapi_nr_dci_indication_pdu_t dci_list[10];
} fapi_nr_dci_indication_t; } fapi_nr_dci_indication_t;
typedef struct { typedef struct {
uint32_t pdu_length; uint32_t pdu_length;
uint8_t* pdu; uint8_t* pdu;
} fapi_nr_pdsch_pdu_t; } fapi_nr_pdsch_pdu_t;
typedef struct { typedef struct {
uint8_t* pdu; // 3bytes uint8_t* pdu; // 3bytes
uint8_t additional_bits; uint8_t additional_bits;
uint8_t ssb_index; uint8_t ssb_index;
uint8_t ssb_length; uint8_t ssb_length;
uint16_t cell_id; uint16_t cell_id;
} fapi_nr_mib_pdu_t; } fapi_nr_mib_pdu_t;
typedef struct { typedef struct {
uint32_t pdu_length; uint32_t pdu_length;
uint8_t* pdu; uint8_t* pdu;
uint32_t sibs_mask; uint32_t sibs_mask;
} fapi_nr_sib_pdu_t; } fapi_nr_sib_pdu_t;
typedef struct { typedef struct {
uint8_t pdu_type; uint8_t pdu_type;
union { union {
fapi_nr_pdsch_pdu_t pdsch_pdu; fapi_nr_pdsch_pdu_t pdsch_pdu;
fapi_nr_mib_pdu_t mib_pdu; fapi_nr_mib_pdu_t mib_pdu;
fapi_nr_sib_pdu_t sib_pdu; fapi_nr_sib_pdu_t sib_pdu;
}; };
} fapi_nr_rx_indication_body_t; } fapi_nr_rx_indication_body_t;
/// ///
typedef struct { typedef struct {
uint32_t sfn_slot; uint32_t sfn_slot;
uint16_t number_pdus; uint16_t number_pdus;
fapi_nr_rx_indication_body_t *rx_indication_body; fapi_nr_rx_indication_body_t *rx_indication_body;
} fapi_nr_rx_indication_t; } fapi_nr_rx_indication_t;
typedef struct { typedef struct {
uint8_t ul_cqi; uint8_t ul_cqi;
uint16_t timing_advance; uint16_t timing_advance;
uint16_t rnti; uint16_t rnti;
} fapi_nr_tx_config_t; } fapi_nr_tx_config_t;
typedef struct { typedef struct {
uint16_t pdu_length; uint16_t pdu_length;
uint16_t pdu_index; uint16_t pdu_index;
uint8_t* pdu; uint8_t* pdu;
} fapi_nr_tx_request_body_t; } fapi_nr_tx_request_body_t;
/// ///
typedef struct { typedef struct {
uint32_t sfn_slot; uint32_t sfn_slot;
fapi_nr_tx_config_t tx_config; fapi_nr_tx_config_t tx_config;
uint16_t number_of_pdus; uint16_t number_of_pdus;
fapi_nr_tx_request_body_t *tx_request_body; fapi_nr_tx_request_body_t *tx_request_body;
} fapi_nr_tx_request_t; } fapi_nr_tx_request_t;
typedef struct { typedef struct {
...@@ -240,7 +240,7 @@ typedef struct { ...@@ -240,7 +240,7 @@ typedef struct {
uint16_t prach_freq_offset; uint16_t prach_freq_offset;
} fapi_nr_ul_config_prach_pdu; } fapi_nr_ul_config_prach_pdu;
typedef struct { typedef struct {
pucch_format_nr_t format; /* format 0 1 2 3 4 */ pucch_format_nr_t format; /* format 0 1 2 3 4 */
uint8_t initialCyclicShift; /* x x */ uint8_t initialCyclicShift; /* x x */
...@@ -353,104 +353,105 @@ typedef struct { ...@@ -353,104 +353,105 @@ typedef struct {
uint8_t beta_offset_ind; uint8_t beta_offset_ind;
} fapi_nr_ul_config_pusch_pdu_rel15_t; } fapi_nr_ul_config_pusch_pdu_rel15_t;
typedef struct { typedef struct {
uint16_t rnti; uint16_t rnti;
fapi_nr_ul_config_pusch_pdu_rel15_t ulsch_pdu_rel15; fapi_nr_ul_config_pusch_pdu_rel15_t ulsch_pdu_rel15;
} fapi_nr_ul_config_pusch_pdu; } fapi_nr_ul_config_pusch_pdu;
typedef struct { typedef struct {
} fapi_nr_ul_config_srs_pdu; } fapi_nr_ul_config_srs_pdu;
typedef struct { typedef struct {
uint8_t pdu_type; uint8_t pdu_type;
union { union {
fapi_nr_ul_config_prach_pdu prach_config_pdu; fapi_nr_ul_config_prach_pdu prach_config_pdu;
fapi_nr_ul_config_pucch_pdu pucch_config_pdu; fapi_nr_ul_config_pucch_pdu pucch_config_pdu;
fapi_nr_ul_config_pusch_pdu ulsch_config_pdu; fapi_nr_ul_config_pusch_pdu ulsch_config_pdu;
fapi_nr_ul_config_srs_pdu srs_config_pdu; fapi_nr_ul_config_srs_pdu srs_config_pdu;
}; };
} fapi_nr_ul_config_request_pdu_t; } fapi_nr_ul_config_request_pdu_t;
typedef struct { typedef struct {
uint32_t sfn_slot; uint32_t sfn_slot;
uint8_t number_pdus; uint8_t number_pdus;
fapi_nr_ul_config_request_pdu_t ul_config_list[FAPI_NR_UL_CONFIG_LIST_NUM]; fapi_nr_ul_config_request_pdu_t ul_config_list[FAPI_NR_UL_CONFIG_LIST_NUM];
} fapi_nr_ul_config_request_t; } fapi_nr_ul_config_request_t;
typedef struct { typedef struct {
uint16_t rnti; uint16_t rnti;
fapi_nr_coreset_t coreset; fapi_nr_coreset_t coreset;
uint32_t duration; uint16_t N_RB_BWP;
uint8_t number_of_candidates[5]; // aggregation level 1, 2, 4, 8, 16 uint32_t duration;
uint16_t monitoring_symbols_within_slot; uint8_t number_of_candidates[5]; // aggregation level 1, 2, 4, 8, 16
// DCI foramt-specific uint16_t monitoring_symbols_within_slot;
uint8_t format_2_0_number_of_candidates[5]; // aggregation level 1, 2, 4, 8, 16 // DCI foramt-specific
uint8_t format_2_3_monitorying_periodicity; uint8_t format_2_0_number_of_candidates[5]; // aggregation level 1, 2, 4, 8, 16
uint8_t format_2_3_number_of_candidates; uint8_t format_2_3_monitorying_periodicity;
} fapi_nr_dl_config_dci_dl_pdu_rel15_t; uint8_t format_2_3_number_of_candidates;
} fapi_nr_dl_config_dci_dl_pdu_rel15_t;
typedef struct { typedef struct {
fapi_nr_dl_config_dci_dl_pdu_rel15_t dci_config_rel15; fapi_nr_dl_config_dci_dl_pdu_rel15_t dci_config_rel15;
} fapi_nr_dl_config_dci_pdu; } fapi_nr_dl_config_dci_pdu;
typedef struct{ typedef struct{
uint8_t aperiodicSRS_ResourceTrigger; uint8_t aperiodicSRS_ResourceTrigger;
} fapi_nr_dl_srs_config_t; } fapi_nr_dl_srs_config_t;
typedef enum{vrb_to_prb_mapping_non_interleaved = 0, vrb_to_prb_mapping_interleaved = 1} vrb_to_prb_mapping_t;
//typedef fapi_nr_dci_pdu_rel15_t fapi_nr_dl_config_dlsch_pdu_rel15_t;
typedef struct {
uint8_t bandwidth_part_ind;
uint16_t number_rbs;
uint16_t start_rb;
uint8_t frame_offset;
uint16_t number_symbols;
uint16_t start_symbol;
uint8_t prb_bundling_size_ind;
uint8_t rate_matching_ind;
uint8_t zp_csi_rs_trigger;
uint8_t mcs;
uint8_t ndi;
uint8_t rv;
uint8_t tb2_mcs;
uint8_t tb2_ndi;
uint8_t tb2_rv;
uint8_t harq_process_nbr;
vrb_to_prb_mapping_t vrb_to_prb_mapping;
uint8_t dai;
double scaling_factor_S;
int8_t accumulated_delta_PUCCH;
uint8_t pucch_resource_id;
uint8_t pdsch_to_harq_feedback_time_ind;
uint8_t n_dmrs_cdm_groups;
uint8_t dmrs_ports[10];
uint8_t n_front_load_symb;
uint8_t tci_state;
fapi_nr_dl_srs_config_t srs_config;
uint8_t cbgti;
uint8_t codeBlockGroupFlushIndicator;
// to be check the fields needed to L1 with NR_DL_UE_HARQ_t and NR_UE_DLSCH_t
} fapi_nr_dl_config_dlsch_pdu_rel15_t;
typedef enum{vrb_to_prb_mapping_non_interleaved = 0, vrb_to_prb_mapping_interleaved = 1} vrb_to_prb_mapping_t; typedef struct {
//typedef fapi_nr_dci_pdu_rel15_t fapi_nr_dl_config_dlsch_pdu_rel15_t; uint16_t rnti;
typedef struct { fapi_nr_dl_config_dlsch_pdu_rel15_t dlsch_config_rel15;
uint8_t bandwidth_part_ind; } fapi_nr_dl_config_dlsch_pdu;
uint16_t number_rbs;
uint16_t start_rb;
uint8_t frame_offset;
uint16_t number_symbols;
uint16_t start_symbol;
uint8_t prb_bundling_size_ind;
uint8_t rate_matching_ind;
uint8_t zp_csi_rs_trigger;
uint8_t mcs;
uint8_t ndi;
uint8_t rv;
uint8_t tb2_mcs;
uint8_t tb2_ndi;
uint8_t tb2_rv;
uint8_t harq_process_nbr;
vrb_to_prb_mapping_t vrb_to_prb_mapping;
uint8_t dai;
double scaling_factor_S;
int8_t accumulated_delta_PUCCH;
uint8_t pucch_resource_id;
uint8_t pdsch_to_harq_feedback_time_ind;
uint8_t n_dmrs_cdm_groups;
uint8_t dmrs_ports[10];
uint8_t n_front_load_symb;
uint8_t tci_state;
fapi_nr_dl_srs_config_t srs_config;
uint8_t cbgti;
uint8_t codeBlockGroupFlushIndicator;
// to be check the fields needed to L1 with NR_DL_UE_HARQ_t and NR_UE_DLSCH_t
} fapi_nr_dl_config_dlsch_pdu_rel15_t;
typedef struct { typedef struct {
uint16_t rnti; uint8_t pdu_type;
fapi_nr_dl_config_dlsch_pdu_rel15_t dlsch_config_rel15; union {
} fapi_nr_dl_config_dlsch_pdu; fapi_nr_dl_config_dci_pdu dci_config_pdu;
fapi_nr_dl_config_dlsch_pdu dlsch_config_pdu;
typedef struct { };
uint8_t pdu_type; } fapi_nr_dl_config_request_pdu_t;
union {
fapi_nr_dl_config_dci_pdu dci_config_pdu; typedef struct {
fapi_nr_dl_config_dlsch_pdu dlsch_config_pdu; uint32_t sfn_slot;
}; uint8_t number_pdus;
} fapi_nr_dl_config_request_pdu_t; fapi_nr_dl_config_request_pdu_t dl_config_list[FAPI_NR_DL_CONFIG_LIST_NUM];
typedef struct {
uint32_t sfn_slot;
uint8_t number_pdus;
fapi_nr_dl_config_request_pdu_t dl_config_list[FAPI_NR_DL_CONFIG_LIST_NUM];
} fapi_nr_dl_config_request_t; } fapi_nr_dl_config_request_t;
...@@ -460,444 +461,444 @@ typedef struct { ...@@ -460,444 +461,444 @@ typedef struct {
typedef struct { typedef struct {
fapi_nr_coreset_t coreset; fapi_nr_coreset_t coreset;
uint8_t monitoring_slot_peridicity; uint8_t monitoring_slot_peridicity;
uint8_t monitoring_slot_offset; uint8_t monitoring_slot_offset;
uint16_t duration; uint16_t duration;
uint16_t monitoring_symbols_within_slot; uint16_t monitoring_symbols_within_slot;
uint8_t number_of_candidates[5]; // aggregation level 1, 2, 4, 8, 16 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_0_number_of_candidates[5]; // aggregation level 1, 2, 4, 8, 16
uint8_t dci_2_3_monitorying_periodicity; uint8_t dci_2_3_monitorying_periodicity;
uint8_t dci_2_3_number_of_candidates; uint8_t dci_2_3_number_of_candidates;
} fapi_nr_search_space_t; } fapi_nr_search_space_t;
typedef struct { typedef struct {
fapi_nr_search_space_t search_space_sib1; fapi_nr_search_space_t search_space_sib1;
fapi_nr_search_space_t search_space_others_sib; fapi_nr_search_space_t search_space_others_sib;
fapi_nr_search_space_t search_space_paging; fapi_nr_search_space_t search_space_paging;
//fapi_nr_coreset_t coreset_ra; // common coreset //fapi_nr_coreset_t coreset_ra; // common coreset
fapi_nr_search_space_t search_space_ra; fapi_nr_search_space_t search_space_ra;
} fapi_nr_pdcch_config_common_t; } fapi_nr_pdcch_config_common_t;
typedef struct { typedef struct {
uint8_t k0; uint8_t k0;
uint8_t mapping_type; uint8_t mapping_type;
uint8_t symbol_starting; uint8_t symbol_starting;
uint8_t symbol_length; uint8_t symbol_length;
} fapi_nr_pdsch_time_domain_resource_allocation_t; } fapi_nr_pdsch_time_domain_resource_allocation_t;
typedef struct { typedef struct {
fapi_nr_pdsch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_DL_ALLOCATIONS]; fapi_nr_pdsch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_DL_ALLOCATIONS];
} fapi_nr_pdsch_config_common_t; } fapi_nr_pdsch_config_common_t;
typedef struct { typedef struct {
uint8_t prach_configuration_index; uint8_t prach_configuration_index;
uint8_t msg1_fdm; uint8_t msg1_fdm;
uint8_t msg1_frequency_start; uint8_t msg1_frequency_start;
uint8_t zero_correlation_zone_config; uint8_t zero_correlation_zone_config;
uint8_t preamble_received_target_power; uint8_t preamble_received_target_power;
uint8_t preamble_transmission_max; uint8_t preamble_transmission_max;
uint8_t power_ramping_step; uint8_t power_ramping_step;
uint8_t ra_window_size; uint8_t ra_window_size;
uint8_t total_number_of_preamble; uint8_t total_number_of_preamble;
uint8_t ssb_occasion_per_rach; uint8_t ssb_occasion_per_rach;
uint8_t cb_preamble_per_ssb; uint8_t cb_preamble_per_ssb;
uint8_t group_a_msg3_size; uint8_t group_a_msg3_size;
uint8_t group_a_number_of_preamble; uint8_t group_a_number_of_preamble;
uint8_t group_b_power_offset; uint8_t group_b_power_offset;
uint8_t contention_resolution_timer; uint8_t contention_resolution_timer;
uint8_t rsrp_threshold_ssb; uint8_t rsrp_threshold_ssb;
uint8_t rsrp_threshold_ssb_sul; uint8_t rsrp_threshold_ssb_sul;
uint8_t prach_length; // l839, l139 uint8_t prach_length; // l839, l139
uint8_t prach_root_sequence_index; // 0 - 837 for l839, 0 - 137 for l139 uint8_t prach_root_sequence_index; // 0 - 837 for l839, 0 - 137 for l139
uint8_t msg1_subcarrier_spacing; uint8_t msg1_subcarrier_spacing;
uint8_t restrictedset_config; uint8_t restrictedset_config;
uint8_t msg3_transform_precoding; uint8_t msg3_transform_precoding;
} fapi_nr_rach_config_common_t; } fapi_nr_rach_config_common_t;
typedef struct { typedef struct {
uint8_t k2; uint8_t k2;
uint8_t mapping_type; uint8_t mapping_type;
uint8_t symbol_starting; uint8_t symbol_starting;
uint8_t symbol_length; uint8_t symbol_length;
} fapi_nr_pusch_time_domain_resource_allocation_t; } fapi_nr_pusch_time_domain_resource_allocation_t;
typedef struct { typedef struct {
uint8_t group_hopping_enabled_transform_precoding; uint8_t group_hopping_enabled_transform_precoding;
fapi_nr_pusch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_UL_ALLOCATIONS]; fapi_nr_pusch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_UL_ALLOCATIONS];
uint8_t msg3_delta_preamble; uint8_t msg3_delta_preamble;
uint8_t p0_nominal_with_grant; uint8_t p0_nominal_with_grant;
} fapi_nr_pusch_config_common_t; } fapi_nr_pusch_config_common_t;
typedef struct { typedef struct {
uint8_t pucch_resource_common; uint8_t pucch_resource_common;
uint8_t pucch_group_hopping; uint8_t pucch_group_hopping;
uint8_t hopping_id; uint8_t hopping_id;
uint8_t p0_nominal; uint8_t p0_nominal;
} fapi_nr_pucch_config_common_t; } fapi_nr_pucch_config_common_t;
typedef struct { typedef struct {
uint8_t subcarrier_spacing_common; uint8_t subcarrier_spacing_common;
uint8_t ssb_subcarrier_offset; uint8_t ssb_subcarrier_offset;
uint8_t dmrs_type_a_position; uint8_t dmrs_type_a_position;
uint8_t pdcch_config_sib1; uint8_t pdcch_config_sib1;
uint8_t cell_barred; uint8_t cell_barred;
uint8_t intra_frequency_reselection; uint8_t intra_frequency_reselection;
uint16_t system_frame_number; uint16_t system_frame_number;
uint8_t ssb_index; uint8_t ssb_index;
uint8_t half_frame_bit; uint8_t half_frame_bit;
} fapi_nr_pbch_config_t; } fapi_nr_pbch_config_t;
typedef struct { typedef struct {
fapi_nr_pdcch_config_common_t pdcch_config_common; fapi_nr_pdcch_config_common_t pdcch_config_common;
fapi_nr_pdsch_config_common_t pdsch_config_common; fapi_nr_pdsch_config_common_t pdsch_config_common;
} fapi_nr_dl_bwp_common_config_t; } fapi_nr_dl_bwp_common_config_t;
typedef struct { typedef struct {
uint16_t int_rnti; uint16_t int_rnti;
uint8_t time_frequency_set; uint8_t time_frequency_set;
uint8_t dci_payload_size; uint8_t dci_payload_size;
uint8_t serving_cell_id[FAPI_NR_MAX_NUM_SERVING_CELLS]; // interrupt configuration per serving cell uint8_t serving_cell_id[FAPI_NR_MAX_NUM_SERVING_CELLS]; // interrupt configuration per serving cell
uint8_t position_in_dci[FAPI_NR_MAX_NUM_SERVING_CELLS]; // interrupt configuration per serving cell uint8_t position_in_dci[FAPI_NR_MAX_NUM_SERVING_CELLS]; // interrupt configuration per serving cell
} fapi_nr_downlink_preemption_t; } fapi_nr_downlink_preemption_t;
typedef struct { typedef struct {
uint8_t tpc_index; uint8_t tpc_index;
uint8_t tpc_index_sul; uint8_t tpc_index_sul;
uint8_t target_cell; uint8_t target_cell;
} fapi_nr_pusch_tpc_command_config_t; } fapi_nr_pusch_tpc_command_config_t;
typedef struct { typedef struct {
uint8_t tpc_index_pcell; uint8_t tpc_index_pcell;
uint8_t tpc_index_pucch_scell; uint8_t tpc_index_pucch_scell;
} fapi_nr_pucch_tpc_command_config_t; } fapi_nr_pucch_tpc_command_config_t;
typedef struct { typedef struct {
uint8_t starting_bit_of_format_2_3; uint8_t starting_bit_of_format_2_3;
uint8_t feild_type_format_2_3; uint8_t feild_type_format_2_3;
} fapi_nr_srs_tpc_command_config_t; } fapi_nr_srs_tpc_command_config_t;
typedef struct { typedef struct {
fapi_nr_downlink_preemption_t downlink_preemption; fapi_nr_downlink_preemption_t downlink_preemption;
fapi_nr_pusch_tpc_command_config_t tpc_pusch; fapi_nr_pusch_tpc_command_config_t tpc_pusch;
fapi_nr_pucch_tpc_command_config_t tpc_pucch; fapi_nr_pucch_tpc_command_config_t tpc_pucch;
fapi_nr_srs_tpc_command_config_t tpc_srs; fapi_nr_srs_tpc_command_config_t tpc_srs;
} fapi_nr_pdcch_config_dedicated_t; } fapi_nr_pdcch_config_dedicated_t;
typedef struct { typedef struct {
uint8_t dmrs_type; uint8_t dmrs_type;
uint8_t dmrs_addition_position; uint8_t dmrs_addition_position;
uint8_t max_length; uint8_t max_length;
uint16_t scrambling_id0; uint16_t scrambling_id0;
uint16_t scrambling_id1; uint16_t scrambling_id1;
uint8_t ptrs_frequency_density[2]; // phase tracking rs uint8_t ptrs_frequency_density[2]; // phase tracking rs
uint8_t ptrs_time_density[3]; // phase tracking rs uint8_t ptrs_time_density[3]; // phase tracking rs
uint8_t ptrs_epre_ratio; // phase tracking rs uint8_t ptrs_epre_ratio; // phase tracking rs
uint8_t ptrs_resource_element_offset; // phase tracking rs uint8_t ptrs_resource_element_offset; // phase tracking rs
} fapi_nr_dmrs_downlink_config_t; } fapi_nr_dmrs_downlink_config_t;
typedef struct { typedef struct {
uint8_t bwp_or_cell_level; uint8_t bwp_or_cell_level;
uint8_t pattern_type; uint8_t pattern_type;
uint32_t resource_blocks[9]; // bitmaps type 275 bits uint32_t resource_blocks[9]; // bitmaps type 275 bits
uint8_t slot_type; // bitmaps type one/two slot(s) uint8_t slot_type; // bitmaps type one/two slot(s)
uint32_t symbols_in_resouece_block; // bitmaps type 14/28 bits uint32_t symbols_in_resouece_block; // bitmaps type 14/28 bits
uint8_t periodic; // bitmaps type uint8_t periodic; // bitmaps type
uint32_t pattern[2]; // bitmaps type 2/4/5/8/10/20/40 bits uint32_t pattern[2]; // bitmaps type 2/4/5/8/10/20/40 bits
fapi_nr_coreset_t coreset; // coreset fapi_nr_coreset_t coreset; // coreset
uint8_t subcarrier_spacing; uint8_t subcarrier_spacing;
uint8_t mode; uint8_t mode;
} fapi_nr_rate_matching_pattern_group_t; } fapi_nr_rate_matching_pattern_group_t;
typedef struct { typedef struct {
// resource mapping // resource mapping
uint8_t row; // row1/row2/row4/other uint8_t row; // row1/row2/row4/other
uint16_t frequency_domain_allocation; // 4/12/3/6 bits uint16_t frequency_domain_allocation; // 4/12/3/6 bits
uint8_t number_of_ports; uint8_t number_of_ports;
uint8_t first_ofdm_symbol_in_time_domain; uint8_t first_ofdm_symbol_in_time_domain;
uint8_t first_ofdm_symbol_in_time_domain2; uint8_t first_ofdm_symbol_in_time_domain2;
uint8_t cdm_type; uint8_t cdm_type;
uint8_t density; // .5/1/3 uint8_t density; // .5/1/3
uint8_t density_dot5_type; // even/odd PRBs uint8_t density_dot5_type; // even/odd PRBs
uint8_t frequency_band_starting_rb; // freqBand uint8_t frequency_band_starting_rb; // freqBand
uint8_t frequency_band_number_of_rb; // freqBand uint8_t frequency_band_number_of_rb; // freqBand
// periodicityAndOffset // periodicityAndOffset
uint8_t periodicity; // slot4/5/8/10/16/20/32/40/64/80/160/320/640 uint8_t periodicity; // slot4/5/8/10/16/20/32/40/64/80/160/320/640
uint32_t offset; // 0..639 bits uint32_t offset; // 0..639 bits
} fapi_nr_zp_csi_rs_resource_t; } fapi_nr_zp_csi_rs_resource_t;
typedef struct { typedef struct {
uint16_t data_scrambling_id_pdsch; uint16_t data_scrambling_id_pdsch;
fapi_nr_dmrs_downlink_config_t dmrs_dl_for_pdsch_mapping_type_a; fapi_nr_dmrs_downlink_config_t dmrs_dl_for_pdsch_mapping_type_a;
fapi_nr_dmrs_downlink_config_t dmrs_dl_for_pdsch_mapping_type_b; fapi_nr_dmrs_downlink_config_t dmrs_dl_for_pdsch_mapping_type_b;
uint8_t vrb_to_prb_interleaver; uint8_t vrb_to_prb_interleaver;
uint8_t resource_allocation; uint8_t resource_allocation;
fapi_nr_pdsch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_DL_ALLOCATIONS]; fapi_nr_pdsch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_DL_ALLOCATIONS];
uint8_t pdsch_aggregation_factor; uint8_t pdsch_aggregation_factor;
fapi_nr_rate_matching_pattern_group_t rate_matching_pattern_group1; fapi_nr_rate_matching_pattern_group_t rate_matching_pattern_group1;
fapi_nr_rate_matching_pattern_group_t rate_matching_pattern_group2; fapi_nr_rate_matching_pattern_group_t rate_matching_pattern_group2;
uint8_t rbg_size; uint8_t rbg_size;
uint8_t mcs_table; uint8_t mcs_table;
uint8_t max_num_of_code_word_scheduled_by_dci; uint8_t max_num_of_code_word_scheduled_by_dci;
uint8_t bundle_size; // prb_bundling static uint8_t bundle_size; // prb_bundling static
uint8_t bundle_size_set1; // prb_bundling dynamic uint8_t bundle_size_set1; // prb_bundling dynamic
uint8_t bundle_size_set2; // prb_bundling dynamic uint8_t bundle_size_set2; // prb_bundling dynamic
fapi_nr_zp_csi_rs_resource_t periodically_zp_csi_rs_resource_set[FAPI_NR_MAX_NUM_ZP_CSI_RS_RESOURCE_PER_SET]; fapi_nr_zp_csi_rs_resource_t periodically_zp_csi_rs_resource_set[FAPI_NR_MAX_NUM_ZP_CSI_RS_RESOURCE_PER_SET];
} fapi_nr_pdsch_config_dedicated_t; } fapi_nr_pdsch_config_dedicated_t;
typedef struct { typedef struct {
uint16_t starting_prb; uint16_t starting_prb;
uint8_t intra_slot_frequency_hopping; uint8_t intra_slot_frequency_hopping;
uint16_t second_hop_prb; uint16_t second_hop_prb;
uint8_t format; // pucch format 0..4 uint8_t format; // pucch format 0..4
uint8_t initial_cyclic_shift; uint8_t initial_cyclic_shift;
uint8_t number_of_symbols; uint8_t number_of_symbols;
uint8_t starting_symbol_index; uint8_t starting_symbol_index;
uint8_t time_domain_occ; uint8_t time_domain_occ;
uint8_t number_of_prbs; uint8_t number_of_prbs;
uint8_t occ_length; uint8_t occ_length;
uint8_t occ_index; uint8_t occ_index;
} fapi_nr_pucch_resource_t; } fapi_nr_pucch_resource_t;
typedef struct { typedef struct {
uint8_t periodicity; uint8_t periodicity;
uint8_t number_of_harq_process; uint8_t number_of_harq_process;
fapi_nr_pucch_resource_t n1_pucch_an; fapi_nr_pucch_resource_t n1_pucch_an;
} fapi_nr_sps_config_t; } fapi_nr_sps_config_t;
typedef struct { typedef struct {
uint8_t beam_failure_instance_max_count; uint8_t beam_failure_instance_max_count;
uint8_t beam_failure_detection_timer; uint8_t beam_failure_detection_timer;
} fapi_nr_radio_link_monitoring_config_t; } fapi_nr_radio_link_monitoring_config_t;
typedef struct { typedef struct {
fapi_nr_pdcch_config_dedicated_t pdcch_config_dedicated; fapi_nr_pdcch_config_dedicated_t pdcch_config_dedicated;
fapi_nr_pdsch_config_dedicated_t pdsch_config_dedicated; fapi_nr_pdsch_config_dedicated_t pdsch_config_dedicated;
fapi_nr_sps_config_t sps_config; fapi_nr_sps_config_t sps_config;
fapi_nr_radio_link_monitoring_config_t radio_link_monitoring_config; fapi_nr_radio_link_monitoring_config_t radio_link_monitoring_config;
} fapi_nr_dl_bwp_dedicated_config_t; } fapi_nr_dl_bwp_dedicated_config_t;
typedef struct { typedef struct {
fapi_nr_rach_config_common_t rach_config_common; fapi_nr_rach_config_common_t rach_config_common;
fapi_nr_pusch_config_common_t pusch_config_common; fapi_nr_pusch_config_common_t pusch_config_common;
fapi_nr_pucch_config_common_t pucch_config_common; fapi_nr_pucch_config_common_t pucch_config_common;
} fapi_nr_ul_bwp_common_config_t; } fapi_nr_ul_bwp_common_config_t;
typedef struct { typedef struct {
uint8_t inter_slot_frequency_hopping; uint8_t inter_slot_frequency_hopping;
uint8_t additional_dmrs; uint8_t additional_dmrs;
uint8_t max_code_rate; uint8_t max_code_rate;
uint8_t number_of_slots; uint8_t number_of_slots;
uint8_t pi2bpsk; uint8_t pi2bpsk;
uint8_t simultaneous_harq_ack_csi; uint8_t simultaneous_harq_ack_csi;
} fapi_nr_pucch_format_config_t; } fapi_nr_pucch_format_config_t;
typedef struct { typedef struct {
fapi_nr_pucch_format_config_t format1; fapi_nr_pucch_format_config_t format1;
fapi_nr_pucch_format_config_t format2; fapi_nr_pucch_format_config_t format2;
fapi_nr_pucch_format_config_t format3; fapi_nr_pucch_format_config_t format3;
fapi_nr_pucch_format_config_t format4; fapi_nr_pucch_format_config_t format4;
fapi_nr_pucch_resource_t multi_csi_pucch_resources[2]; fapi_nr_pucch_resource_t multi_csi_pucch_resources[2];
uint8_t dl_data_to_ul_ack[8]; uint8_t dl_data_to_ul_ack[8];
// pucch power control // pucch power control
uint8_t deltaF_pucch_f0; uint8_t deltaF_pucch_f0;
uint8_t deltaF_pucch_f1; uint8_t deltaF_pucch_f1;
uint8_t deltaF_pucch_f2; uint8_t deltaF_pucch_f2;
uint8_t deltaF_pucch_f3; uint8_t deltaF_pucch_f3;
uint8_t deltaF_pucch_f4; uint8_t deltaF_pucch_f4;
uint8_t two_pucch_pc_adjusment_states; uint8_t two_pucch_pc_adjusment_states;
} fapi_nr_pucch_config_dedicated_t; } fapi_nr_pucch_config_dedicated_t;
typedef struct { typedef struct {
uint8_t dmrs_type; uint8_t dmrs_type;
uint8_t dmrs_addition_position; uint8_t dmrs_addition_position;
uint8_t ptrs_uplink_config; // to indicate if PTRS Uplink is configured of not uint8_t ptrs_uplink_config; // to indicate if PTRS Uplink is configured of not
uint8_t ptrs_type; //cp-OFDM, dft-S-OFDM uint8_t ptrs_type; //cp-OFDM, dft-S-OFDM
uint16_t ptrs_frequency_density[2]; uint16_t ptrs_frequency_density[2];
uint8_t ptrs_time_density[3]; uint8_t ptrs_time_density[3];
uint8_t ptrs_max_number_of_ports; uint8_t ptrs_max_number_of_ports;
uint8_t ptrs_resource_element_offset; uint8_t ptrs_resource_element_offset;
uint8_t ptrs_power; uint8_t ptrs_power;
uint16_t ptrs_sample_density[5]; uint16_t ptrs_sample_density[5];
uint8_t ptrs_time_density_transform_precoding; uint8_t ptrs_time_density_transform_precoding;
uint8_t max_length; uint8_t max_length;
uint16_t scrambling_id0; uint16_t scrambling_id0;
uint16_t scrambling_id1; uint16_t scrambling_id1;
uint8_t npusch_identity; uint8_t npusch_identity;
uint8_t disable_sequence_group_hopping; uint8_t disable_sequence_group_hopping;
uint8_t sequence_hopping_enable; uint8_t sequence_hopping_enable;
} fapi_nr_dmrs_uplink_config_t; } fapi_nr_dmrs_uplink_config_t;
typedef struct { typedef struct {
uint8_t tpc_accmulation; uint8_t tpc_accmulation;
uint8_t msg3_alpha; uint8_t msg3_alpha;
uint8_t p0_nominal_with_grant; uint8_t p0_nominal_with_grant;
uint8_t two_pusch_pc_adjustments_states; uint8_t two_pusch_pc_adjustments_states;
uint8_t delta_mcs; uint8_t delta_mcs;
} fapi_nr_pusch_power_control_t; } fapi_nr_pusch_power_control_t;
typedef enum {tx_config_codebook = 1, tx_config_nonCodebook = 2} tx_config_t; typedef enum {tx_config_codebook = 1, tx_config_nonCodebook = 2} tx_config_t;
typedef enum {transform_precoder_disabled = 0, transform_precoder_enabled = 1} transform_precoder_t; typedef enum {transform_precoder_disabled = 0, transform_precoder_enabled = 1} transform_precoder_t;
typedef enum { typedef enum {
codebook_subset_fullyAndPartialAndNonCoherent = 1, codebook_subset_fullyAndPartialAndNonCoherent = 1,
codebook_subset_partialAndNonCoherent = 2, codebook_subset_partialAndNonCoherent = 2,
codebook_subset_nonCoherent = 3} codebook_subset_t; codebook_subset_nonCoherent = 3} codebook_subset_t;
typedef struct { typedef struct {
uint16_t data_scrambling_identity; uint16_t data_scrambling_identity;
tx_config_t tx_config; tx_config_t tx_config;
fapi_nr_dmrs_uplink_config_t dmrs_ul_for_pusch_mapping_type_a; fapi_nr_dmrs_uplink_config_t dmrs_ul_for_pusch_mapping_type_a;
fapi_nr_dmrs_uplink_config_t dmrs_ul_for_pusch_mapping_type_b; fapi_nr_dmrs_uplink_config_t dmrs_ul_for_pusch_mapping_type_b;
fapi_nr_pusch_power_control_t pusch_power_control; fapi_nr_pusch_power_control_t pusch_power_control;
uint8_t frequency_hopping; uint8_t frequency_hopping;
uint16_t frequency_hopping_offset_lists[4]; uint16_t frequency_hopping_offset_lists[4];
uint8_t resource_allocation; uint8_t resource_allocation;
fapi_nr_pusch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_UL_ALLOCATIONS]; fapi_nr_pusch_time_domain_resource_allocation_t allocation_list[FAPI_NR_MAX_NUM_UL_ALLOCATIONS];
uint8_t pusch_aggregation_factor; uint8_t pusch_aggregation_factor;
uint8_t mcs_table; uint8_t mcs_table;
uint8_t mcs_table_transform_precoder; uint8_t mcs_table_transform_precoder;
transform_precoder_t transform_precoder; transform_precoder_t transform_precoder;
codebook_subset_t codebook_subset; codebook_subset_t codebook_subset;
uint8_t max_rank; uint8_t max_rank;
uint8_t rbg_size; uint8_t rbg_size;
//uci-OnPUSCH //uci-OnPUSCH
uint8_t uci_on_pusch_type; //dynamic, semi-static uint8_t uci_on_pusch_type; //dynamic, semi-static
uint8_t beta_offset_ack_index1[4]; uint8_t beta_offset_ack_index1[4];
uint8_t beta_offset_ack_index2[4]; uint8_t beta_offset_ack_index2[4];
uint8_t beta_offset_ack_index3[4]; uint8_t beta_offset_ack_index3[4];
uint8_t beta_offset_csi_part1_index1[4]; uint8_t beta_offset_csi_part1_index1[4];
uint8_t beta_offset_csi_part1_index2[4]; uint8_t beta_offset_csi_part1_index2[4];
uint8_t beta_offset_csi_part2_index1[4]; uint8_t beta_offset_csi_part2_index1[4];
uint8_t beta_offset_csi_part2_index2[4]; uint8_t beta_offset_csi_part2_index2[4];
uint8_t tp_pi2BPSK; uint8_t tp_pi2BPSK;
} fapi_nr_pusch_config_dedicated_t; } fapi_nr_pusch_config_dedicated_t;
typedef struct { typedef struct {
uint8_t frequency_hopping; uint8_t frequency_hopping;
fapi_nr_dmrs_uplink_config_t cg_dmrs_configuration; fapi_nr_dmrs_uplink_config_t cg_dmrs_configuration;
uint8_t mcs_table; uint8_t mcs_table;
uint8_t mcs_table_transform_precoder; uint8_t mcs_table_transform_precoder;
//uci-OnPUSCH //uci-OnPUSCH
uint8_t uci_on_pusch_type; //dynamic, semi-static uint8_t uci_on_pusch_type; //dynamic, semi-static
uint8_t beta_offset_ack_index1[4]; uint8_t beta_offset_ack_index1[4];
uint8_t beta_offset_ack_index2[4]; uint8_t beta_offset_ack_index2[4];
uint8_t beta_offset_ack_index3[4]; uint8_t beta_offset_ack_index3[4];
uint8_t beta_offset_csi_part1_index1[4]; uint8_t beta_offset_csi_part1_index1[4];
uint8_t beta_offset_csi_part1_index2[4]; uint8_t beta_offset_csi_part1_index2[4];
uint8_t beta_offset_csi_part2_index1[4]; uint8_t beta_offset_csi_part2_index1[4];
uint8_t beta_offset_csi_part2_index2[4]; uint8_t beta_offset_csi_part2_index2[4];
uint8_t resource_allocation; uint8_t resource_allocation;
// rgb-Size structure missing in spec. // rgb-Size structure missing in spec.
uint8_t power_control_loop_to_use; uint8_t power_control_loop_to_use;
// p0-PUSCH-Alpha // p0-PUSCH-Alpha
uint8_t p0; uint8_t p0;
uint8_t alpha; uint8_t alpha;
uint8_t transform_precoder; uint8_t transform_precoder;
uint8_t number_of_harq_process; uint8_t number_of_harq_process;
uint8_t rep_k; uint8_t rep_k;
uint8_t rep_k_rv; uint8_t rep_k_rv;
uint8_t periodicity; uint8_t periodicity;
uint8_t configured_grant_timer; uint8_t configured_grant_timer;
// rrc-ConfiguredUplinkGrant // rrc-ConfiguredUplinkGrant
uint16_t time_domain_offset; uint16_t time_domain_offset;
uint8_t time_domain_allocation; uint8_t time_domain_allocation;
uint32_t frequency_domain_allocation; uint32_t frequency_domain_allocation;
uint8_t antenna_ports; uint8_t antenna_ports;
uint8_t dmrs_seq_initialization; uint8_t dmrs_seq_initialization;
uint8_t precoding_and_number_of_layers; uint8_t precoding_and_number_of_layers;
uint8_t srs_resource_indicator; uint8_t srs_resource_indicator;
uint8_t mcs_and_tbs; uint8_t mcs_and_tbs;
uint8_t frequency_hopping_offset; uint8_t frequency_hopping_offset;
uint8_t path_loss_reference_index; uint8_t path_loss_reference_index;
} fapi_nr_configured_grant_config_t; } fapi_nr_configured_grant_config_t;
typedef struct { typedef struct {
uint8_t qcl_type1_serving_cell_index; uint8_t qcl_type1_serving_cell_index;
uint8_t qcl_type1_bwp_id; uint8_t qcl_type1_bwp_id;
uint8_t qcl_type1_rs_type; // csi-rs or ssb uint8_t qcl_type1_rs_type; // csi-rs or ssb
uint8_t qcl_type1_nzp_csi_rs_resource_id; uint8_t qcl_type1_nzp_csi_rs_resource_id;
uint8_t qcl_type1_ssb_index; uint8_t qcl_type1_ssb_index;
uint8_t qcl_type1_type; uint8_t qcl_type1_type;
uint8_t qcl_type2_serving_cell_index; uint8_t qcl_type2_serving_cell_index;
uint8_t qcl_type2_bwp_id; uint8_t qcl_type2_bwp_id;
uint8_t qcl_type2_rs_type; // csi-rs or ssb uint8_t qcl_type2_rs_type; // csi-rs or ssb
uint8_t qcl_type2_nzp_csi_rs_resource_id; uint8_t qcl_type2_nzp_csi_rs_resource_id;
uint8_t qcl_type2_ssb_index; uint8_t qcl_type2_ssb_index;
uint8_t qcl_type2_type; uint8_t qcl_type2_type;
} fapi_nr_tci_state_t; } fapi_nr_tci_state_t;
typedef struct { typedef struct {
uint8_t root_sequence_index; uint8_t root_sequence_index;
// rach genertic // rach genertic
uint8_t prach_configuration_index; uint8_t prach_configuration_index;
uint8_t msg1_fdm; uint8_t msg1_fdm;
uint8_t msg1_frequency_start; uint8_t msg1_frequency_start;
uint8_t zero_correlation_zone_config; uint8_t zero_correlation_zone_config;
uint8_t preamble_received_target_power; uint8_t preamble_received_target_power;
uint8_t preamble_transmission_max; uint8_t preamble_transmission_max;
uint8_t power_ramping_step; uint8_t power_ramping_step;
uint8_t ra_window_size; uint8_t ra_window_size;
uint8_t rsrp_threshold_ssb; uint8_t rsrp_threshold_ssb;
// PRACH-ResourceDedicatedBFR // PRACH-ResourceDedicatedBFR
uint8_t bfr_ssb_index[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint8_t bfr_ssb_index[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint8_t bfr_ssb_ra_preamble_index[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint8_t bfr_ssb_ra_preamble_index[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
// NZP-CSI-RS-Resource // NZP-CSI-RS-Resource
uint8_t bfr_csi_rs_nzp_resource_mapping[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint8_t bfr_csi_rs_nzp_resource_mapping[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint8_t bfr_csi_rs_power_control_offset[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint8_t bfr_csi_rs_power_control_offset[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint8_t bfr_csi_rs_power_control_offset_ss[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint8_t bfr_csi_rs_power_control_offset_ss[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint16_t bfr_csi_rs_scrambling_id[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint16_t bfr_csi_rs_scrambling_id[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint8_t bfr_csi_rs_resource_periodicity[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint8_t bfr_csi_rs_resource_periodicity[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint16_t bfr_csi_rs_resource_offset[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint16_t bfr_csi_rs_resource_offset[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
fapi_nr_tci_state_t qcl_infomation_periodic_csi_rs[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; fapi_nr_tci_state_t qcl_infomation_periodic_csi_rs[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint8_t bfr_csirs_ra_occasions[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS]; uint8_t bfr_csirs_ra_occasions[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS];
uint8_t bfr_csirs_ra_preamble_index[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS][FAPI_NR_MAX_RA_OCCASION_PER_CSIRS]; uint8_t bfr_csirs_ra_preamble_index[FAPI_NR_MAX_NUM_CANDIDATE_BEAMS][FAPI_NR_MAX_RA_OCCASION_PER_CSIRS];
uint8_t ssb_per_rach_occasion; uint8_t ssb_per_rach_occasion;
uint8_t ra_ssb_occasion_mask_index; uint8_t ra_ssb_occasion_mask_index;
fapi_nr_search_space_t recovery_search_space; fapi_nr_search_space_t recovery_search_space;
// RA-Prioritization // RA-Prioritization
uint8_t power_ramping_step_high_priority; uint8_t power_ramping_step_high_priority;
uint8_t scaling_factor_bi; uint8_t scaling_factor_bi;
uint8_t beam_failure_recovery_timer; uint8_t beam_failure_recovery_timer;
} fapi_nr_beam_failure_recovery_config_t; } fapi_nr_beam_failure_recovery_config_t;
typedef struct { typedef struct {
fapi_nr_pucch_config_dedicated_t pucch_config_dedicated; fapi_nr_pucch_config_dedicated_t pucch_config_dedicated;
fapi_nr_pusch_config_dedicated_t pusch_config_dedicated; fapi_nr_pusch_config_dedicated_t pusch_config_dedicated;
fapi_nr_configured_grant_config_t configured_grant_config; fapi_nr_configured_grant_config_t configured_grant_config;
// SRS-Config // SRS-Config
uint8_t srs_tpc_accumulation; uint8_t srs_tpc_accumulation;
fapi_nr_beam_failure_recovery_config_t beam_failure_recovery_config; fapi_nr_beam_failure_recovery_config_t beam_failure_recovery_config;
} fapi_nr_ul_bwp_dedicated_config_t; } fapi_nr_ul_bwp_dedicated_config_t;
#define FAPI_NR_CONFIG_REQUEST_MASK_PBCH 0x01 #define FAPI_NR_CONFIG_REQUEST_MASK_PBCH 0x01
#define FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_COMMON 0x02 #define FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_COMMON 0x02
...@@ -906,15 +907,15 @@ typedef struct { ...@@ -906,15 +907,15 @@ typedef struct {
#define FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_DEDICATED 0x10 #define FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_DEDICATED 0x10
typedef struct { typedef struct {
uint32_t config_mask; uint32_t config_mask;
fapi_nr_pbch_config_t pbch_config; // MIB fapi_nr_pbch_config_t pbch_config; // MIB
fapi_nr_dl_bwp_common_config_t dl_bwp_common; fapi_nr_dl_bwp_common_config_t dl_bwp_common;
fapi_nr_dl_bwp_dedicated_config_t dl_bwp_dedicated; fapi_nr_dl_bwp_dedicated_config_t dl_bwp_dedicated;
fapi_nr_ul_bwp_common_config_t ul_bwp_common; fapi_nr_ul_bwp_common_config_t ul_bwp_common;
fapi_nr_ul_bwp_dedicated_config_t ul_bwp_dedicated; fapi_nr_ul_bwp_dedicated_config_t ul_bwp_dedicated;
} fapi_nr_config_request_t; } fapi_nr_config_request_t;
......
openair1/PHY/defs_nr_UE.h
View file @ c9e741e0
...@@ -1019,7 +1019,12 @@ typedef struct { ...@@ -1019,7 +1019,12 @@ typedef struct {
nr_ue_if_module_t *if_inst; nr_ue_if_module_t *if_inst;
nr_downlink_indication_t dl_indication; nr_downlink_indication_t dl_indication;
nr_uplink_indication_t ul_indication; nr_uplink_indication_t ul_indication;
/// UE FAPI DCI request
nr_dcireq_t dcireq;
/// UE FAPI indication for DLSCH reception
fapi_nr_rx_indication_t rx_ind; fapi_nr_rx_indication_t rx_ind;
/// UE FAPI indication for DCI reception
fapi_nr_dci_indication_t dci_ind; fapi_nr_dci_indication_t dci_ind;
// point to the current rxTx thread index // point to the current rxTx thread index
......
openair1/SCHED_NR_UE/defs.h
View file @ c9e741e0
...@@ -123,7 +123,7 @@ void phy_procedures_UE_TX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB ...@@ -123,7 +123,7 @@ void phy_procedures_UE_TX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB
@param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying @param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
@param phy_vars_rn pointer to RN variables @param phy_vars_rn pointer to RN variables
*/ */
int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,uint8_t do_pdcch_flag,runmode_t mode,relaying_type_t r_type); int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t do_pdcch_flag,runmode_t mode);
int phy_procedures_slot_parallelization_UE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,uint8_t do_pdcch_flag,runmode_t mode,relaying_type_t r_type); int phy_procedures_slot_parallelization_UE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,uint8_t do_pdcch_flag,runmode_t mode,relaying_type_t r_type);
#ifdef UE_SLOT_PARALLELISATION #ifdef UE_SLOT_PARALLELISATION
......
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @ c9e741e0
...@@ -3541,9 +3541,9 @@ int nr_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t * ...@@ -3541,9 +3541,9 @@ int nr_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *
// this table contains 56 (NBR_NR_DCI_FIELDS) elements for each dci field and format described in TS 38.212. Each element represents the size in bits for each dci field // this table contains 56 (NBR_NR_DCI_FIELDS) elements for each dci field and format described in TS 38.212. Each element represents the size in bits for each dci field
//uint8_t dci_fields_sizes[NBR_NR_DCI_FIELDS][NBR_NR_FORMATS] = {0}; //uint8_t dci_fields_sizes[NBR_NR_DCI_FIELDS][NBR_NR_FORMATS] = {0};
// this is the UL bandwidth part. FIXME! To be defined where this value comes from // this is the UL bandwidth part. FIXME! To be defined where this value comes from
// uint16_t n_RB_ULBWP = 106; uint16_t n_RB_ULBWP = 106;
// this is the DL bandwidth part. FIXME! To be defined where this value comes from // this is the DL bandwidth part. FIXME! To be defined where this value comes from
//uint16_t n_RB_DLBWP = 106; uint16_t n_RB_DLBWP = 106;
//#ifdef NR_PDCCH_SCHED_DEBUG //#ifdef NR_PDCCH_SCHED_DEBUG
// printf("<-NR_PDCCH_PHY_PROCEDURES_LTE_UE (nr_ue_pdcch_procedures)-> n_RB_ULBWP=%d n_RB_DLBWP=%d\n", // printf("<-NR_PDCCH_PHY_PROCEDURES_LTE_UE (nr_ue_pdcch_procedures)-> n_RB_ULBWP=%d n_RB_DLBWP=%d\n",
// n_RB_ULBWP, // n_RB_ULBWP,
...@@ -5917,25 +5917,24 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -5917,25 +5917,24 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
//nr_gold_pdcch(ue,0, 2); //nr_gold_pdcch(ue,0, 2);
for (int l=0; l<2; l++) { for (int l=0; l<2; l++) {
if (abstraction_flag == 0) {
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
start_meas(&ue->ofdm_demod_stats); start_meas(&ue->ofdm_demod_stats);
#endif #endif
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP, VCD_FUNCTION_IN); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP, VCD_FUNCTION_IN);
nr_slot_fep(ue, nr_slot_fep(ue,
l, l,
nr_tti_rx, nr_tti_rx,
0, 0,
0, 0,
1, 1,
NR_PDCCH_EST); NR_PDCCH_EST);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP, VCD_FUNCTION_OUT);
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->ofdm_demod_stats); stop_meas(&ue->ofdm_demod_stats);
#endif #endif
}
} }
write_output("rxdataF.m","rxF",ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx>>1]].rxdataF[0],ue->frame_parms.ofdm_symbol_size*2,1,1); write_output("rxdataF.m","rxF",ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx>>1]].rxdataF[0],ue->frame_parms.ofdm_symbol_size*2,1,1);
...@@ -5950,7 +5949,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -5950,7 +5949,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
//printf(">>> at phy_procedures_nrUE_RX, nr_ue_pdcch_procedures init, dlsch->active=%d\n", //printf(">>> at phy_procedures_nrUE_RX, nr_ue_pdcch_procedures init, dlsch->active=%d\n",
// ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active); // ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active);
if (nr_ue_pdcch_procedures(eNB_id,ue,proc,abstraction_flag) == -1) { if (nr_ue_pdcch_procedures(eNB_id,ue,proc,0) == -1) {
LOG_E(PHY,"[UE %d] Frame %d, nr_tti_rx %d: Error in pdcch procedures\n",ue->Mod_id,frame_rx,nr_tti_rx); LOG_E(PHY,"[UE %d] Frame %d, nr_tti_rx %d: Error in pdcch procedures\n",ue->Mod_id,frame_rx,nr_tti_rx);
return(-1); return(-1);
} }
...@@ -6014,12 +6013,12 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6014,12 +6013,12 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
nr_gold_pdsch(ue,0,0, 1); nr_gold_pdsch(ue,0,0, 1);
nr_slot_fep(ue, nr_slot_fep(ue,
2, //to be updated from higher layer 2, //to be updated from higher layer
(nr_tti_rx<<1), (nr_tti_rx<<1),
0, 0,
0, 0,
0, 0,
NR_PDSCH_EST); NR_PDSCH_EST);
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
start_meas(&ue->generic_stat); start_meas(&ue->generic_stat);
...@@ -6035,7 +6034,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6035,7 +6034,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols, ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1, ue->frame_parms.symbols_per_tti>>1,
abstraction_flag); 0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_OUT);
} }
...@@ -6052,7 +6051,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6052,7 +6051,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols, ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1, ue->frame_parms.symbols_per_tti>>1,
abstraction_flag); 0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_SI, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_SI, VCD_FUNCTION_OUT);
} }
...@@ -6067,7 +6066,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6067,7 +6066,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols, ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1, ue->frame_parms.symbols_per_tti>>1,
abstraction_flag); 0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_P, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_P, VCD_FUNCTION_OUT);
} }
...@@ -6082,7 +6081,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6082,7 +6081,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols, ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1, ue->frame_parms.symbols_per_tti>>1,
abstraction_flag); 0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_RA, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_RA, VCD_FUNCTION_OUT);
} }
...@@ -6140,7 +6139,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6140,7 +6139,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
if ( (nr_tti_rx == 0) && (ue->decode_MIB == 1)) if ( (nr_tti_rx == 0) && (ue->decode_MIB == 1))
{ {
ue_pbch_procedures(eNB_id,ue,proc,abstraction_flag); ue_pbch_procedures(eNB_id,ue,proc,0);
} }
// do procedures for C-RNTI // do procedures for C-RNTI
...@@ -6159,7 +6158,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6159,7 +6158,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
1+(ue->frame_parms.symbols_per_tti>>1), 1+(ue->frame_parms.symbols_per_tti>>1),
ue->frame_parms.symbols_per_tti-1, ue->frame_parms.symbols_per_tti-1,
abstraction_flag); 0);
LOG_D(PHY," ------ end PDSCH ChannelComp/LLR slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, nr_tti_rx); LOG_D(PHY," ------ end PDSCH ChannelComp/LLR slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, nr_tti_rx);
LOG_D(PHY," ------ --> PDSCH Turbo Decoder slot 0/1: AbsSubframe %d.%d ------ \n", frame_rx%1024, nr_tti_rx); LOG_D(PHY," ------ --> PDSCH Turbo Decoder slot 0/1: AbsSubframe %d.%d ------ \n", frame_rx%1024, nr_tti_rx);
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
...@@ -6174,7 +6173,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6174,7 +6173,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][1], ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][1],
&ue->dlsch_errors[eNB_id], &ue->dlsch_errors[eNB_id],
mode, mode,
abstraction_flag);*/ 0);*/
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->dlsch_procedures_stat[ue->current_thread_id[nr_tti_rx]]); stop_meas(&ue->dlsch_procedures_stat[ue->current_thread_id[nr_tti_rx]]);
#if DISABLE_LOG_X #if DISABLE_LOG_X
...@@ -6224,7 +6223,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6224,7 +6223,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
1+(ue->frame_parms.symbols_per_tti>>1), 1+(ue->frame_parms.symbols_per_tti>>1),
ue->frame_parms.symbols_per_tti-1, ue->frame_parms.symbols_per_tti-1,
abstraction_flag); 0);
/*ue_dlsch_procedures(ue, /*ue_dlsch_procedures(ue,
proc, proc,
...@@ -6234,7 +6233,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6234,7 +6233,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
&ue->dlsch_SI_errors[eNB_id], &ue->dlsch_SI_errors[eNB_id],
mode, mode,
abstraction_flag); 0);
ue->dlsch_SI[eNB_id]->active = 0;*/ ue->dlsch_SI[eNB_id]->active = 0;*/
} }
...@@ -6248,7 +6247,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6248,7 +6247,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
1+(ue->frame_parms.symbols_per_tti>>1), 1+(ue->frame_parms.symbols_per_tti>>1),
ue->frame_parms.symbols_per_tti-1, ue->frame_parms.symbols_per_tti-1,
abstraction_flag); 0);
/*ue_dlsch_procedures(ue, /*ue_dlsch_procedures(ue,
proc, proc,
...@@ -6258,7 +6257,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6258,7 +6257,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
&ue->dlsch_p_errors[eNB_id], &ue->dlsch_p_errors[eNB_id],
mode, mode,
abstraction_flag);*/ 0);*/
ue->dlsch_p[eNB_id]->active = 0; ue->dlsch_p[eNB_id]->active = 0;
} }
// do procedures for RA-RNTI // do procedures for RA-RNTI
...@@ -6271,7 +6270,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6271,7 +6270,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
1+(ue->frame_parms.symbols_per_tti>>1), 1+(ue->frame_parms.symbols_per_tti>>1),
ue->frame_parms.symbols_per_tti-1, ue->frame_parms.symbols_per_tti-1,
abstraction_flag); 0);
/*ue_dlsch_procedures(ue, /*ue_dlsch_procedures(ue,
proc, proc,
eNB_id, eNB_id,
...@@ -6280,7 +6279,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ...@@ -6280,7 +6279,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
NULL, NULL,
&ue->dlsch_ra_errors[eNB_id], &ue->dlsch_ra_errors[eNB_id],
mode, mode,
abstraction_flag);*/ 0);*/
ue->dlsch_ra[eNB_id]->active = 0; ue->dlsch_ra[eNB_id]->active = 0;
} }
......
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @ c9e741e0
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
static nr_ue_if_module_t *nr_ue_if_module_inst[MAX_IF_MODULES]; static nr_ue_if_module_t *nr_ue_if_module_inst[MAX_IF_MODULES];
// L2 Abstraction Layer // L2 Abstraction Layer
int8_t handle_bcch_bch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint8_t *pduP, uint8_t additional_bits, uint32_t ssb_index, uint32_t ssb_length, uint16_t cell_id){ int handle_bcch_bch(module_id_t module_id, int cc_id, unsigned int gNB_index, uint8_t *pduP, unsigned int additional_bits, uint32_t ssb_index, uint32_t ssb_length, uint16_t cell_id){
return nr_ue_decode_mib( module_id, return nr_ue_decode_mib( module_id,
cc_id, cc_id,
...@@ -55,12 +55,12 @@ int8_t handle_bcch_bch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint ...@@ -55,12 +55,12 @@ int8_t handle_bcch_bch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint
} }
// L2 Abstraction Layer // L2 Abstraction Layer
int8_t handle_bcch_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint32_t sibs_mask, uint8_t *pduP, uint32_t pdu_len){ int handle_bcch_dlsch(module_id_t module_id, int cc_id, unsigned int gNB_index, uint32_t sibs_mask, uint8_t *pduP, uint32_t pdu_len){
return 0; return 0;
} }
// L2 Abstraction Layer // L2 Abstraction Layer
int8_t handle_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){ int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type){
return nr_ue_process_dci(module_id, cc_id, gNB_index, dci, rnti, dci_type); return nr_ue_process_dci(module_id, cc_id, gNB_index, dci, rnti, dci_type);
...@@ -78,7 +78,7 @@ int8_t handle_dlsch (module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_n ...@@ -78,7 +78,7 @@ int8_t handle_dlsch (module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_n
} }
int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info){ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
NR_UE_L2_STATE_t ret; NR_UE_L2_STATE_t ret;
module_id_t module_id = ul_info->module_id; module_id_t module_id = ul_info->module_id;
...@@ -118,7 +118,7 @@ int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info){ ...@@ -118,7 +118,7 @@ int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
return 0; return 0;
} }
int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info){ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
int32_t i; int32_t i;
uint32_t ret_mask = 0x0; uint32_t ret_mask = 0x0;
...@@ -248,7 +248,7 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id){ ...@@ -248,7 +248,7 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id){
return nr_ue_if_module_inst[module_id]; return nr_ue_if_module_inst[module_id];
} }
int8_t nr_ue_if_module_kill(uint32_t module_id) { int nr_ue_if_module_kill(uint32_t module_id) {
if (nr_ue_if_module_inst[module_id] != NULL){ if (nr_ue_if_module_inst[module_id] != NULL){
free(nr_ue_if_module_inst[module_id]); free(nr_ue_if_module_inst[module_id]);
......
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
View file @ c9e741e0
...@@ -38,6 +38,21 @@ ...@@ -38,6 +38,21 @@
typedef struct {
/// module id
module_id_t module_id;
/// gNB index
uint32_t gNB_index;
/// component carrier id
int cc_id;
/// frame
frame_t frame;
/// slot
int slot;
fapi_nr_dl_config_request_t dl_config_req;
} nr_dcireq_t;
typedef struct { typedef struct {
/// module id /// module id
module_id_t module_id; module_id_t module_id;
...@@ -48,7 +63,7 @@ typedef struct { ...@@ -48,7 +63,7 @@ typedef struct {
/// frame /// frame
frame_t frame; frame_t frame;
/// slot /// slot
uint8_t slot; int slot;
/// NR UE FAPI-like P7 message, direction: L1 to L2 /// NR UE FAPI-like P7 message, direction: L1 to L2
/// data reception indication structure /// data reception indication structure
...@@ -72,7 +87,7 @@ typedef struct { ...@@ -72,7 +87,7 @@ typedef struct {
/// slot /// slot
uint32_t slot; uint32_t slot;
/// ssb_index, if ssb is not present in current TTI, thie value set to -1 /// ssb_index, if ssb is not present in current TTI, thie value set to -1
int8_t ssb_index; int ssb_index;
} nr_uplink_indication_t; } nr_uplink_indication_t;
// Downlink subframe P7 // Downlink subframe P7
...@@ -82,13 +97,13 @@ typedef struct { ...@@ -82,13 +97,13 @@ typedef struct {
/// module id /// module id
module_id_t module_id; module_id_t module_id;
/// component carrier id /// component carrier id
uint8_t CC_id; int CC_id;
/// frame /// frame
frame_t frame; frame_t frame;
/// subframe /// subframe
sub_frame_t subframe; sub_frame_t subframe;
/// slot /// slot
uint8_t slot; int slot;
/// NR UE FAPI-like P7 message, direction: L2 to L1 /// NR UE FAPI-like P7 message, direction: L2 to L1
/// downlink transmission configuration request structure /// downlink transmission configuration request structure
...@@ -122,7 +137,7 @@ typedef struct { ...@@ -122,7 +137,7 @@ typedef struct {
* -1: Failed to consume bytes. Abort the mission. * -1: Failed to consume bytes. Abort the mission.
* Non-negative return values indicate success, and ignored. * Non-negative return values indicate success, and ignored.
*/ */
typedef int8_t (nr_ue_scheduled_response_f)(nr_scheduled_response_t *scheduled_response); typedef int (nr_ue_scheduled_response_f)(nr_scheduled_response_t *scheduled_response);
/* /*
...@@ -132,7 +147,7 @@ typedef int8_t (nr_ue_scheduled_response_f)(nr_scheduled_response_t *scheduled_r ...@@ -132,7 +147,7 @@ typedef int8_t (nr_ue_scheduled_response_f)(nr_scheduled_response_t *scheduled_r
* -1: Failed to consume bytes. Abort the mission. * -1: Failed to consume bytes. Abort the mission.
* Non-negative return values indicate success, and ignored. * Non-negative return values indicate success, and ignored.
*/ */
typedef int8_t (nr_ue_phy_config_request_f)(nr_phy_config_t *phy_config); typedef int (nr_ue_phy_config_request_f)(nr_phy_config_t *phy_config);
/* /*
...@@ -142,7 +157,7 @@ typedef int8_t (nr_ue_phy_config_request_f)(nr_phy_config_t *phy_config); ...@@ -142,7 +157,7 @@ typedef int8_t (nr_ue_phy_config_request_f)(nr_phy_config_t *phy_config);
* -1: Failed to consume bytes. Abort the mission. * -1: Failed to consume bytes. Abort the mission.
* Non-negative return values indicate success, and ignored. * Non-negative return values indicate success, and ignored.
*/ */
typedef int8_t (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info); typedef int (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info);
/* /*
* Generic type of an application-defined callback to return various * Generic type of an application-defined callback to return various
...@@ -151,19 +166,21 @@ typedef int8_t (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info); ...@@ -151,19 +166,21 @@ typedef int8_t (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info);
* -1: Failed to consume bytes. Abort the mission. * -1: Failed to consume bytes. Abort the mission.
* Non-negative return values indicate success, and ignored. * Non-negative return values indicate success, and ignored.
*/ */
typedef int8_t (nr_ue_ul_indication_f)(nr_uplink_indication_t *ul_info); typedef int (nr_ue_ul_indication_f)(nr_uplink_indication_t *ul_info);
typedef int (nr_ue_dcireq_f)(nr_dcireq_t *ul_info);
// TODO check this stuff can be reuse of need modification // TODO check this stuff can be reuse of need modification
typedef struct nr_ue_if_module_s { typedef struct nr_ue_if_module_s {
nr_ue_scheduled_response_f *scheduled_response; nr_ue_scheduled_response_f *scheduled_response;
nr_ue_phy_config_request_f *phy_config_request; nr_ue_phy_config_request_f *phy_config_request;
nr_ue_dl_indication_f *dl_indication; nr_ue_dl_indication_f *dl_indication;
nr_ue_ul_indication_f *ul_indication; nr_ue_ul_indication_f *ul_indication;
nr_ue_dcireq_f *dcireq;
uint32_t cc_mask; uint32_t cc_mask;
uint32_t current_frame; uint32_t current_frame;
uint32_t current_slot; uint32_t current_slot;
//pthread_mutex_t nr_if_mutex; //pthread_mutex_t nr_if_mutex;
} nr_ue_if_module_t; } nr_ue_if_module_t;
...@@ -174,14 +191,16 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id); ...@@ -174,14 +191,16 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id);
/**\brief done free of memory allocation by module_id and release to pointer pool. /**\brief done free of memory allocation by module_id and release to pointer pool.
\param module_id module id*/ \param module_id module id*/
int8_t nr_ue_if_module_kill(uint32_t module_id); int nr_ue_if_module_kill(uint32_t module_id);
/**\brief interface between L1/L2, indicating the downlink related information, like dci_ind and rx_req /**\brief interface between L1/L2, indicating the downlink related information, like dci_ind and rx_req
\param dl_info including dci_ind and rx_request messages*/ \param dl_info including dci_ind and rx_request messages*/
int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info); int nr_ue_dl_indication(nr_downlink_indication_t *dl_info);
int nr_ue_ul_indication(nr_uplink_indication_t *ul_info);
int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info); int nr_ue_dcireq(nr_dcireq_t *dcireq);
// TODO check // TODO check
/**\brief handle BCCH-BCH message from dl_indication /**\brief handle BCCH-BCH message from dl_indication
...@@ -190,15 +209,15 @@ int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info); ...@@ -190,15 +209,15 @@ int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info);
\param ssb_index SSB index within 0 - (L_ssb-1) corresponding to 38.331 ch.13 parameter i \param ssb_index SSB index within 0 - (L_ssb-1) corresponding to 38.331 ch.13 parameter i
\param ssb_length corresponding to L1 parameter L_ssb \param ssb_length corresponding to L1 parameter L_ssb
\param cell_id cell id */ \param cell_id cell id */
int8_t handle_bcch_bch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint8_t *pduP, uint8_t additional_bits, uint32_t ssb_index, uint32_t ssb_length, uint16_t cell_id); int handle_bcch_bch(module_id_t module_id, int cc_id, unsigned int gNB_index, uint8_t *pduP, unsigned int additional_bits, uint32_t ssb_index, uint32_t ssb_length, uint16_t cell_id);
// TODO check // TODO check
/**\brief handle BCCH-DL-SCH message from dl_indication /**\brief handle BCCH-DL-SCH message from dl_indication
\param pdu_len length(bytes) of pdu \param pdu_len length(bytes) of pdu
\param pduP pointer to pdu*/ \param pduP pointer to pdu*/
int8_t handle_bcch_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint32_t sibs_mask, uint8_t *pduP, uint32_t pdu_len); int handle_bcch_dlsch(module_id_t module_id, int cc_id, unsigned int gNB_index, uint32_t sibs_mask, uint8_t *pduP, uint32_t pdu_len);
int8_t handle_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); int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type);
#endif #endif
targets/RT/USER/nr-ue.c
View file @ c9e741e0
...@@ -680,12 +680,17 @@ static void *UE_thread_rxn_txnp4(void *arg) { ...@@ -680,12 +680,17 @@ static void *UE_thread_rxn_txnp4(void *arg) {
//clean previous FAPI MESSAGE //clean previous FAPI MESSAGE
// call L2 for DL_CONFIG (DCI) // call L2 for DL_CONFIG (DCI)
UE->if_inst->dcireq(&UE->dci_config,proc->frame_rx,proc->nr_tti_rx); UE->dcireq.module_id = UE->Mod_id;
UE->dcireq.gNB_index = 0;
UE->dcireq.cc_id = 0;
UE->dcireq.frame = proc->frame_rx;
UE->dcireq.slot = proc->nr_tti_rx;
UE->if_inst->dcireq(&UE->dcireq);
#ifdef UE_SLOT_PARALLELISATION #ifdef UE_SLOT_PARALLELISATION
phy_procedures_slot_parallelization_UE_RX( UE, proc, 0, 0, 1, UE->mode, no_relay, NULL ); phy_procedures_slot_parallelization_UE_RX( UE, proc, 0, 0, 1, UE->mode, no_relay, NULL );
#else #else
phy_procedures_nrUE_RX( UE, proc, 0, 0, 1, UE->mode, no_relay); phy_procedures_nrUE_RX( UE, proc, 0, 1, UE->mode);
printf(">>> nr_ue_pdcch_procedures ended\n"); printf(">>> nr_ue_pdcch_procedures ended\n");
#endif #endif
...@@ -1139,7 +1144,7 @@ void *UE_thread(void *arg) { ...@@ -1139,7 +1144,7 @@ void *UE_thread(void *arg) {
UE->if_inst->ul_indication(&UE->ul_indication); UE->if_inst->ul_indication(&UE->ul_indication);
} }
phy_procedures_nrUE_RX( UE, proc, 0, 0, 1, UE->mode, no_relay); phy_procedures_nrUE_RX( UE, proc, 0, 1, UE->mode);
getchar(); getchar();
} // else loop_through_memory } // else loop_through_memory
} // start_rx_stream==1 } // start_rx_stream==1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment