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
[ Jira id - ODUHIGH-593 ] Pack and unpack function nomenclature correction
[o-du/l2.git]
/
src
/
5gnrmac
/
mac.h
diff --git
a/src/5gnrmac/mac.h
b/src/5gnrmac/mac.h
index
756e288
..
d4a3f80
100644
(file)
--- a/
src/5gnrmac/mac.h
+++ b/
src/5gnrmac/mac.h
@@
-26,6
+26,7
@@
#define MAX_ZERO_CORR_CFG_IDX 16 /* max zero correlation config index */
#define MAC_TQ_SIZE 10 /* Timing Queue Size */
#define MAX_NUM_TIMER 1 /* MAX number of MAC timers */
#define MAX_ZERO_CORR_CFG_IDX 16 /* max zero correlation config index */
#define MAC_TQ_SIZE 10 /* Timing Queue Size */
#define MAX_NUM_TIMER 1 /* MAX number of MAC timers */
+#define MAX_PENDING_STATS_RSP 5 /* Maximum number of statistics request for which response is pending */
#define DEFAULT_CELLS 1
#define SI_RNTI 0xFFFF
#define DEFAULT_CELLS 1
#define SI_RNTI 0xFFFF
@@
-59,6
+60,7
@@
#define LC_ID_SIZE 6
#define TIMING_ADVANCE_SIZE 12
#define T_CRNTI_SIZE 16
#define LC_ID_SIZE 6
#define TIMING_ADVANCE_SIZE 12
#define T_CRNTI_SIZE 16
+
/* UL Grant is of size = 27 bits. Refer to Spec 38.213, Table 8.2-1 for
* contents of UL grant in RAR */
#define FREQ_HOP_FLAG_SIZE 1
/* UL Grant is of size = 27 bits. Refer to Spec 38.213, Table 8.2-1 for
* contents of UL grant in RAR */
#define FREQ_HOP_FLAG_SIZE 1
@@
-113,7
+115,7
@@
typedef struct macDlSlot
typedef struct macUlSlot
{
typedef struct macUlSlot
{
- UlSchedInfo ulInfo;
+ UlSchedInfo ul
Sch
Info;
}MacUlSlot;
typedef struct macCbInfo
}MacUlSlot;
typedef struct macCbInfo
@@
-245,6
+247,15
@@
struct macCellCb
SlotTimingInfo currTime;
};
SlotTimingInfo currTime;
};
+typedef struct macStatistics
+{
+ uint8_t numPendingStatsRsp;
+ MacStatsRsp pendingStatsRsp[MAX_PENDING_STATS_RSP];
+
+ /* This structure can be developed in future to add details of
+ * the statistics to be calculated at MAC */
+}MacStatistics;
+
typedef struct macCb
{
Inst macInst;
typedef struct macCb
{
Inst macInst;
@@
-254,10
+265,11
@@
typedef struct macCb
CmTqType tmrTq[MAC_TQ_SIZE]; /*!< Timer Task Queue */
CmTimer tmrBlk[MAX_NUM_TIMER]; /*!< Timer Block */
MacCellCb *macCell[MAX_NUM_CELL];
CmTqType tmrTq[MAC_TQ_SIZE]; /*!< Timer Task Queue */
CmTimer tmrBlk[MAX_NUM_TIMER]; /*!< Timer Block */
MacCellCb *macCell[MAX_NUM_CELL];
+ MacStatistics statistics;
}MacCb;
/* global variable */
}MacCb;
/* global variable */
-MacCb macCb;
+
extern
MacCb macCb;
/* Function declarations */
uint8_t macActvInit ARGS((Ent entity, Inst inst, Region region, Reason reason));
/* Function declarations */
uint8_t macActvInit ARGS((Ent entity, Inst inst, Region region, Reason reason));
@@
-289,6
+301,10
@@
uint8_t MacProcDlPageAlloc(Pst *pst, DlPageAlloc *dlPageAlloc);
uint8_t MacProcSchCellDeleteRsp(Pst *pst, SchCellDeleteRsp *schCellDeleteRsp);
uint8_t MacProcSchStatsRsp(Pst *pst, SchStatsRsp *schStatsRsp);
uint8_t MacProcSchCellDeleteRsp(Pst *pst, SchCellDeleteRsp *schCellDeleteRsp);
uint8_t MacProcSchStatsRsp(Pst *pst, SchStatsRsp *schStatsRsp);
+uint8_t MacProcSchStatsInd(Pst *pst, SchStatsInd *schStatsInd);
+uint8_t MacProcSchStatsDeleteRsp(Pst *pst, SchStatsDeleteRsp *schStatsDeleteRsp);
+uint8_t MacProcSchStatsModificationRsp(Pst *pst, SchStatsModificationRsp *schStatsModificationRsp);
+
#endif
/**********************************************************************
End of file
#endif
/**********************************************************************
End of file