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
Using TAPA Task to generated PHY Stub's slot indication [Issue-Id: ODUHIGH-348]
[o-du/l2.git]
/
src
/
5gnrmac
/
mac.h
diff --git
a/src/5gnrmac/mac.h
b/src/5gnrmac/mac.h
index
54a5438
..
e64cba2
100644
(file)
--- a/
src/5gnrmac/mac.h
+++ b/
src/5gnrmac/mac.h
@@
-21,10
+21,11
@@
/* MAX values */
#define MAX_MAC_CE 6
#define MAX_CRI_SIZE 6
/* MAX values */
#define MAX_MAC_CE 6
#define MAX_CRI_SIZE 6
-#define MAX_MAC_DL_PDU 1
0
+#define MAX_MAC_DL_PDU 1
6
#define MAX_NUM_HARQ_PROC 16
#define MAX_NUM_HARQ_PROC 16
-#define MAX_SLOT_SUPPORTED 10 /* numerology 0 15Khz */
#define MAX_ZERO_CORR_CFG_IDX 16 /* max zero correlation config index */
#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 DEFAULT_CELLS 1
#define SI_RNTI 0xFFFF
#define DEFAULT_CELLS 1
#define SI_RNTI 0xFFFF
@@
-180,8
+181,8
@@
struct macCellCb
uint16_t cellId;
uint8_t crntiMap;
MacRaCbInfo macRaCb[MAX_NUM_UE];
uint16_t cellId;
uint8_t crntiMap;
MacRaCbInfo macRaCb[MAX_NUM_UE];
- MacDlSlot dlSlot[MAX_SLOT
_SUPPORTED
];
- MacUlSlot ulSlot[MAX_SLOT
_SUPPORTED
];
+ MacDlSlot dlSlot[MAX_SLOT
S
];
+ MacUlSlot ulSlot[MAX_SLOT
S
];
uint16_t numActvUe;
MacUeCfg *ueCfgTmpData[MAX_NUM_UE];
MacUeCb ueCb[MAX_NUM_UE];
uint16_t numActvUe;
MacUeCfg *ueCfgTmpData[MAX_NUM_UE];
MacUeCb ueCb[MAX_NUM_UE];
@@
-193,6
+194,10
@@
typedef struct macCb
{
Inst macInst;
ProcId procId;
{
Inst macInst;
ProcId procId;
+ uint8_t tmrRes; /*!< Timer resolution */
+ CmTqCp tmrTqCp; /*!< Timer Task Queue Cntrl Point */
+ CmTqType tmrTq[MAC_TQ_SIZE]; /*!< Timer Task Queue */
+ CmTimer tmrBlk[MAX_NUM_TIMER]; /*!< Timer Block */
MacCellCb *macCell[MAX_NUM_CELL];
}MacCb;
MacCellCb *macCell[MAX_NUM_CELL];
}MacCb;
@@
-200,6
+205,7
@@
typedef struct macCb
MacCb macCb;
/* Function declarations */
MacCb macCb;
/* Function declarations */
+short int macActvTmr(Ent ent,Inst inst);
void fillRarPdu(RarInfo *rarInfo);
void createMacRaCb(RachIndInfo *rachIndInfo);
void fillMsg4DlData(MacDlData *dlData, uint16_t msg4PduLen, uint8_t *msg4Pdu);
void fillRarPdu(RarInfo *rarInfo);
void createMacRaCb(RachIndInfo *rachIndInfo);
void fillMsg4DlData(MacDlData *dlData, uint16_t msg4PduLen, uint8_t *msg4Pdu);