Jira Id - ODUHIGH-473 Tdd mode related fixes

[o-du/l2.git] / src / 5gnrmac / lwr_mac_fsm.c

diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c
index eea67e8..63a86c5 100644 (file)
--- a/src/5gnrmac/lwr_mac_fsm.c
+++ b/src/5gnrmac/lwr_mac_fsm.c
@@ -27,7 +27,7 @@
 #include "mac.h"
 #include "lwr_mac.h"
 #ifdef INTEL_FAPI
-#include "fapi.h"
+#include "nr5g_fapi_internal.h"
 #include "fapi_vendor_extension.h"
 #endif
 #ifdef INTEL_WLS_MEM
@@ -2001,7 +2001,7 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg)
    uint8_t slotIdx = 0; 
    uint8_t symbolIdx =0;
 #endif   
-   uint8_t index = 0;
+   uint16_t index = 0;
    uint16_t *cellId =NULLP;
    uint16_t cellIdx =0;
    uint32_t msgLen = 0;
@@ -2062,7 +2062,11 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg)
    configReq = (fapi_config_req_t *)(cfgReqQElem + 1);
    memset(configReq, 0, sizeof(fapi_config_req_t));
    fillMsgHeader(&configReq->header, FAPI_CONFIG_REQUEST, sizeof(fapi_config_req_t));
+#ifdef NR_TDD
+   configReq->number_of_tlvs = 25 + 1 + MAX_TDD_PERIODICITY_SLOTS * MAX_SYMB_PER_SLOT;
+#else
    configReq->number_of_tlvs = 25;
+#endif
    msgLen = sizeof(configReq->number_of_tlvs);
 
    if(macCfgParams.dlCarrCfg.pres)
@@ -3396,7 +3400,7 @@ uint8_t fillSib1TxDataReq(fapi_tx_pdu_desc_t *pduDesc, uint16_t pduIndex, MacCel
 
 #ifdef INTEL_WLS_MEM
    mtGetWlsHdl(&wlsHdlr);
-   pduDesc[pduIndex].tlvs[0].value = WLS_VA2PA(wlsHdlr, sib1Payload);
+   pduDesc[pduIndex].tlvs[0].value = (uint8_t *)(WLS_VA2PA(wlsHdlr, sib1Payload));
 #else
    pduDesc[pduIndex].tlvs[0].value = sib1Payload;
 #endif
@@ -3458,7 +3462,7 @@ uint8_t fillPageTxDataReq(fapi_tx_pdu_desc_t *pduDesc, uint16_t pduIndex, DlPage
 
 #ifdef INTEL_WLS_MEM
    mtGetWlsHdl(&wlsHdlr);
-   pduDesc[pduIndex].tlvs[0].value = WLS_VA2PA(wlsHdlr, pagePayload);
+   pduDesc[pduIndex].tlvs[0].value = (uint8_t *)(WLS_VA2PA(wlsHdlr, pagePayload));
 #else
    pduDesc[pduIndex].tlvs[0].value = pagePayload;
 #endif
@@ -3518,7 +3522,7 @@ uint8_t fillRarTxDataReq(fapi_tx_pdu_desc_t *pduDesc, uint16_t pduIndex, RarInfo
 
 #ifdef INTEL_WLS_MEM
    mtGetWlsHdl(&wlsHdlr);
-   pduDesc[pduIndex].tlvs[0].value = WLS_VA2PA(wlsHdlr, rarPayload);
+   pduDesc[pduIndex].tlvs[0].value = (uint8_t *)(WLS_VA2PA(wlsHdlr, rarPayload));
 #else
    pduDesc[pduIndex].tlvs[0].value = rarPayload;
 #endif
@@ -3577,7 +3581,7 @@ uint8_t fillDlMsgTxDataReq(fapi_tx_pdu_desc_t *pduDesc, uint16_t pduIndex, DlMsg
 
 #ifdef INTEL_WLS_MEM
    mtGetWlsHdl(&wlsHdlr);
-   pduDesc[pduIndex].tlvs[0].value = WLS_VA2PA(wlsHdlr, dlMsgPayload);
+   pduDesc[pduIndex].tlvs[0].value = (uint8_t *)(WLS_VA2PA(wlsHdlr, dlMsgPayload));
 #else
    pduDesc[pduIndex].tlvs[0].value = dlMsgPayload;
 #endif