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
0794033d
Commit
0794033d
authored
Sep 28, 2022
by
Vaibhav Shrivastava
Committed by
jperaldi
Nov 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remaining MultiCell Changes
parent
8acf8f05
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
120 additions
and
128 deletions
+120
-128
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+38
-48
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+3
-2
openair2/PHY_INTERFACE/IF_Module.c
openair2/PHY_INTERFACE/IF_Module.c
+76
-76
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+3
-2
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
0794033d
This diff is collapsed.
Click to expand it.
openair1/SCHED/fapi_l1.c
View file @
0794033d
...
@@ -790,8 +790,8 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) {
...
@@ -790,8 +790,8 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) {
eNB
->
pdcch_vars
[
subframe
&
1
].
num_dci
=
0
;
eNB
->
pdcch_vars
[
subframe
&
1
].
num_dci
=
0
;
eNB
->
phich_vars
[
subframe
&
1
].
num_hi
=
0
;
eNB
->
phich_vars
[
subframe
&
1
].
num_hi
=
0
;
eNB
->
mpdcch_vars
[
subframe
&
1
].
num_dci
=
0
;
eNB
->
mpdcch_vars
[
subframe
&
1
].
num_dci
=
0
;
LOG_
D
(
PHY
,
"NFAPI: Sched_INFO:SFN/SF:%04d
%d DL_req:SFN/SF:%04d%d:dl_pdu:%d tx_req:SFN/SF:%04d%d:pdus:%d
\n
"
,
LOG_
A
(
PHY
,
"NFAPI: Sched_INFO:SFN/SF:%04d%d CC_id:
%d DL_req:SFN/SF:%04d%d:dl_pdu:%d tx_req:SFN/SF:%04d%d:pdus:%d
\n
"
,
frame
,
subframe
,
frame
,
subframe
,
CC_id
,
NFAPI_SFNSF2SFN
(
DL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
),
number_dl_pdu
,
NFAPI_SFNSF2SFN
(
DL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
),
number_dl_pdu
,
NFAPI_SFNSF2SFN
(
TX_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
TX_req
->
sfn_sf
),
TX_req
->
tx_request_body
.
number_of_pdus
NFAPI_SFNSF2SFN
(
TX_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
TX_req
->
sfn_sf
),
TX_req
->
tx_request_body
.
number_of_pdus
);
);
...
@@ -965,6 +965,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) {
...
@@ -965,6 +965,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) {
}
}
Sched_INFO
->
DL_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
Sched_INFO
->
DL_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
Sched_INFO
->
DL_req
->
header
.
phy_id
=
Sched_INFO
->
CC_id
;
oai_nfapi_dl_config_req
(
Sched_INFO
->
DL_req
);
// DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu
oai_nfapi_dl_config_req
(
Sched_INFO
->
DL_req
);
// DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu
Sched_INFO
->
UE_release_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
Sched_INFO
->
UE_release_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
oai_nfapi_ue_release_req
(
Sched_INFO
->
UE_release_req
);
oai_nfapi_ue_release_req
(
Sched_INFO
->
UE_release_req
);
...
...
openair2/PHY_INTERFACE/IF_Module.c
View file @
0794033d
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB.c
View file @
0794033d
...
@@ -10503,6 +10503,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
...
@@ -10503,6 +10503,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
LTE_DL_CCCH_Message_t
*
dl_ccch_msg
=
NULL
;
LTE_DL_CCCH_Message_t
*
dl_ccch_msg
=
NULL
;
ue_context_pP
=
rrc_eNB_get_ue_context
(
RC
.
rrc
[
instance
],
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
ue_context_pP
=
rrc_eNB_get_ue_context
(
RC
.
rrc
[
instance
],
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
LOG_A
(
RRC
,
"Genreating RRC-CS from TTCN message RRC_PDU_REQ
\n
"
);
LOG_A
(
RRC
,
"Genreating RRC-CS from TTCN message RRC_PDU_REQ
\n
"
);
uint8_t
cc_id
=
ue_context_pP
->
ue_context
.
primaryCC_id
;
module_id_t
Idx
;
module_id_t
Idx
;
LOG_A
(
RRC
,
"Received data on SRB0 from SS, module id: %d, Frame: %d, instance: %lu
\n
"
,
LOG_A
(
RRC
,
"Received data on SRB0 from SS, module id: %d, Frame: %d, instance: %lu
\n
"
,
ctxt
.
module_id
,
msg_p
->
ittiMsgHeader
.
lte_time
.
frame
,
instance
);
ctxt
.
module_id
,
msg_p
->
ittiMsgHeader
.
lte_time
.
frame
,
instance
);
...
@@ -10540,7 +10541,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
...
@@ -10540,7 +10541,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
if
(
dl_ccch_msg
->
message
.
choice
.
c1
.
present
==
LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionSetup
)
{
if
(
dl_ccch_msg
->
message
.
choice
.
c1
.
present
==
LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionSetup
)
{
RRCConnSetup_PDU_Present
=
true
;
RRCConnSetup_PDU_Present
=
true
;
rrc_eNB_generate_RRCConnectionSetup
(
&
ctxt
,
ue_context_pP
,
0
);
rrc_eNB_generate_RRCConnectionSetup
(
&
ctxt
,
ue_context_pP
,
cc_id
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
"CALLING RLC CONFIG SRB1 (rbid %d)
\n
"
,
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
"CALLING RLC CONFIG SRB1 (rbid %d)
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
&
ctxt
),
PROTOCOL_RRC_CTXT_UE_ARGS
(
&
ctxt
),
...
@@ -10563,7 +10564,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
...
@@ -10563,7 +10564,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
(
LTE_PMCH_InfoList_r9_t
*
)
NULL
,
0
,
0
);
(
LTE_PMCH_InfoList_r9_t
*
)
NULL
,
0
,
0
);
}
}
}
else
if
(
dl_ccch_msg
->
message
.
choice
.
c1
.
present
==
LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionReject
)
{
}
else
if
(
dl_ccch_msg
->
message
.
choice
.
c1
.
present
==
LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionReject
)
{
rrc_eNB_generate_RRCConnectionReject
(
&
ctxt
,
ue_context_pP
,
0
);
rrc_eNB_generate_RRCConnectionReject
(
&
ctxt
,
ue_context_pP
,
cc_id
);
}
}
}
}
#endif
#endif
...
...
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