Addition of comments on packing of Config TLVs that are not supported by Aerial

Addition of assert when running nr-softmodem in nfapi mode other than aerial when compiled with it
parent 66518855
...@@ -769,6 +769,8 @@ int main( int argc, char **argv ) { ...@@ -769,6 +769,8 @@ int main( int argc, char **argv ) {
#ifdef ENABLE_AERIAL #ifdef ENABLE_AERIAL
if(NFAPI_MODE == NFAPI_MODE_AERIAL){ if(NFAPI_MODE == NFAPI_MODE_AERIAL){
nvIPC_Init(); nvIPC_Init();
}else{
AssertFatal(1==0,"Not run as Aerial mode when compiled with AERIAL, if you want to run other (n)FAPI modes, please run ./build_oai without -w AERIAL");
} }
#endif #endif
if (RC.nb_nr_L1_inst > 0) { if (RC.nb_nr_L1_inst > 0) {
......
...@@ -1673,6 +1673,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin ...@@ -1673,6 +1673,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin
numTLVs++; numTLVs++;
if (NFAPI_MODE != NFAPI_MODE_AERIAL) { if (NFAPI_MODE != NFAPI_MODE_AERIAL) {
// TLV not supported by Aerial L1
pack_nr_tlv(NFAPI_NR_CONFIG_FREQUENCY_SHIFT_7P5KHZ_TAG, pack_nr_tlv(NFAPI_NR_CONFIG_FREQUENCY_SHIFT_7P5KHZ_TAG,
&(pNfapiMsg->carrier_config.frequency_shift_7p5khz), &(pNfapiMsg->carrier_config.frequency_shift_7p5khz),
ppWritePackedMsg, ppWritePackedMsg,
...@@ -1706,6 +1707,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin ...@@ -1706,6 +1707,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin
&pack_uint32_tlv_value); &pack_uint32_tlv_value);
numTLVs++; numTLVs++;
if (NFAPI_MODE != NFAPI_MODE_AERIAL) { if (NFAPI_MODE != NFAPI_MODE_AERIAL) {
// TLV not supported by Aerial L1
retval &= pack_nr_tlv(NFAPI_NR_CONFIG_BCH_PAYLOAD_TAG, retval &= pack_nr_tlv(NFAPI_NR_CONFIG_BCH_PAYLOAD_TAG,
&(pNfapiMsg->ssb_config.bch_payload), &(pNfapiMsg->ssb_config.bch_payload),
ppWritePackedMsg, ppWritePackedMsg,
...@@ -1820,6 +1822,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin ...@@ -1820,6 +1822,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin
// END PRACH Configuration // END PRACH Configuration
// START SSB Table // START SSB Table
if (NFAPI_MODE != NFAPI_MODE_AERIAL) { if (NFAPI_MODE != NFAPI_MODE_AERIAL) {
// TLV not supported by Aerial L1
retval &= pack_nr_tlv(NFAPI_NR_CONFIG_SSB_OFFSET_POINT_A_TAG, retval &= pack_nr_tlv(NFAPI_NR_CONFIG_SSB_OFFSET_POINT_A_TAG,
&(pNfapiMsg->ssb_table.ssb_offset_point_a), &(pNfapiMsg->ssb_table.ssb_offset_point_a),
ppWritePackedMsg, ppWritePackedMsg,
...@@ -1856,6 +1859,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin ...@@ -1856,6 +1859,7 @@ static uint8_t pack_nr_config_request(void *msg, uint8_t **ppWritePackedMsg, uin
&pack_uint32_tlv_value); &pack_uint32_tlv_value);
numTLVs++; numTLVs++;
if (NFAPI_MODE != NFAPI_MODE_AERIAL) { if (NFAPI_MODE != NFAPI_MODE_AERIAL) {
// TLV not supported by Aerial L1
for (int i = 0; i < 64; i++) { for (int i = 0; i < 64; i++) {
// SCF222.10.02 Table 3-25 : If included there must be 64 instances of this TLV // SCF222.10.02 Table 3-25 : If included there must be 64 instances of this TLV
retval &= pack_nr_tlv(NFAPI_NR_CONFIG_BEAM_ID_TAG, retval &= pack_nr_tlv(NFAPI_NR_CONFIG_BEAM_ID_TAG,
......
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