/******************************************************************************
- << 3)*
-* Copyright (c) 2019 Intel.
+* Copyright (c) 2021 Intel.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
**/
+#include "nr5g_mac_phy_api.h"
#include "nr5g_fapi_framework.h"
-#include "gnb_l1_l2_api.h"
#include "nr5g_fapi_fapi2mac_api.h"
#include "nr5g_fapi_fapi2phy_api.h"
#include "nr5g_fapi_fapi2phy_p5_proc.h"
*
**/
uint8_t nr5g_fapi_config_request(
+ bool is_urllc,
p_nr5g_fapi_phy_instance_t p_phy_instance,
fapi_config_req_t * p_fapi_req,
fapi_vendor_msg_t * p_fapi_vendor_msg)
p_fapi_vendor_msg->config_req_vendor.sequence_hop_flag;
p_ia_config_req->nHoppingId =
p_fapi_vendor_msg->config_req_vendor.hopping_id;
+ p_ia_config_req->nUrllcCapable =
+ p_fapi_vendor_msg->config_req_vendor.urllc_capable;
+ p_ia_config_req->nUrllcMiniSlotMask =
+ p_fapi_vendor_msg->config_req_vendor.urllc_mini_slot_mask;
+ p_ia_config_req->nPrachNrofRxRU =
+ p_fapi_vendor_msg->config_req_vendor.prach_nr_of_rx_ru;
+ p_ia_config_req->nNrOfDLPorts =
+ p_fapi_vendor_msg->config_req_vendor.nr_of_dl_ports;
+ p_ia_config_req->nNrOfULPorts =
+ p_fapi_vendor_msg->config_req_vendor.nr_of_ul_ports;
+ p_ia_config_req->nSSBSubcSpacing =
+ p_fapi_vendor_msg->config_req_vendor.ssb_subc_spacing;
+ p_phy_instance->phy_config.use_vendor_EpreXSSB =
+ p_fapi_vendor_msg->config_req_vendor.use_vendor_EpreXSSB;
}
p_ia_config_req->nDLFftSize =
p_ia_config_req->nULFftSize =
nr5g_fapi_calc_fft_size(p_ia_config_req->nSubcCommon,
p_ia_config_req->nULBandwidth);
- p_ia_config_req->nPrachNrofRxRU = p_ia_config_req->nNrOfRxAnt;
/* Add element to send list */
- nr5g_fapi_fapi2phy_add_to_api_list(p_list_elem);
+ nr5g_fapi_fapi2phy_add_to_api_list(is_urllc, p_list_elem);
p_stats->iapi_stats.iapi_config_req++;
NR5G_FAPI_LOG(INFO_LOG, ("[CONFIG.request][%d]", p_phy_instance->phy_id));
/***** Carrier Config *****/
case FAPI_DL_BANDWIDTH_TAG:
p_ia_config_req->nDLBandwidth =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_DL_FREQUENCY_TAG:
- p_ia_config_req->nDLAbsFrePointA = tlvs[i++].value;
+ p_ia_config_req->nDLAbsFrePointA = tlvs[i].value;
+ ++i;
break;
/* FAPI_DL_K0_TAG - NA */
case FAPI_NUM_TX_ANT_TAG:
p_ia_config_req->nNrOfTxAnt =
GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
- p_ia_config_req->nNrOfDLPorts =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ ++i;
break;
case FAPI_UPLINK_BANDWIDTH_TAG:
p_ia_config_req->nULBandwidth =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_UPLINK_FREQUENCY_TAG:
- p_ia_config_req->nULAbsFrePointA = tlvs[i++].value;
+ p_ia_config_req->nULAbsFrePointA = tlvs[i].value;
+ ++i;
break;
/* FAPI_UL_K0_TAG - NA */
case FAPI_NUM_RX_ANT_TAG:
p_phy_instance->phy_config.n_nr_of_rx_ant =
p_ia_config_req->nNrOfRxAnt =
- GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
- p_ia_config_req->nNrOfULPorts =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
/* FAPI_FREQUENCY_SHIFT_7P5_KHZ_TAG - NA */
case FAPI_PHY_CELL_ID_TAG:
p_phy_instance->phy_config.phy_cell_id =
p_ia_config_req->nPhyCellId =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_FRAME_DUPLEX_TYPE_TAG:
p_ia_config_req->nFrameDuplexType =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
/***** SSB Config *****/
case FAPI_SCS_COMMON_TAG:
p_ia_config_req->nSubcCommon =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
- p_ia_config_req->nSSBSubcSpacing = p_ia_config_req->nSubcCommon;
+ p_ia_config_req->nSSBSubcSpacing =
+ p_phy_instance->phy_config.sub_c_common =
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
/***** PRACH Config *****/
case FAPI_PRACH_SUBC_SPACING_TAG:
p_ia_config_req->nPrachSubcSpacing =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_RESTRICTED_SET_CONFIG_TAG:
p_ia_config_req->nPrachRestrictSet =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_NUM_PRACH_FD_OCCASIONS_TAG:
p_ia_config_req->nPrachFdm =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_PRACH_CONFIG_INDEX_TAG:
p_ia_config_req->nPrachConfIdx =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_PRACH_ROOT_SEQUENCE_INDEX_TAG:
p_ia_config_req->nPrachRootSeqIdx =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_K1_TAG:
p_ia_config_req->nPrachFreqStart =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_PRACH_ZERO_CORR_CONF_TAG:
p_ia_config_req->nPrachZeroCorrConf =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_SSB_PER_RACH_TAG:
p_ia_config_req->nPrachSsbRach =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
/***** SSB Table *****/
case FAPI_SSB_OFFSET_POINT_A_TAG:
p_ia_config_req->nSSBPrbOffset =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length) / (pow(2,
- p_ia_config_req->nSubcCommon));
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length) /
+ (pow(2, p_ia_config_req->nSubcCommon));
+ ++i;
break;
case FAPI_SSB_PERIOD_TAG:
p_ia_config_req->nSSBPeriod =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_SSB_SUBCARRIER_OFFSET_TAG:
p_ia_config_req->nSSBSubcOffset =
- (tlvs[i].value >> tlvs[i++].tl.length);
+ (tlvs[i].value >> tlvs[i].tl.length);
+ ++i;
break;
case FAPI_MIB_TAG:
case FAPI_DMRS_TYPE_A_POS_TAG:
p_ia_config_req->nDMRSTypeAPos =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
break;
case FAPI_SSB_MASK_TAG:
if (n_ssb_mask_idx < 2) {
p_ia_config_req->nSSBMask[n_ssb_mask_idx++] =
- tlvs[i++].value;
+ tlvs[i].value;
+ ++i;
}
break;
case FAPI_BEAM_ID_TAG:
- if (n_beamid_idx < 64) {
+ if (n_beamid_idx < MAX_NUM_ANT_NR5G) {
p_ia_config_req->nBeamId[n_beamid_idx++] =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
+ ++i;
}
break;
case FAPI_TDD_PERIOD_TAG:
p_ia_config_req->nTddPeriod =
nr5g_fapi_calc_phy_tdd_period((uint8_t)
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length),
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length),
p_ia_config_req->nSubcCommon);
+ ++i;
break;
case FAPI_SLOT_CONFIG_TAG:
for (j = 0; j < p_ia_config_req->nTddPeriod; j++) {
p_sslot_Config = &p_ia_config_req->sSlotConfig[j];
- for (k = 0; k < MAX_NUM_OF_SYMBOL_PER_SLOT; k++) {
+ for (k = 0; k < MAX_NUM_OF_SYMBOL_PER_SLOT; k++, i++) {
p_sslot_Config->nSymbolType[k] =
- GETVLFRM32B(tlvs[i].value, tlvs[i++].tl.length);
+ GETVLFRM32B(tlvs[i].value, tlvs[i].tl.length);
}
}
break;
break;
}
}
+ nr5g_fapi_config_req_fill_dependent_fields(p_ia_config_req);
+ return SUCCESS;
+}
+
+ /** @ingroup group_source_api_p5_fapi2phy_proc
+ *
+ * @param[in,out] p_ia_config_req Pointer to IAPI CONFIG.request structure.
+ *
+ * @return Returns ::SUCCESS and ::FAILURE.
+ *
+ * @description
+ * This function converts IAPI Config.request structure fields that depend on
+ * others. The order ofLV 5G FAPI 222.10.02 - 3.3.2.1
+ *
+**/
+uint8_t nr5g_fapi_config_req_fill_dependent_fields(
+ PCONFIGREQUESTStruct p_ia_config_req)
+{
+ if (0 == p_ia_config_req->nFrameDuplexType) { // FDD
+ p_ia_config_req->nTddPeriod = 0;
+ }
+
return SUCCESS;
}
Code Review / o-du / phy.git / blobdiff