Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
8d6c5858
Commit
8d6c5858
authored
Jan 03, 2020
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modifications for nr-uesoftmodem with RRC configuration
parent
a4efc62f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
49 deletions
+6
-49
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-0
executables/nr-ue.c
executables/nr-ue.c
+2
-13
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+1
-12
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+0
-23
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
8d6c5858
...
...
@@ -1319,6 +1319,7 @@ set(PHY_SRC_UE
set
(
PHY_NR_SRC_COMMON
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_prach_common.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dci_tools_common.c
)
set
(
PHY_NR_SRC
...
...
@@ -2467,6 +2468,7 @@ add_executable(nr-uesoftmodem
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/LAYER2/NR_MAC_gNB/nr_mac_common.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR3_DIR
}
/NAS/UE/nas_ue_task.c
${
OPENAIR_DIR
}
/common/utils/utils.c
...
...
executables/nr-ue.c
View file @
8d6c5858
...
...
@@ -392,7 +392,7 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
scheduled_response
.
ul_config
->
sfn_slot
=
NR_UPLINK_SLOT
;
scheduled_response
.
ul_config
->
number_pdus
=
1
;
scheduled_response
.
ul_config
->
ul_config_list
[
0
].
pdu_type
=
FAPI_NR_UL_CONFIG_TYPE_
UL
SCH
;
scheduled_response
.
ul_config
->
ul_config_list
[
0
].
pdu_type
=
FAPI_NR_UL_CONFIG_TYPE_
PU
SCH
;
scheduled_response
.
ul_config
->
ul_config_list
[
0
].
ulsch_config_pdu
.
rnti
=
n_rnti
;
scheduled_response
.
ul_config
->
ul_config_list
[
0
].
ulsch_config_pdu
.
ulsch_pdu_rel15
.
number_rbs
=
nb_rb
;
scheduled_response
.
ul_config
->
ul_config_list
[
0
].
ulsch_config_pdu
.
ulsch_pdu_rel15
.
start_rb
=
start_rb
;
...
...
@@ -409,7 +409,7 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
phy_procedures_slot_parallelization_nrUE_RX
(
UE
,
proc
,
0
,
0
,
1
,
UE
->
mode
,
no_relay
,
NULL
);
#else
uint64_t
a
=
rdtsc
();
phy_procedures_nrUE_RX
(
UE
,
proc
,
0
,
1
,
UE
->
mode
,
scheduled_response
.
dl_config
);
phy_procedures_nrUE_RX
(
UE
,
proc
,
0
,
1
,
UE
->
mode
);
LOG_D
(
PHY
,
"phy_procedures_nrUE_RX: slot:%d, time %lu
\n
"
,
proc
->
nr_tti_rx
,
(
rdtsc
()
-
a
)
/
3500
);
//printf(">>> nr_ue_pdcch_procedures ended\n");
#endif
...
...
@@ -821,17 +821,6 @@ void init_NR_UE(int nb_inst) {
nr_l2_init_ue
();
mac_inst
=
get_mac_inst
(
inst
);
mac_inst
->
if_module
=
UE
->
if_inst
;
// Initial bandwidth part configuration -- full carrier bandwidth
mac_inst
->
initial_bwp_dl
.
bwp_id
=
0
;
mac_inst
->
initial_bwp_dl
.
location
=
0
;
mac_inst
->
initial_bwp_dl
.
scs
=
UE
->
frame_parms
.
subcarrier_spacing
;
mac_inst
->
initial_bwp_dl
.
N_RB
=
UE
->
frame_parms
.
N_RB_DL
;
mac_inst
->
initial_bwp_dl
.
cyclic_prefix
=
UE
->
frame_parms
.
Ncp
;
mac_inst
->
initial_bwp_ul
.
bwp_id
=
0
;
mac_inst
->
initial_bwp_ul
.
location
=
0
;
mac_inst
->
initial_bwp_ul
.
scs
=
UE
->
frame_parms
.
subcarrier_spacing
;
mac_inst
->
initial_bwp_ul
.
N_RB
=
UE
->
frame_parms
.
N_RB_UL
;
mac_inst
->
initial_bwp_ul
.
cyclic_prefix
=
UE
->
frame_parms
.
Ncp
;
LOG_I
(
PHY
,
"Intializing UE Threads for instance %d (%p,%p)...
\n
"
,
inst
,
PHY_vars_UE_g
[
inst
],
PHY_vars_UE_g
[
inst
][
0
]);
threadCreate
(
&
threads
[
inst
],
UE_thread
,
(
void
*
)
UE
,
"UEthread"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
...
...
executables/nr-uesoftmodem.c
View file @
8d6c5858
...
...
@@ -719,11 +719,7 @@ int main( int argc, char **argv ) {
PHY_vars_UE_g
[
0
][
CC_id
]
=
init_nr_ue_vars
(
frame_parms
[
CC_id
],
0
,
abstraction_flag
);
UE
[
CC_id
]
=
PHY_vars_UE_g
[
0
][
CC_id
];
if
(
phy_test
==
1
)
UE
[
CC_id
]
->
mac_enabled
=
0
;
else
UE
[
CC_id
]
->
mac_enabled
=
1
;
UE
[
CC_id
]
->
mac_enabled
=
1
;
UE
[
CC_id
]
->
UE_scan
=
UE_scan
;
UE
[
CC_id
]
->
UE_scan_carrier
=
UE_scan_carrier
;
...
...
@@ -732,13 +728,6 @@ int main( int argc, char **argv ) {
UE
[
CC_id
]
->
no_timing_correction
=
UE_no_timing_correction
;
printf
(
"UE[%d]->mode = %d
\n
"
,
CC_id
,
mode
);
for
(
uint8_t
i
=
0
;
i
<
RX_NB_TH_MAX
;
i
++
)
{
if
(
UE
[
CC_id
]
->
mac_enabled
==
1
)
UE
[
CC_id
]
->
pdcch_vars
[
i
][
0
]
->
crnti
=
0x1234
;
else
UE
[
CC_id
]
->
pdcch_vars
[
i
][
0
]
->
crnti
=
0x1235
;
}
UE
[
CC_id
]
->
rx_total_gain_dB
=
(
int
)
rx_gain
[
CC_id
][
0
]
+
rx_gain_off
;
UE
[
CC_id
]
->
tx_power_max_dBm
=
tx_max_power
[
CC_id
];
...
...
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
View file @
8d6c5858
...
...
@@ -118,29 +118,6 @@ void nr_fill_cce_list(PHY_VARS_gNB *gNB, uint16_t n_shift, uint8_t m) {
*/
void
get_coreset_rballoc
(
uint8_t
*
FreqDomainResource
,
int
*
n_rb
,
int
*
rb_offset
)
{
uint8_t
count
=
0
,
start
=
0
,
start_set
=
0
;
uint64_t
bitmap
=
(((
uint64_t
)
FreqDomainResource
[
0
])
<<
37
)
|
(((
uint64_t
)
FreqDomainResource
[
1
])
<<
29
)
|
(((
uint64_t
)
FreqDomainResource
[
2
])
<<
21
)
|
(((
uint64_t
)
FreqDomainResource
[
3
])
<<
13
)
|
(((
uint64_t
)
FreqDomainResource
[
4
])
<<
5
)
|
(((
uint64_t
)
FreqDomainResource
[
5
])
>>
3
);
for
(
int
i
=
0
;
i
<
45
;
i
++
)
if
((
bitmap
>>
(
44
-
i
))
&
1
)
{
count
++
;
if
(
!
start_set
)
{
start
=
i
;
start_set
=
1
;
}
}
*
rb_offset
=
6
*
start
;
*
n_rb
=
6
*
count
;
}
void
nr_fill_cce_list
(
PHY_VARS_gNB
*
gNB
,
uint8_t
m
)
{
nr_cce_t
*
cce
;
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
8d6c5858
...
...
@@ -409,7 +409,7 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
// (void *)&bcch_message->message.choice.mib,
// sizeof(NR_MIB_t) );
nr_rrc_mac_config_req_ue
(
0
,
0
,
0
,
mib
,
NULL
,
NULL
,
NULL
,
NULL
);
nr_rrc_mac_config_req_ue
(
0
,
0
,
0
,
mib
,
NULL
,
NULL
);
}
return
0
;
...
...
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