Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Developer-guide.rst
[o-du/l2.git]
/
src
/
5gnrmac
/
mac_slot_ind.c
diff --git
a/src/5gnrmac/mac_slot_ind.c
b/src/5gnrmac/mac_slot_ind.c
index
02f7b09
..
7f9142e
100644
(file)
--- a/
src/5gnrmac/mac_slot_ind.c
+++ b/
src/5gnrmac/mac_slot_ind.c
@@
-342,8
+342,8
@@
uint8_t macProcSlotInd(SlotIndInfo slotInd)
**/
uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
{
**/
uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
{
- uint8_t ret;
-
VOLATILE
uint32_t startTime=0;
+ uint8_t ret
= ROK
;
+
volatile
uint32_t startTime=0;
#ifdef ODU_SLOT_IND_DEBUG_LOG
DU_LOG("\nMAC : Slot Indication received");
#ifdef ODU_SLOT_IND_DEBUG_LOG
DU_LOG("\nMAC : Slot Indication received");
@@
-351,11
+351,15
@@
uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
/*starting Task*/
ODU_START_TASK(&startTime, PID_MAC_TTI_IND);
/*starting Task*/
ODU_START_TASK(&startTime, PID_MAC_TTI_IND);
+/* When testing L2 with Intel-L1, any changes specific to
+ * timer mode testing must be guarded under INTEL_TIMER_MODE*/
+#ifndef INTEL_TIMER_MODE
/* send slot indication to scheduler */
ret = sendSlotIndMacToSch(slotInd);
if(ret != ROK)
{
DU_LOG("\nMAC : Sending of slot ind msg from MAC to SCH failed");
/* send slot indication to scheduler */
ret = sendSlotIndMacToSch(slotInd);
if(ret != ROK)
{
DU_LOG("\nMAC : Sending of slot ind msg from MAC to SCH failed");
+ MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
return ret;
}
return ret;
}
@@
-363,20
+367,23
@@
uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
if(ret != ROK)
{
DU_LOG("\nMAC : macProcSlotInd failed");
if(ret != ROK)
{
DU_LOG("\nMAC : macProcSlotInd failed");
+ MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
return ret;
}
return ret;
}
+#endif
/* send slot indication to du app */
ret = sendSlotIndMacToDuApp(slotInd);
if(ret != ROK)
{
DU_LOG("\nMAC :Sending of slot ind msg from MAC to DU APP failed");
/* send slot indication to du app */
ret = sendSlotIndMacToDuApp(slotInd);
if(ret != ROK)
{
DU_LOG("\nMAC :Sending of slot ind msg from MAC to DU APP failed");
+ MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
return ret;
}
/*stoping Task*/
ODU_STOP_TASK(startTime, PID_MAC_TTI_IND);
return ret;
}
/*stoping Task*/
ODU_STOP_TASK(startTime, PID_MAC_TTI_IND);
-
+ MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
return ret;
} /* fapiMacSlotInd */
return ret;
} /* fapiMacSlotInd */