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
1e566199
Commit
1e566199
authored
Sep 18, 2019
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added option to set coreset offset for dlsim
parent
6f334abf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+11
-3
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+2
-0
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_gNB/main.c
+3
-0
No files found.
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
1e566199
...
@@ -135,6 +135,7 @@ int main(int argc, char **argv)
...
@@ -135,6 +135,7 @@ int main(int argc, char **argv)
int
run_initial_sync
=
0
;
int
run_initial_sync
=
0
;
int
do_pdcch_flag
=
1
;
int
do_pdcch_flag
=
1
;
uint16_t
cset_offset
=
0
;
int
loglvl
=
OAILOG_WARNING
;
int
loglvl
=
OAILOG_WARNING
;
float
target_error_rate
=
0
.
01
;
float
target_error_rate
=
0
.
01
;
...
@@ -147,7 +148,7 @@ int main(int argc, char **argv)
...
@@ -147,7 +148,7 @@ int main(int argc, char **argv)
randominit
(
0
);
randominit
(
0
);
while
((
c
=
getopt
(
argc
,
argv
,
"f:hA:pf:g:i:j:n:s:S:t:x:y:z:M:N:F:GR:dP:IL:"
))
!=
-
1
)
{
while
((
c
=
getopt
(
argc
,
argv
,
"f:hA:pf:g:i:j:n:s:S:t:x:y:z:M:N:F:GR:dP:IL:
o:
"
))
!=
-
1
)
{
switch
(
c
)
{
switch
(
c
)
{
/*case 'f':
/*case 'f':
write_output_file=1;
write_output_file=1;
...
@@ -312,6 +313,10 @@ int main(int argc, char **argv)
...
@@ -312,6 +313,10 @@ int main(int argc, char **argv)
loglvl
=
atoi
(
optarg
);
loglvl
=
atoi
(
optarg
);
break
;
break
;
case
'o'
:
cset_offset
=
atoi
(
optarg
);
break
;
default:
default:
case
'h'
:
case
'h'
:
printf
(
"%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId
\n
"
,
printf
(
"%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId
\n
"
,
...
@@ -337,6 +342,7 @@ int main(int argc, char **argv)
...
@@ -337,6 +342,7 @@ int main(int argc, char **argv)
//printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
//printf("-C Generate Calibration information for Abstraction (effective SNR adjustment to remove Pe bias w.r.t. AWGN)\n");
//printf("-f Output filename (.txt format) for Pe/SNR results\n");
//printf("-f Output filename (.txt format) for Pe/SNR results\n");
printf
(
"-F Input filename (.txt format) for RX conformance testing
\n
"
);
printf
(
"-F Input filename (.txt format) for RX conformance testing
\n
"
);
printf
(
"-o CORESET offset
\n
"
);
exit
(
-
1
);
exit
(
-
1
);
break
;
break
;
}
}
...
@@ -493,6 +499,8 @@ int main(int argc, char **argv)
...
@@ -493,6 +499,8 @@ int main(int argc, char **argv)
test_input_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
test_input_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
estimated_output_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
estimated_output_bit
=
(
unsigned
char
*
)
malloc16
(
sizeof
(
unsigned
char
)
*
16
*
68
*
384
);
uint16_t
rb_offset_count
=
cset_offset
/
6
;
set_cset_offset
(
rb_offset_count
);
// generate signal
// generate signal
if
(
input_fd
==
NULL
)
{
if
(
input_fd
==
NULL
)
{
gNB
->
pbch_configured
=
1
;
gNB
->
pbch_configured
=
1
;
...
@@ -598,8 +606,8 @@ int main(int argc, char **argv)
...
@@ -598,8 +606,8 @@ int main(int argc, char **argv)
mask
=
mask
>>
1
;
mask
=
mask
>>
1
;
mask
=
mask
|
0x100000000000
;
mask
=
mask
|
0x100000000000
;
}
}
uint16_t
rb_offset_count
=
rb_offset
/
6
;
uint16_t
UE_
rb_offset_count
=
rb_offset
/
6
;
mask
=
mask
>>
rb_offset_count
;
mask
=
mask
>>
UE_
rb_offset_count
;
dl_config
->
dl_config_list
[
0
].
dci_config_pdu
.
dci_config_rel15
.
coreset
.
frequency_domain_resource
=
mask
;
dl_config
->
dl_config_list
[
0
].
dci_config_pdu
.
dci_config_rel15
.
coreset
.
frequency_domain_resource
=
mask
;
dl_config
->
dl_config_list
[
0
].
dci_config_pdu
.
dci_config_rel15
.
coreset
.
rb_offset
=
rb_offset
;
// additional parameter other than coreset
dl_config
->
dl_config_list
[
0
].
dci_config_pdu
.
dci_config_rel15
.
coreset
.
rb_offset
=
rb_offset
;
// additional parameter other than coreset
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
1e566199
...
@@ -34,6 +34,8 @@
...
@@ -34,6 +34,8 @@
#include "nr_mac_gNB.h"
#include "nr_mac_gNB.h"
#include "PHY/defs_gNB.h"
#include "PHY/defs_gNB.h"
void
set_cset_offset
(
uint16_t
);
void
mac_top_init_gNB
(
void
);
void
mac_top_init_gNB
(
void
);
void
config_common
(
int
Mod_idP
,
void
config_common
(
int
Mod_idP
,
...
...
openair2/LAYER2/NR_MAC_gNB/main.c
View file @
1e566199
...
@@ -43,6 +43,9 @@
...
@@ -43,6 +43,9 @@
extern
RAN_CONTEXT_t
RC
;
extern
RAN_CONTEXT_t
RC
;
void
set_cset_offset
(
uint16_t
offset_bits
)
{
RC
.
nrmac
[
0
]
->
coreset
[
0
][
1
].
frequency_domain_resources
>>=
offset_bits
;
}
void
nr_init_coreset
(
nfapi_nr_coreset_t
*
coreset
)
{
void
nr_init_coreset
(
nfapi_nr_coreset_t
*
coreset
)
{
...
...
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