Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
195baf2a
Commit
195baf2a
authored
Nov 16, 2022
by
Stone WU
Committed by
jperaldi
Nov 28, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug #124357:[OAI][eNB]Fix 3 cells running stuck issue
parent
44795fed
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
418 additions
and
6 deletions
+418
-6
ci-scripts/conf_files/firecell/proxy_rcc.band1_three_cc.tm1.nfapi.conf
...nf_files/firecell/proxy_rcc.band1_three_cc.tm1.nfapi.conf
+410
-0
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-2
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+2
-1
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+3
-1
No files found.
ci-scripts/conf_files/firecell/proxy_rcc.band1_three_cc.tm1.nfapi.conf
0 → 100644
View file @
195baf2a
This diff is collapsed.
Click to expand it.
cmake_targets/CMakeLists.txt
View file @
195baf2a
...
@@ -864,10 +864,9 @@ if ($ENV{NR_ENABLE})
...
@@ -864,10 +864,9 @@ if ($ENV{NR_ENABLE})
add_integer_option
(
MAX_NUM_CCs 1
"????"
)
add_integer_option
(
MAX_NUM_CCs 1
"????"
)
Message
(
"Cell configuration for NR is 1. MULTI CELLS NOT IMPLEMENTED"
)
Message
(
"Cell configuration for NR is 1. MULTI CELLS NOT IMPLEMENTED"
)
else
()
else
()
add_integer_option
(
MAX_NUM_CCs
2
"????"
)
add_integer_option
(
MAX_NUM_CCs
3
"????"
)
Message
(
"Cell configuration for LTE is
${
MAX_NUM_CCs
}
: MULTI CELLS IS IMPLEMENTED"
)
Message
(
"Cell configuration for LTE is
${
MAX_NUM_CCs
}
: MULTI CELLS IS IMPLEMENTED"
)
endif
()
endif
()
add_boolean_option
(
SMBV False
"Rohde&Schwarz SMBV100A vector signal generator"
)
add_boolean_option
(
SMBV False
"Rohde&Schwarz SMBV100A vector signal generator"
)
add_boolean_option
(
DEBUG_PHY False
"Enable PHY layer debugging options"
)
add_boolean_option
(
DEBUG_PHY False
"Enable PHY layer debugging options"
)
add_boolean_option
(
DEBUG_PHY_PROC False
"Enable debugging of PHY layer procedures"
)
add_boolean_option
(
DEBUG_PHY_PROC False
"Enable debugging of PHY layer procedures"
)
...
...
nfapi/oai_integration/nfapi_vnf.c
View file @
195baf2a
...
@@ -1722,8 +1722,8 @@ int start_resp_cb(nfapi_vnf_config_t *config, int p5_idx, nfapi_start_response_t
...
@@ -1722,8 +1722,8 @@ int start_resp_cb(nfapi_vnf_config_t *config, int p5_idx, nfapi_start_response_t
phy_info
*
phy
=
pnf
->
phys
;
phy_info
*
phy
=
pnf
->
phys
;
vnf_p7_info
*
p7_vnf
=
vnf
->
p7_vnfs
;
vnf_p7_info
*
p7_vnf
=
vnf
->
p7_vnfs
;
uint16_t
port
=
htons
(
phy
->
remote_port
);
uint16_t
port
=
htons
(
phy
->
remote_port
);
char
*
remote_addr
=
(
char
*
)
malloc
(
strlen
(
phy
->
remote_addr
));
char
*
remote_addr
=
(
char
*
)
malloc
(
strlen
(
phy
->
remote_addr
)
+
1
);
memset
(
remote_addr
,
0
,
strlen
(
phy
->
remote_addr
));
memset
(
remote_addr
,
0
,
strlen
(
phy
->
remote_addr
)
+
1
);
strncpy
(
remote_addr
,
phy
->
remote_addr
,
strlen
(
phy
->
remote_addr
));
strncpy
(
remote_addr
,
phy
->
remote_addr
,
strlen
(
phy
->
remote_addr
));
for
(
int
i
=
0
;
i
<
pnf
->
num_phys
;
i
++
)
for
(
int
i
=
0
;
i
<
pnf
->
num_phys
;
i
++
)
{
{
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
195baf2a
...
@@ -984,7 +984,8 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP,
...
@@ -984,7 +984,8 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP,
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
module_idP
,
ENB_FLAG_YES
,
NOT_A_RNTI
,
frameP
,
subframeP
,
module_idP
);
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
module_idP
,
ENB_FLAG_YES
,
NOT_A_RNTI
,
frameP
,
subframeP
,
module_idP
);
rlc_tick
(
frameP
,
subframeP
);
rlc_tick
(
frameP
,
subframeP
);
pdcp_run
(
&
ctxt
);
pdcp_run
(
&
ctxt
);
pdcp_mbms_run
(
&
ctxt
);
//TODO: comment here for workaround as something wrong make tun read block
//pdcp_mbms_run(&ctxt);
rrc_rx_tx
(
&
ctxt
,
CC_id
);
rrc_rx_tx
(
&
ctxt
,
CC_id
);
}
}
#endif
#endif
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
195baf2a
...
@@ -1378,12 +1378,13 @@ initiate_ra_proc(module_id_t module_idP,
...
@@ -1378,12 +1378,13 @@ initiate_ra_proc(module_id_t module_idP,
ra
[
i
].
Msg2_subframe
=
(
subframeP
+
offset
)
%
10
;
ra
[
i
].
Msg2_subframe
=
(
subframeP
+
offset
)
%
10
;
/* TODO: find better procedure to allocate RNTI */
/* TODO: find better procedure to allocate RNTI */
set_taus_seed
(
0
);
//TODO: add workaround here (set_taus_seed already called at begining of main,but something goes wrong when built with 3 cells)
do
{
do
{
if
(
IS_SOFTMODEM_IQPLAYER
)
{
/* iq player mode, use deterministic rnti */
if
(
IS_SOFTMODEM_IQPLAYER
)
{
/* iq player mode, use deterministic rnti */
static
int
drnti
[
MAX_MOBILES_PER_ENB
];
static
int
drnti
[
MAX_MOBILES_PER_ENB
];
static
int
drnti_def
[]
=
{
0xbda7
,
0x71da
,
0x9c40
,
0xc350
,
0x2710
,
0x4e20
,
0x7530
,
0x1388
,
0x3a98
,
0x61a8
,
0x88b8
,
0xafc8
,
0xd6d8
,
0x1b58
,
0x4268
,
0x6978
};
static
int
drnti_def
[]
=
{
0xbda7
,
0x71da
,
0x9c40
,
0xc350
,
0x2710
,
0x4e20
,
0x7530
,
0x1388
,
0x3a98
,
0x61a8
,
0x88b8
,
0xafc8
,
0xd6d8
,
0x1b58
,
0x4268
,
0x6978
};
for
(
int
j
=
0
;
j
<
MAX_MOBILES_PER_ENB
&&
j
<
(
sizeof
(
drnti_def
)
/
sizeof
(
int
));
j
++
)
for
(
int
j
=
0
;
j
<
MAX_MOBILES_PER_ENB
&&
j
<
(
sizeof
(
drnti_def
)
/
sizeof
(
int
));
j
++
)
drnti
[
i
]
=
drnti_def
[
i
];
drnti
[
j
]
=
drnti_def
[
j
];
int
nb_ue
=
0
;
int
nb_ue
=
0
;
...
@@ -1403,6 +1404,7 @@ initiate_ra_proc(module_id_t module_idP,
...
@@ -1403,6 +1404,7 @@ initiate_ra_proc(module_id_t module_idP,
ra
[
i
].
rnti
=
drnti
[
nb_ue
];
ra
[
i
].
rnti
=
drnti
[
nb_ue
];
}
else
{
}
else
{
ra
[
i
].
rnti
=
taus
();
ra
[
i
].
rnti
=
taus
();
LOG_D
(
MAC
,
"[RAPROC] try rnti:0x%x
\n
"
,
ra
[
i
].
rnti
);
}
}
loop
++
;
loop
++
;
}
while
(
loop
!=
100
&&
}
while
(
loop
!=
100
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment