功能 #2686
RRC2MAC配置参数添加
0%
描述
更新今天的TRUNK版本，可以接收SRB及DRB配置消息了，但参数配置不全。需要增加或更新如下的参数配置：
1. lcgId =0（SRB是0，DRB是1)现在是相反的；
2 。rbCb->macLchCfg->prty (SRB1=1 ,SRB=2, DRB1=4) 目前这个配置不全
3 。 rbCb->lcConfig->lcType 这个目前没有配置，需要增加/* Logical Channel Type /
#define CM_NR_LCH_BCCH 1 /!< BCCH Logical Channel /
#define CM_NR_LCH_PCCH 2 /!< PCCH Logical Channel /
#define CM_NR_LCH_CCCH 3 /!< CCCH Logical Channel /
#define CM_NR_LCH_DTCH 4 /!< DTCH Logical Channel /
#define CM_NR_LCH_DCCH 5 /!< DCCH Logical Channel /
4 。pollTmrExpry = 45, pollPdu = 0, pollByte = 0, tStatPrhbt = 0, tReAssmbly = 0 这几个为0值的定时器需要增加配置
rbCb->lcConfig->lcType = CM_NR_LCH_DCCH;
rbCb->macLchCfg->lcgId = 0;
rbCb->macLchCfg->prty = 1;
macLchCfg这个结构里需要配置lcgId 和prty
typedef enum wnLgChTyp {
WN_LGCH_TYP_INVALID_E = 1, /*< Invalid Logical Channel Type /
WN_LGCH_TYP_BCCH_E = 0, /*< Broadcast Control Channel /
WN_LGCH_TYP_PCCH_E , /*< Paging Control Channel /
WN_LGCH_TYP_CCCH_E , /*< Common Control Channel /
WN_LGCH_TYP_DCCH_E , /*< Data Control Channel l /
WN_LGCH_TYP_DTCH_E /*< Data Traffic Channel /
} wnLgChTypE;
3按照这个配置吧。
回复 王艳芳:
3 。 rbCb>lcConfig->lcType 这个目前没有配置，需要增加/ Logical Channel Type /
#define CM_NR_LCH_BCCH 1 /!< BCCH Logical Channel /
#define CM_NR_LCH_PCCH 2 /!< PCCH Logical Channel /
#define CM_NR_LCH_CCCH 3 /!< CCCH Logical Channel /
#define CM_NR_LCH_DTCH 4 /!< DTCH Logical Channel /
#define CM_NR_LCH_DCCH 5 /!< DCCH Logical Channel /
typedef enum wnLgChTyp {
WN_LGCH_TYP_INVALID_E = -1, /*< Invalid Logical Channel Type /
WN_LGCH_TYP_BCCH_E = 0, /*< Broadcast Control Channel /
WN_LGCH_TYP_PCCH_E , /*< Paging Control Channel /
WN_LGCH_TYP_CCCH_E , /*< Common Control Channel /
WN_LGCH_TYP_DCCH_E , /*< Data Control Channel l /
WN_LGCH_TYP_DTCH_E /*< Data Traffic Channel */
} wnLgChTypE;
历史记录
由 b jz 更新于 4 个月 之前
3 。 rbCb->lcConfig->lcType 这个目前没有配置，需要增加/* Logical Channel Type /
typedef enum wnLgChTyp {
WN_LGCH_TYP_INVALID_E = -1, /*< Invalid Logical Channel Type /
WN_LGCH_TYP_BCCH_E = 0, /*< Broadcast Control Channel /
WN_LGCH_TYP_PCCH_E , /*< Paging Control Channel /
WN_LGCH_TYP_CCCH_E , /*< Common Control Channel /
WN_LGCH_TYP_DCCH_E , /*< Data Control Channel l /
WN_LGCH_TYP_DTCH_E /*< Data Traffic Channel */
} wnLgChTypE;
fix
由 b jz 更新于 4 个月 之前
- 状态 从 进行中 变更为 转测试
rbCfg srbId=1 rbId=1 lcId=1 lcType=3 lcgId=0 prty=5 rbCfg tPollReTrsmt=45 pollPdu=64 pollByte=25000 tStatPrhbt=5 tReAssmbly=10 rbCfg srbId=2 rbId=2 lcId=2 lcType=3 lcgId=0 prty=8 rbCfg tPollReTrsmt=45 pollPdu=64 pollByte=25000 tStatPrhbt=5 tReAssmbly=10 rbCfg drb rbId=4 lcId=4 lcType=3 lcgId=1 prty=4 rbCfg tPollReTrsmt=45 pollPdu=24576 pollByte=750000 tStatPrhbt=10 tReAssmbly=35
由 王 艳芳 更新于 4 个月 之前
rbCfg srbId=1 rbId=1 lcId=1 lcType=3 lcgId=0 prty=1
rbCfg tPollReTrsmt=45 pollPdu=16 pollByte=25000 tStatPrhbt=10 tReAssmbly=50
rbCfg srbId=2 rbId=2 lcId=2 lcType=3 lcgId=0 prty=1
rbCfg tPollReTrsmt=45 pollPdu=16 pollByte=25000 tStatPrhbt=10 tReAssmbly=50
rbCfg drb rbId=4 lcId=4 lcType=4 lcgId=1 prty=5
rbCfg tPollReTrsmt=45 pollPdu=16 pollByte=25000 tStatPrhbt=10 tReAssmbly=50
参考基站3.0和公网信令的值定义
由 b jz 更新于 4 个月 之前
(gdb) p *rbCb->lcConfig
$4 = {rnti = 0, lcid = 0 '\000', lcType = 3 '\003', dlTpchTyp = 0 '\000', qfi = 0 '\000', txLcQ = 0x377d594c0, rxLcQ = 0x377d19200, nodeSide = WN_RRC_NODE_TS}
(gdb) p *rbCb->rlcCfg
$6 = {rlcDlAmSnType = WN_AM_SN_TYPE_12B_E, rlcUlAmSnType = WN_AM_SN_TYPE_12B_E, rlcDlUmSnType = WN_UM_SN_TYPE_6B_E, rlcUlUmSnType = WN_UM_SN_TYPE_6B_E, rlcMode = 0,
pollPdu = WN_POLL_PDU_P16_E, pollByte = WN_POLLBYTE_KB25_E, tPollReTrsmt = WN_RTRSMT_TMR_45MS_E, tReAssmbly = WN_TMR_RLC_MS10_E, tStatPrhbt = WN_TMR_PRHBT_MS10_E,
maxRetxThrshld = WN_RETX_T8_E, amTxBufSz = 0, umTxBufSz = 0, drbIdentity = 0 '\000', lcId = 0 '\000', reEstRlc = 0 '\000', rlcBrQ = 0x377c98c80, lcQ = 0x377d594c0,
rxLowerLyrQ = 0x377d19200, rxUperLyrQ = 0x377cd8f40, nodeSide = WN_RRC_NODE_TS}
--- a/source-code/src/l2/mac/csrc/wnPsMacSchTest.h
+++ b/source-code/src/l2/mac/csrc/wnPsMacSchTest.h@ -35,7 +35,7 @ extern "C" {
#include "wn5gNrUePsNc.h"
-/////#define MAC_SIMU_TEST
+#define MAC_SIMU_TEST
@ -43,7 +43,7 @ extern "C" {
#ifdef MAC_SIMU_TEST-//#define IRN_STUB
+#define IRN_STUB
yanf@PowerEdge-R720:~/b5gueps/source-code$
#define MAC_SIMU_TEST
+#define IRN_STUB
MERGE分支调试打开这两个宏