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
canghaiwuhen
OpenXG-RAN
Commits
6ded6cb7
Commit
6ded6cb7
authored
Oct 08, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make ue and physim compile again
parent
add0570c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+6
-1
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+3
-3
No files found.
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
6ded6cb7
...
...
@@ -114,6 +114,8 @@ int main(int argc, char **argv){
uint32_t
tx_lev
=
10000
,
prach_errors
=
0
,
samp_count
;
//,tx_lev_dB;
uint64_t
SSB_positions
=
0x01
,
absoluteFrequencyPointA
=
640000
;
double
DS_TDL
=
.
03
;
uint16_t
RA_sfn_index
=
-
1
;
uint8_t
N_RA_slot
,
config_period
=
1
;
// int8_t interf1=-19,interf2=-19;
// uint8_t abstraction_flag=0,calibration_flag=0;
...
...
@@ -436,7 +438,10 @@ int main(int argc, char **argv){
&
format
,
&
start_symbol
,
&
N_t_slot
,
&
N_dur
);
&
N_dur
,
&
RA_sfn_index
,
&
N_RA_slot
,
&
config_period
);
if
(
ret
==
0
)
{
printf
(
"No prach in %d.%d, mu %d, config_index %d
\n
"
,
frame
,
slot
,
mu
,
config_index
);
exit
(
-
1
);}
format0
=
format
&
0xff
;
// first column of format from table
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
View file @
6ded6cb7
...
...
@@ -102,7 +102,7 @@ int get_nr_prach_info_from_index(uint8_t index,
uint8_t
*
N_dur
,
uint16_t
*
RA_sfn_index
,
uint8_t
*
N_RA_slot
,
uint8_t
*
config_period
);
uint8_t
*
config_period
);
int
get_nr_prach_occasion_info_from_index
(
uint8_t
index
,
uint32_t
pointa
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
6ded6cb7
...
...
@@ -160,8 +160,8 @@ void find_SSB_and_RO_available(module_id_t module_idP) {
&
N_t_slot
,
&
N_dur
,
&
N_RA_slot
,
&
N_RA_sfn
,
&
max_association_period
);
&
N_RA_sfn
,
&
max_association_period
);
float
num_ssb_per_RO
=
ssb_per_rach_occasion
[
cfg
->
prach_config
.
ssb_per_rach
.
value
];
uint8_t
fdm
=
cfg
->
prach_config
.
num_prach_fd_occasions
.
value
;
...
...
@@ -207,7 +207,7 @@ void schedule_nr_prach(module_id_t module_idP, frame_t frameP, sub_frame_t slotP
uint8_t
config_index
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rach_ConfigGeneric
.
prach_ConfigurationIndex
;
uint8_t
mu
,
N_dur
,
N_t_slot
,
start_symbol
=
0
,
temp_start_symbol
=
0
,
N_RA_slot
;
uint16_t
RA_sfn_index
=
-
1
;
uint8_t
config_period
=
1
;
uint8_t
config_period
=
1
;
uint16_t
format
;
int
slot_index
=
0
;
uint16_t
prach_occasion_id
=
-
1
;
...
...
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