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
Fix for seg fault at 5th and 20th slot and SIB1
[o-du/l2.git]
/
src
/
du_app
/
du_mgr.h
diff --git
a/src/du_app/du_mgr.h
b/src/du_app/du_mgr.h
index
3066c52
..
35ef06a
100644
(file)
--- a/
src/du_app/du_mgr.h
+++ b/
src/du_app/du_mgr.h
@@
-53,6
+53,8
@@
#include "lkw.x"
#include "lrg.x"
#include "lkw.x"
#include "lrg.x"
+#include "du_cfg.h"
+
#define DU_PROC 0
/* Memory related configs */
#define DU_APP_MEM_REGION 0
#define DU_PROC 0
/* Memory related configs */
#define DU_APP_MEM_REGION 0
@@
-67,15
+69,15
@@
/* Events */
#define EVTCFG 0
#define EVTSCTPSTRT 1
/* Events */
#define EVTCFG 0
#define EVTSCTPSTRT 1
-#define EV
TSCTP
DATA 2
-#define EV
TSCTP
NTFY 3
+#define EV
ENT_CU_
DATA 2
+#define EV
ENT_SCTP_
NTFY 3
#define EVTSRVOPENREQ 4
#define EVTSRVOPENCFM 5
#define EVTTNLMGMTREQ 6
#define EVTTNLMGMTCFM 7
#define EVTSRVOPENREQ 4
#define EVTSRVOPENCFM 5
#define EVTTNLMGMTREQ 6
#define EVTTNLMGMTCFM 7
-#define EVT
TTI
IND 8
+#define EVT
SLOT
IND 8
#define EVTSTARTPOLL 9
#define EVTSTARTPOLL 9
-#define EV
TRIC
DATA 10
+#define EV
ENT_RIC_
DATA 10
/* Selector */
#define DU_SELECTOR_LC 0
/* Selector */
#define DU_SELECTOR_LC 0
@@
-98,8
+100,6
@@
#define DU_ZERO_VAL 0
/* Macros */
#define DU_ZERO_VAL 0
/* Macros */
-#define DEFAULT_CELLS 1
-#define NR_RANAC 150
#define ADD 0
#define DEL 1
#define ADD 0
#define DEL 1
@@
-139,22
+139,37
@@
SPutSBuf(DU_APP_MEM_REGION, DU_POOL, \
(Data *)_datPtr, _size);
SPutSBuf(DU_APP_MEM_REGION, DU_POOL, \
(Data *)_datPtr, _size);
+/* Free shared memory, received through LWLC */
+#define DU_FREE_MEM(_region, _pool, _datPtr, _size) \
+ if(_datPtr) \
+ SPutSBuf(_region, _pool,(Data *)_datPtr, _size); \
+ _datPtr = NULL;
+
typedef enum
{
typedef enum
{
-
OOS
,
+
CELL_OUT_OF_SERVICE
,
ACTIVATION_IN_PROGRESS,
ACTIVATED,
DELETION_IN_PROGRESS
}CellStatus;
ACTIVATION_IN_PROGRESS,
ACTIVATED,
DELETION_IN_PROGRESS
}CellStatus;
-#if 0
+typedef struct cellCfgParams
+{
+ NrEcgi nrEcgi; /* ECGI */
+ U16 nrPci; /* PCI */
+ U16 fiveGsTac; /* 5gSTac */
+ Plmn plmn[MAX_PLMN]; /* List of serving PLMN IDs */
+ U32 maxUe; /* max UE per slot */
+}CellCfgParams;
+
+
typedef struct duCellCb
{
U32 cellId; /* Internal cell Id */
CellCfgParams cellInfo; /* Cell info */
typedef struct duCellCb
{
U32 cellId; /* Internal cell Id */
CellCfgParams cellInfo; /* Cell info */
+ Bool firstSlotIndRcvd;
CellStatus cellStatus; /*Cell status */
}DuCellCb;
CellStatus cellStatus; /*Cell status */
}DuCellCb;
-#endif
typedef struct duLSapCb
{
typedef struct duLSapCb
{
@@
-164,9
+179,9
@@
typedef struct duLSapCb
State sapState;
Mem mem;
CmTimer timer;
State sapState;
Mem mem;
CmTimer timer;
- U8
bndRetryCnt;
- U8
maxBndRetry;
- TmrCfg
bndTmr;
+ U8 bndRetryCnt;
+ U8 maxBndRetry;
+ TmrCfg bndTmr;
}DuLSapCb;
/* DU APP DB */
}DuLSapCb;
/* DU APP DB */
@@
-177,8
+192,8
@@
typedef struct duCb
//DuLSapCb **macSap; /* MAC SAP */
Bool f1Status; /* Status of F1 connection */
Bool e2Status; /* Status of E2 connection */
//DuLSapCb **macSap; /* MAC SAP */
Bool f1Status; /* Status of F1 connection */
Bool e2Status; /* Status of E2 connection */
-
CmHashListCp cellLst
; /* List of cells at DU APP of type DuCellCb */
-
CmHashListCp actvCellLst;
/* List of cells activated/to be activated of type DuCellCb */
+
DuCellCb* cfgCellLst[DU_MAX_CELLS]
; /* List of cells at DU APP of type DuCellCb */
+
DuCellCb* actvCellLst[DU_MAX_CELLS];
/* List of cells activated/to be activated of type DuCellCb */
/* pointer to store the address of macCellCfg params used to send du-app to MAC */
MacCellCfg *duMacCellCfg; /* pointer to store params while sending DU-APP to MAC */
}DuCb;
/* pointer to store the address of macCellCfg params used to send du-app to MAC */
MacCellCfg *duMacCellCfg; /* pointer to store params while sending DU-APP to MAC */
}DuCb;
@@
-237,6
+252,7
@@
S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm);
S16 duSendEgtpTestData();
S16 duSendEgtpDatInd(Buffer *mBuf);
S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm);
S16 duSendEgtpTestData();
S16 duSendEgtpDatInd(Buffer *mBuf);
S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm);
+uint16_t duBuildAndSendMacCellStartReq();
#endif
#endif