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
spbro
OpenXG-RAN
Commits
eb92fa91
Commit
eb92fa91
authored
Jan 17, 2019
by
matzakos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed eNB threading issues creating problems for nfapi emulator.
parent
d62f8f93
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
14 deletions
+24
-14
nfapi/open-nFAPI/pnf/src/pnf.c
nfapi/open-nFAPI/pnf/src/pnf.c
+1
-1
nfapi/open-nFAPI/pnf/src/pnf_p7.c
nfapi/open-nFAPI/pnf/src/pnf_p7.c
+1
-1
nfapi/open-nFAPI/vnf/src/vnf_p7.c
nfapi/open-nFAPI/vnf/src/vnf_p7.c
+2
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
...JECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
+18
-8
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+2
-2
No files found.
nfapi/open-nFAPI/pnf/src/pnf.c
View file @
eb92fa91
...
@@ -1260,7 +1260,7 @@ int pnf_connect(pnf_t* pnf)
...
@@ -1260,7 +1260,7 @@ int pnf_connect(pnf_t* pnf)
address
=
inet_ntoa
(
addr
->
sin_addr
);
address
=
inet_ntoa
(
addr
->
sin_addr
);
}
}
NFAPI_TRACE
(
NFAPI_TRACE_NOTE
,
"Host address info %d Family:%s Address:%s
\n
"
,
i
++
,
family
,
address
);
//
NFAPI_TRACE(NFAPI_TRACE_NOTE, "Host address info %d Family:%s Address:%s\n", i++, family, address);
if
(
pnf
->
sctp
)
if
(
pnf
->
sctp
)
{
{
...
...
nfapi/open-nFAPI/pnf/src/pnf_p7.c
View file @
eb92fa91
...
@@ -379,7 +379,7 @@ static uint32_t get_sf_time(uint32_t now_hr, uint32_t sf_start_hr)
...
@@ -379,7 +379,7 @@ static uint32_t get_sf_time(uint32_t now_hr, uint32_t sf_start_hr)
{
{
if
(
now_hr
<
sf_start_hr
)
if
(
now_hr
<
sf_start_hr
)
{
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"now is earlier than start of subframe now_hr:%u sf_start_hr:%u
\n
"
,
now_hr
,
sf_start_hr
);
//
NFAPI_TRACE(NFAPI_TRACE_INFO, "now is earlier than start of subframe now_hr:%u sf_start_hr:%u\n", now_hr, sf_start_hr);
return
0
;
return
0
;
}
}
else
else
...
...
nfapi/open-nFAPI/vnf/src/vnf_p7.c
View file @
eb92fa91
...
@@ -1203,12 +1203,12 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
...
@@ -1203,12 +1203,12 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
if
(
phy
->
in_sync
==
0
)
if
(
phy
->
in_sync
==
0
)
{
{
NFAPI_TRACE
(
NFAPI_TRACE_NOTE
,
"***** Adjusting VNF phy_id:%d SFN/SF (%s) from %d to %d (%d) mode:%s zeroCount:%u sync:%s
\n
"
,
/*NFAPI_TRACE(NFAPI_TRACE_NOTE, "***** Adjusting VNF phy_id:%d SFN/SF (%s) from %d to %d (%d) mode:%s zeroCount:%u sync:%s\n",
ind.header.phy_id, (phy->in_sync ? "via sfn" : "now"),
ind.header.phy_id, (phy->in_sync ? "via sfn" : "now"),
NFAPI_SFNSF2DEC(curr_sfn_sf), NFAPI_SFNSF2DEC(new_sfn_sf), phy->adjustment,
NFAPI_SFNSF2DEC(curr_sfn_sf), NFAPI_SFNSF2DEC(new_sfn_sf), phy->adjustment,
phy->filtered_adjust ? "FILTERED" : "ABSOLUTE",
phy->filtered_adjust ? "FILTERED" : "ABSOLUTE",
phy->zero_count,
phy->zero_count,
phy
->
in_sync
?
"IN_SYNC"
:
"OUT_OF_SYNC"
);
phy->in_sync ? "IN_SYNC" : "OUT_OF_SYNC");
*/
phy
->
sfn_sf
=
new_sfn_sf
;
phy
->
sfn_sf
=
new_sfn_sf
;
}
}
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
View file @
eb92fa91
...
@@ -172,7 +172,7 @@ eNBs =
...
@@ -172,7 +172,7 @@ eNBs =
//////////
MME
parameters
:
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"1
27.0.0.3
"
;
mme_ip_address
= ( {
ipv4
=
"1
92.168.12.26
"
;
ipv6
=
"192:168:30::17"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
active
=
"yes"
;
preference
=
"ipv4"
;
preference
=
"ipv4"
;
...
@@ -181,14 +181,24 @@ eNBs =
...
@@ -181,14 +181,24 @@ eNBs =
NETWORK_INTERFACES
:
NETWORK_INTERFACES
:
{
{
ENB_INTERFACE_NAME_FOR_S1_MME
=
"lo"
;
#ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"127.0.0.2/24"
;
#ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24";
ENB_INTERFACE_NAME_FOR_S1U
=
"lo"
;
#ENB_INTERFACE_NAME_FOR_S1U = "lo";
ENB_IPV4_ADDRESS_FOR_S1U
=
"127.0.0.5/24"
;
#ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24";
#ENB_PORT_FOR_S1U = 2152; # Spec 2152
#ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24";
#ENB_PORT_FOR_X2C = 36422; # Spec 36422
ENB_INTERFACE_NAME_FOR_S1_MME
=
"enp0s31f6"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"192.168.12.188/24"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"enp0s31f6"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"192.168.12.188/24"
;
ENB_PORT_FOR_S1U
=
2152
;
# Spec 2152
ENB_PORT_FOR_S1U
=
2152
;
# Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C
=
"1
27.0.0.2
/24"
;
ENB_IPV4_ADDRESS_FOR_X2C
=
"1
92.168.12.188
/24"
;
ENB_PORT_FOR_X2C
=
36422
;
# Spec 36422
ENB_PORT_FOR_X2C
=
36422
;
# Spec 36422
};
};
}
}
);
);
...
@@ -196,7 +206,7 @@ eNBs =
...
@@ -196,7 +206,7 @@ eNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo"
;
local_s_if_name
=
"lo
:
"
;
remote_s_address
=
"127.0.0.1"
;
remote_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.2"
;
local_s_address
=
"127.0.0.2"
;
local_s_portc
=
50001
;
local_s_portc
=
50001
;
...
...
targets/RT/USER/lte-enb.c
View file @
eb92fa91
...
@@ -948,8 +948,8 @@ void init_eNB_proc(int inst) {
...
@@ -948,8 +948,8 @@ void init_eNB_proc(int inst) {
// Original Code from Fujitsu w/ old structure/field name
// Original Code from Fujitsu w/ old structure/field name
//pthread_create( &proc_rxtx[0].pthread_rxtx, attr0, eNB_thread_rxtx, &proc_rxtx[0] );
//pthread_create( &proc_rxtx[0].pthread_rxtx, attr0, eNB_thread_rxtx, &proc_rxtx[0] );
//pthread_create( &proc_rxtx[1].pthread_rxtx, attr1, eNB_thread_rxtx, &proc_rxtx[1] );
//pthread_create( &proc_rxtx[1].pthread_rxtx, attr1, eNB_thread_rxtx, &proc_rxtx[1] );
pthread_create
(
&
L1_proc
->
pthread
,
attr0
,
L1_thread
,
proc
);
pthread_create
(
&
L1_proc
->
pthread
,
attr0
,
L1_thread
,
L1_
proc
);
pthread_create
(
&
L1_proc_tx
->
pthread
,
attr1
,
L1_thread
,
proc
);
pthread_create
(
&
L1_proc_tx
->
pthread
,
attr1
,
L1_thread
,
L1_proc_tx
);
}
}
pthread_create
(
&
proc
->
pthread_prach
,
attr_prach
,
eNB_thread_prach
,
eNB
);
pthread_create
(
&
proc
->
pthread_prach
,
attr_prach
,
eNB_thread_prach
,
eNB
);
...
...
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