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
lizhongxiao
OpenXG UE
Commits
dba6ec37
Commit
dba6ec37
authored
Jan 10, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
review fixes
parent
1cde2410
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
15 deletions
+8
-15
executables/nr-softmodem.h
executables/nr-softmodem.h
+1
-1
executables/nr-uesoftmodem.h
executables/nr-uesoftmodem.h
+1
-1
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_nsa.c
+3
-6
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+3
-7
No files found.
executables/nr-softmodem.h
View file @
dba6ec37
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
{"D" , CONFIG_HLP_DLBM_PHYTEST,0, u64ptr:&dlsch_slot_bitmap, defintval:0, TYPE_UINT64, 0}, \
{"D" , CONFIG_HLP_DLBM_PHYTEST,0, u64ptr:&dlsch_slot_bitmap, defintval:0, TYPE_UINT64, 0}, \
{"U" , CONFIG_HLP_ULBM_PHYTEST,0, u64ptr:&ulsch_slot_bitmap, defintval:0, TYPE_UINT64, 0}, \
{"U" , CONFIG_HLP_ULBM_PHYTEST,0, u64ptr:&ulsch_slot_bitmap, defintval:0, TYPE_UINT64, 0}, \
{"usrp-tx-thread-config", CONFIG_HLP_USRP_THREAD, 0, iptr:&usrp_tx_thread, defstrval:0, TYPE_INT, 0}, \
{"usrp-tx-thread-config", CONFIG_HLP_USRP_THREAD, 0, iptr:&usrp_tx_thread, defstrval:0, TYPE_INT, 0}, \
{"uecap_file", CONFIG_HLP_UECAP_FILE, 0, strptr:(char **)&uecap_file, defstrval:"./
",
TYPE_STRING, 0}, \
{"uecap_file", CONFIG_HLP_UECAP_FILE, 0, strptr:(char **)&uecap_file, defstrval:"./
uecap.xml",
TYPE_STRING, 0}, \
{"s" , CONFIG_HLP_SNR, 0, dblptr:&snr_dB, defdblval:25, TYPE_DOUBLE, 0}, \
{"s" , CONFIG_HLP_SNR, 0, dblptr:&snr_dB, defdblval:25, TYPE_DOUBLE, 0}, \
}
}
...
...
executables/nr-uesoftmodem.h
View file @
dba6ec37
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
{"offset-divisor", CONFIG_HLP_OFFSET_DIV, 0, uptr:(uint32_t *)&nrUE_params.ofdm_offset_divisor, defuintval:UINT_MAX, TYPE_UINT32, 0}, \
{"offset-divisor", CONFIG_HLP_OFFSET_DIV, 0, uptr:(uint32_t *)&nrUE_params.ofdm_offset_divisor, defuintval:UINT_MAX, TYPE_UINT32, 0}, \
{"nr-dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&nr_dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
{"nr-dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&nr_dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
{"V" , CONFIG_HLP_VCD, PARAMFLAG_BOOL, iptr:&vcdflag, defintval:0, TYPE_INT, 0}, \
{"V" , CONFIG_HLP_VCD, PARAMFLAG_BOOL, iptr:&vcdflag, defintval:0, TYPE_INT, 0}, \
{"uecap_file", CONFIG_HLP_UECAP_FILE, 0, strptr:(char **)&uecap_file, defstrval:"./
",
TYPE_STRING, 0}, \
{"uecap_file", CONFIG_HLP_UECAP_FILE, 0, strptr:(char **)&uecap_file, defstrval:"./
uecap.xml",
TYPE_STRING, 0}, \
{"rrc_config_path", CONFIG_HLP_RRC_CFG_PATH,0, strptr:(char **)&rrc_config_path, defstrval:"./", TYPE_STRING, 0}, \
{"rrc_config_path", CONFIG_HLP_RRC_CFG_PATH,0, strptr:(char **)&rrc_config_path, defstrval:"./", TYPE_STRING, 0}, \
{"ue-idx-standalone", NULL, 0, u16ptr:&ue_idx_standalone, defuintval:0xFFFF, TYPE_UINT16, 0} \
{"ue-idx-standalone", NULL, 0, u16ptr:&ue_idx_standalone, defuintval:0xFFFF, TYPE_UINT16, 0} \
}
}
...
...
openair2/RRC/NR/rrc_gNB_nsa.c
View file @
dba6ec37
...
@@ -148,17 +148,14 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
...
@@ -148,17 +148,14 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
// In case of phy-test and do-ra mode, read UE capabilities directly from file
// In case of phy-test and do-ra mode, read UE capabilities directly from file
if
(
get_softmodem_params
()
->
phy_test
==
1
||
get_softmodem_params
()
->
do_ra
==
1
)
{
if
(
get_softmodem_params
()
->
phy_test
==
1
||
get_softmodem_params
()
->
do_ra
==
1
)
{
NR_UE_NR_Capability_t
*
UE_Capability_nr
=
NULL
;
NR_UE_NR_Capability_t
*
UE_Capability_nr
=
NULL
;
char
UE_NR_Capability_xer_fname
[
1024
];
char
UE_NR_Capability_xer
[
65536
];
char
UE_NR_Capability_xer
[
65536
];
FILE
*
f
=
NULL
;
FILE
*
f
=
NULL
;
if
(
uecap_file
)
{
if
(
uecap_file
)
sprintf
(
UE_NR_Capability_xer_fname
,
"%s"
,
uecap_file
);
f
=
fopen
(
uecap_file
,
"r"
);
f
=
fopen
(
UE_NR_Capability_xer_fname
,
"r"
);
}
if
(
f
){
if
(
f
){
size_t
size
=
fread
(
UE_NR_Capability_xer
,
1
,
sizeof
UE_NR_Capability_xer
,
f
);
size_t
size
=
fread
(
UE_NR_Capability_xer
,
1
,
sizeof
UE_NR_Capability_xer
,
f
);
if
(
size
==
0
||
size
==
sizeof
UE_NR_Capability_xer
)
if
(
size
==
0
||
size
==
sizeof
UE_NR_Capability_xer
)
LOG_E
(
NR_RRC
,
"UE Capabilities XER file %s is too large (%ld)
\n
"
,
UE_NR_Capability_xer_fname
,
size
);
LOG_E
(
NR_RRC
,
"UE Capabilities XER file %s is too large (%ld)
\n
"
,
uecap_file
,
size
);
else
{
else
{
UE_Capability_nr
=
CALLOC
(
1
,
sizeof
(
NR_UE_NR_Capability_t
));
UE_Capability_nr
=
CALLOC
(
1
,
sizeof
(
NR_UE_NR_Capability_t
));
asn_dec_rval_t
dec_rval
=
xer_decode
(
0
,
&
asn_DEF_NR_UE_NR_Capability
,
(
void
*
)
&
UE_Capability_nr
,
UE_NR_Capability_xer
,
size
);
asn_dec_rval_t
dec_rval
=
xer_decode
(
0
,
&
asn_DEF_NR_UE_NR_Capability
,
(
void
*
)
&
UE_Capability_nr
,
UE_NR_Capability_xer
,
size
);
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
dba6ec37
...
@@ -2639,7 +2639,6 @@ nr_rrc_ue_process_ueCapabilityEnquiry(
...
@@ -2639,7 +2639,6 @@ nr_rrc_ue_process_ueCapabilityEnquiry(
asn_dec_rval_t
dec_rval
;
asn_dec_rval_t
dec_rval
;
NR_UL_DCCH_Message_t
ul_dcch_msg
;
NR_UL_DCCH_Message_t
ul_dcch_msg
;
NR_UE_CapabilityRAT_Container_t
ue_CapabilityRAT_Container
;
NR_UE_CapabilityRAT_Container_t
ue_CapabilityRAT_Container
;
char
UE_NR_Capability_xer_fname
[
1024
];
char
UE_NR_Capability_xer
[
65536
];
char
UE_NR_Capability_xer
[
65536
];
size_t
size
;
size_t
size
;
uint8_t
buffer
[
200
];
uint8_t
buffer
[
200
];
...
@@ -2662,15 +2661,12 @@ nr_rrc_ue_process_ueCapabilityEnquiry(
...
@@ -2662,15 +2661,12 @@ nr_rrc_ue_process_ueCapabilityEnquiry(
char
*
file_path
=
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
uecap_file
;
char
*
file_path
=
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
uecap_file
;
FILE
*
f
=
NULL
;
FILE
*
f
=
NULL
;
if
(
file_path
)
{
if
(
file_path
)
sprintf
(
UE_NR_Capability_xer_fname
,
"%s"
,
file_path
);
f
=
fopen
(
file_path
,
"r"
);
f
=
fopen
(
UE_NR_Capability_xer_fname
,
"r"
);
}
if
(
f
){
if
(
f
){
size
=
fread
(
UE_NR_Capability_xer
,
1
,
sizeof
UE_NR_Capability_xer
,
f
);
size
=
fread
(
UE_NR_Capability_xer
,
1
,
sizeof
UE_NR_Capability_xer
,
f
);
if
(
size
==
0
||
size
==
sizeof
UE_NR_Capability_xer
)
{
if
(
size
==
0
||
size
==
sizeof
UE_NR_Capability_xer
)
{
LOG_E
(
NR_RRC
,
"UE Capabilities XER file %s is too large (%ld)
\n
"
,
UE_NR_Capability_xer_fname
,
size
);
LOG_E
(
NR_RRC
,
"UE Capabilities XER file %s is too large (%ld)
\n
"
,
file_path
,
size
);
free
(
UE_Capability_nr
);
free
(
UE_Capability_nr
);
return
;
return
;
}
}
...
...
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