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
promise
OpenXG-RAN
Commits
617b92cf
Commit
617b92cf
authored
Aug 24, 2018
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some little mods in oaisim_functions
parent
4b63bc05
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+2
-2
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+1
-1
targets/SIMU/USER/oaisim_functions.c
targets/SIMU/USER/oaisim_functions.c
+8
-7
No files found.
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
View file @
617b92cf
...
...
@@ -74,13 +74,13 @@ int eth_socket_init_udp(openair0_device *device) {
local_port
=
device
->
openair0_cfg
->
my_port
;
remote_ip
=
"0.0.0.0"
;
remote_port
=
0
;
printf
(
"[%s] local ip addr %s port %d
\n
"
,
"RRH
"
,
local_ip
,
local_port
);
printf
(
"[%s] local ip addr %s port %d
\n
"
,
"RRH
%d"
,
local_ip
,
local_port
,
device
->
Mod_id
);
}
else
{
local_ip
=
device
->
openair0_cfg
->
my_addr
;
local_port
=
device
->
openair0_cfg
->
my_port
;
remote_ip
=
device
->
openair0_cfg
->
remote_addr
;
remote_port
=
device
->
openair0_cfg
->
remote_port
;
printf
(
"[%s] local ip addr %s port %d
\n
"
,
"BBU
"
,
local_ip
,
local_port
);
printf
(
"[%s] local ip addr %s port %d
\n
"
,
"BBU
%d"
,
local_ip
,
local_port
,
device
->
Mod_id
);
}
/* Open socket to send on */
...
...
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
View file @
617b92cf
...
...
@@ -393,7 +393,7 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth
}
printf
(
"[ETHERNET]: Initializing openair0_device for %s%d ...
\n
"
,
((
device
->
host_type
==
BBU_HOST
)
?
"BBU"
:
"RRH"
),
num_devices_eth
);
device
->
Mod_id
=
0
;
//
+num_devices_eth++;
device
->
Mod_id
=
+
num_devices_eth
++
;
device
->
transp_type
=
ETHERNET_TP
;
device
->
trx_start_func
=
trx_eth_start
;
device
->
trx_request_func
=
trx_eth_request
;
...
...
targets/SIMU/USER/oaisim_functions.c
View file @
617b92cf
...
...
@@ -1438,25 +1438,26 @@ void init_openair1(void)
// change the nb_connected_eNB
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
int
i
=
0
;
i
<
enb_properties
->
number
;
i
++
)
{
init_lte_vars
(
&
frame_parms
[
CC_id
],
oai_emulation
.
info
.
frame_type
[
CC_id
],
oai_emulation
.
info
.
tdd_config
[
CC_id
],
oai_emulation
.
info
.
tdd_config_S
[
CC_id
],
oai_emulation
.
info
.
extended_prefix_flag
[
CC_id
],
oai_emulation
.
info
.
N_RB_DL
[
CC_id
],
enb_properties
->
properties
[
0
]
->
Nid_cell
[
CC_id
],
enb_properties
->
properties
[
i
]
->
Nid_cell
[
CC_id
],
cooperation_flag
,
enb_properties
->
properties
[
0
]
->
nb_antenna_ports
[
CC_id
],
enb_properties
->
properties
[
i
]
->
nb_antenna_ports
[
CC_id
],
abstraction_flag
,
enb_properties
->
properties
[
0
]
->
nb_antennas_rx
[
CC_id
],
enb_properties
->
properties
[
0
]
->
nb_antennas_tx
[
CC_id
],
enb_properties
->
properties
[
i
]
->
nb_antennas_rx
[
CC_id
],
enb_properties
->
properties
[
i
]
->
nb_antennas_tx
[
CC_id
],
nb_antennas_rx_ue
,
oai_emulation
.
info
.
eMBMS_active_state
);
// This is for IF4p5 RRU, gets done by RRC configuration of eNB
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
prach_config_common
.
prach_ConfigInfo
.
prach_ConfigIndex
=
enb_properties
->
properties
[
0
]
->
prach_config_index
[
CC_id
];
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
prach_config_common
.
prach_ConfigInfo
.
prach_FreqOffset
=
enb_properties
->
properties
[
0
]
->
prach_freq_offset
[
CC_id
];
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
prach_config_common
.
prach_ConfigInfo
.
prach_ConfigIndex
=
enb_properties
->
properties
[
i
]
->
prach_config_index
[
CC_id
];
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
prach_config_common
.
prach_ConfigInfo
.
prach_FreqOffset
=
enb_properties
->
properties
[
i
]
->
prach_freq_offset
[
CC_id
];
}
}
for
(
eNB_id
=
0
;
eNB_id
<
NB_eNB_INST
;
eNB_id
++
)
{
...
...
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