Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OAI-RAN-5G-sheduler_MaxTBS
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MAQ5G-PFC
OAI-RAN-5G-sheduler_MaxTBS
Commits
73339bc7
Commit
73339bc7
authored
6 years ago
by
WEI-TAI CHEN
Browse files
Options
Downloads
Patches
Plain Diff
Amend to nfapi_nr_config_request_t
parent
a9990512
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
openair1/PHY/INIT/nr_init.c
+2
-2
2 additions, 2 deletions
openair1/PHY/INIT/nr_init.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
1 addition, 1 deletion
openair1/SCHED_NR/phy_procedures_nr_gNB.c
targets/RT/USER/nr-softmodem.c
+5
-5
5 additions, 5 deletions
targets/RT/USER/nr-softmodem.c
with
8 additions
and
8 deletions
openair1/PHY/INIT/nr_init.c
+
2
−
2
View file @
73339bc7
...
@@ -84,7 +84,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
...
@@ -84,7 +84,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
// shortcuts
// shortcuts
NR_DL_FRAME_PARMS
*
const
fp
=
&
gNB
->
frame_parms
;
NR_DL_FRAME_PARMS
*
const
fp
=
&
gNB
->
frame_parms
;
nfapi_config_request_t
*
cfg
=
&
gNB
->
gNB_config
;
nfapi_
nr_
config_request_t
*
cfg
=
&
gNB
->
gNB_config
;
NR_gNB_COMMON
*
const
common_vars
=
&
gNB
->
common_vars
;
NR_gNB_COMMON
*
const
common_vars
=
&
gNB
->
common_vars
;
LTE_eNB_PUSCH
**
const
pusch_vars
=
gNB
->
pusch_vars
;
LTE_eNB_PUSCH
**
const
pusch_vars
=
gNB
->
pusch_vars
;
LTE_eNB_SRS
*
const
srs_vars
=
gNB
->
srs_vars
;
LTE_eNB_SRS
*
const
srs_vars
=
gNB
->
srs_vars
;
...
@@ -271,7 +271,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
...
@@ -271,7 +271,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
void
phy_free_nr_gNB
(
PHY_VARS_gNB
*
gNB
)
void
phy_free_nr_gNB
(
PHY_VARS_gNB
*
gNB
)
{
{
// NR_DL_FRAME_PARMS* const fp = &gNB->frame_parms;
// NR_DL_FRAME_PARMS* const fp = &gNB->frame_parms;
nfapi_config_request_t
*
cfg
=
&
gNB
->
gNB_config
;
nfapi_
nr_
config_request_t
*
cfg
=
&
gNB
->
gNB_config
;
NR_gNB_COMMON
*
const
common_vars
=
&
gNB
->
common_vars
;
NR_gNB_COMMON
*
const
common_vars
=
&
gNB
->
common_vars
;
LTE_eNB_PUSCH
**
const
pusch_vars
=
gNB
->
pusch_vars
;
LTE_eNB_PUSCH
**
const
pusch_vars
=
gNB
->
pusch_vars
;
LTE_eNB_SRS
*
const
srs_vars
=
gNB
->
srs_vars
;
LTE_eNB_SRS
*
const
srs_vars
=
gNB
->
srs_vars
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+
1
−
1
View file @
73339bc7
...
@@ -108,7 +108,7 @@ int nr_get_ssb_start_symbol(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *f
...
@@ -108,7 +108,7 @@ int nr_get_ssb_start_symbol(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *f
return
symbol
;
return
symbol
;
}
}
void
nr_set_ssb_first_subcarrier
(
nfapi_config_request_t
*
cfg
,
NR_DL_FRAME_PARMS
*
fp
)
void
nr_set_ssb_first_subcarrier
(
nfapi_
nr_
config_request_t
*
cfg
,
NR_DL_FRAME_PARMS
*
fp
)
{
{
int
start_rb
=
cfg
->
sch_config
.
n_ssb_crb
.
value
/
pow
(
2
,
cfg
->
subframe_config
.
numerology_index_mu
.
value
);
int
start_rb
=
cfg
->
sch_config
.
n_ssb_crb
.
value
/
pow
(
2
,
cfg
->
subframe_config
.
numerology_index_mu
.
value
);
fp
->
ssb_start_subcarrier
=
12
*
start_rb
+
cfg
->
sch_config
.
ssb_subcarrier_offset
.
value
;
fp
->
ssb_start_subcarrier
=
12
*
start_rb
+
cfg
->
sch_config
.
ssb_subcarrier_offset
.
value
;
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/nr-softmodem.c
+
5
−
5
View file @
73339bc7
...
@@ -193,7 +193,7 @@ int otg_enabled;
...
@@ -193,7 +193,7 @@ int otg_enabled;
//static NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs];
//static NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs];
static
nfapi_config_request_t
*
config
[
MAX_NUM_CCs
];
static
nfapi_
nr_
config_request_t
*
config
[
MAX_NUM_CCs
];
uint32_t
target_dl_mcs
=
28
;
//maximum allowed mcs
uint32_t
target_dl_mcs
=
28
;
//maximum allowed mcs
uint32_t
target_ul_mcs
=
20
;
uint32_t
target_ul_mcs
=
20
;
uint32_t
timing_advance
=
0
;
uint32_t
timing_advance
=
0
;
...
@@ -231,7 +231,7 @@ threads_t threads= {-1,-1,-1,-1,-1,-1,-1};
...
@@ -231,7 +231,7 @@ threads_t threads= {-1,-1,-1,-1,-1,-1,-1};
uint8_t
abstraction_flag
=
0
;
uint8_t
abstraction_flag
=
0
;
/* forward declarations */
/* forward declarations */
void
set_default_frame_parms
(
nfapi_config_request_t
*
config
[
MAX_NUM_CCs
],
NR_DL_FRAME_PARMS
*
frame_parms
[
MAX_NUM_CCs
]);
void
set_default_frame_parms
(
nfapi_
nr_
config_request_t
*
config
[
MAX_NUM_CCs
],
NR_DL_FRAME_PARMS
*
frame_parms
[
MAX_NUM_CCs
]);
/*---------------------BMC: timespec helpers -----------------------------*/
/*---------------------BMC: timespec helpers -----------------------------*/
...
@@ -564,16 +564,16 @@ int T_dont_fork = 0; /* default is to fork, see 'T_init' to understand */
...
@@ -564,16 +564,16 @@ int T_dont_fork = 0; /* default is to fork, see 'T_init' to understand */
void
set_default_frame_parms
(
nfapi_config_request_t
*
config
[
MAX_NUM_CCs
],
NR_DL_FRAME_PARMS
*
frame_parms
[
MAX_NUM_CCs
])
{
void
set_default_frame_parms
(
nfapi_
nr_
config_request_t
*
config
[
MAX_NUM_CCs
],
NR_DL_FRAME_PARMS
*
frame_parms
[
MAX_NUM_CCs
])
{
int
CC_id
;
int
CC_id
;
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
frame_parms
[
CC_id
]
=
(
NR_DL_FRAME_PARMS
*
)
malloc
(
sizeof
(
NR_DL_FRAME_PARMS
));
frame_parms
[
CC_id
]
=
(
NR_DL_FRAME_PARMS
*
)
malloc
(
sizeof
(
NR_DL_FRAME_PARMS
));
config
[
CC_id
]
=
(
nfapi_config_request_t
*
)
malloc
(
sizeof
(
nfapi_config_request_t
));
config
[
CC_id
]
=
(
nfapi_
nr_
config_request_t
*
)
malloc
(
sizeof
(
nfapi_
nr_
config_request_t
));
config
[
CC_id
]
->
subframe_config
.
numerology_index_mu
.
value
=
1
;
config
[
CC_id
]
->
subframe_config
.
numerology_index_mu
.
value
=
1
;
config
[
CC_id
]
->
subframe_config
.
duplex_mode
.
value
=
1
;
//FDD
config
[
CC_id
]
->
subframe_config
.
duplex_mode
.
value
=
1
;
//FDD
config
[
CC_id
]
->
subframe_config
.
dl_
cyclic_
prefix_type
.
value
=
0
;
//NORMAL
config
[
CC_id
]
->
subframe_config
.
dl_prefix_type
.
value
=
0
;
//NORMAL
config
[
CC_id
]
->
rf_config
.
dl_channel_bandwidth
.
value
=
106
;
config
[
CC_id
]
->
rf_config
.
dl_channel_bandwidth
.
value
=
106
;
config
[
CC_id
]
->
rf_config
.
ul_channel_bandwidth
.
value
=
106
;
config
[
CC_id
]
->
rf_config
.
ul_channel_bandwidth
.
value
=
106
;
config
[
CC_id
]
->
rf_config
.
tx_antenna_ports
.
value
=
1
;
config
[
CC_id
]
->
rf_config
.
tx_antenna_ports
.
value
=
1
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment