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
zzha zzha
OpenXG-RAN
Commits
ccd38774
Commit
ccd38774
authored
Nov 05, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "generating a simple ue specific search space with 24 RB in 1 symbol for testing"
This reverts commit
e47cd4a0
.
parent
cbbadf6b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+3
-3
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_gNB/main.c
+3
-3
No files found.
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
View file @
ccd38774
...
@@ -160,7 +160,7 @@ void nr_fill_dci(PHY_VARS_gNB *gNB,
...
@@ -160,7 +160,7 @@ void nr_fill_dci(PHY_VARS_gNB *gNB,
dlsch
->
harq_mask
|=
(
1
<<
pdu_rel15
->
harq_pid
);
dlsch
->
harq_mask
|=
(
1
<<
pdu_rel15
->
harq_pid
);
dlsch
->
rnti
=
params_rel15
->
rnti
;
dlsch
->
rnti
=
params_rel15
->
rnti
;
dci_alloc
->
L
=
4
;
dci_alloc
->
L
=
8
;
memcpy
((
void
*
)
&
dci_alloc
->
pdcch_params
,
(
void
*
)
params_rel15
,
sizeof
(
nfapi_nr_dl_config_pdcch_parameters_rel15_t
));
memcpy
((
void
*
)
&
dci_alloc
->
pdcch_params
,
(
void
*
)
params_rel15
,
sizeof
(
nfapi_nr_dl_config_pdcch_parameters_rel15_t
));
dci_alloc
->
size
=
nr_get_dci_size
(
dci_alloc
->
pdcch_params
.
dci_format
,
dci_alloc
->
size
=
nr_get_dci_size
(
dci_alloc
->
pdcch_params
.
dci_format
,
dci_alloc
->
pdcch_params
.
rnti_type
,
dci_alloc
->
pdcch_params
.
rnti_type
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @
ccd38774
...
@@ -53,7 +53,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
...
@@ -53,7 +53,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
nfapi_tx_request_pdu_t
*
TX_req
;
nfapi_tx_request_pdu_t
*
TX_req
;
nfapi_nr_config_request_t
*
cfg
=
&
nr_mac
->
config
[
0
];
nfapi_nr_config_request_t
*
cfg
=
&
nr_mac
->
config
[
0
];
uint16_t
rnti
=
0x
0
;
uint16_t
rnti
=
0x
1234
;
uint16_t
sfn_sf
=
frameP
<<
7
|
slotP
;
uint16_t
sfn_sf
=
frameP
<<
7
|
slotP
;
int
dl_carrier_bandwidth
=
cfg
->
rf_config
.
dl_carrier_bandwidth
.
value
;
int
dl_carrier_bandwidth
=
cfg
->
rf_config
.
dl_carrier_bandwidth
.
value
;
...
@@ -184,7 +184,7 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
...
@@ -184,7 +184,7 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
nfapi_nr_dl_config_request_pdu_t
*
dl_config_dci_pdu
;
nfapi_nr_dl_config_request_pdu_t
*
dl_config_dci_pdu
;
nfapi_nr_dl_config_request_pdu_t
*
dl_config_dlsch_pdu
;
nfapi_nr_dl_config_request_pdu_t
*
dl_config_dlsch_pdu
;
int
TBS
;
int
TBS
;
uint16_t
rnti
=
0x
0
;
uint16_t
rnti
=
0x
1234
;
int
dl_carrier_bandwidth
=
cfg
->
rf_config
.
dl_carrier_bandwidth
.
value
;
int
dl_carrier_bandwidth
=
cfg
->
rf_config
.
dl_carrier_bandwidth
.
value
;
...
@@ -312,7 +312,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
...
@@ -312,7 +312,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
//NR_COMMON_channels_t *cc = nr_mac->common_channels;
//NR_COMMON_channels_t *cc = nr_mac->common_channels;
nfapi_nr_dl_config_request_body_t
*
dl_req
;
nfapi_nr_dl_config_request_body_t
*
dl_req
;
nfapi_tx_request_pdu_t
*
TX_req
;
nfapi_tx_request_pdu_t
*
TX_req
;
uint16_t
rnti
=
0x
0
;
uint16_t
rnti
=
0x
1234
;
nfapi_nr_config_request_t
*
cfg
=
&
nr_mac
->
config
[
0
];
nfapi_nr_config_request_t
*
cfg
=
&
nr_mac
->
config
[
0
];
...
...
openair2/LAYER2/NR_MAC_gNB/main.c
View file @
ccd38774
...
@@ -52,7 +52,7 @@ void nr_init_coreset(nfapi_nr_coreset_t *coreset) {
...
@@ -52,7 +52,7 @@ void nr_init_coreset(nfapi_nr_coreset_t *coreset) {
coreset
->
coreset_id
=
1
;
coreset
->
coreset_id
=
1
;
coreset
->
frequency_domain_resources
=
0x1E0000000000
;
//0x1FFFE0000000; // 96 RB starting from CRB0
coreset
->
frequency_domain_resources
=
0x1E0000000000
;
//0x1FFFE0000000; // 96 RB starting from CRB0
coreset
->
duration
=
1
;
coreset
->
duration
=
2
;
coreset
->
cce_reg_mapping_type
=
NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED
;
coreset
->
cce_reg_mapping_type
=
NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED
;
coreset
->
reg_bundle_size
=
6
;
coreset
->
reg_bundle_size
=
6
;
coreset
->
interleaver_size
=
2
;
coreset
->
interleaver_size
=
2
;
...
@@ -66,14 +66,14 @@ void nr_init_search_space(nfapi_nr_search_space_t *search_space)
...
@@ -66,14 +66,14 @@ void nr_init_search_space(nfapi_nr_search_space_t *search_space)
search_space
->
search_space_id
=
1
;
search_space
->
search_space_id
=
1
;
search_space
->
coreset_id
=
1
;
search_space
->
coreset_id
=
1
;
search_space
->
search_space_type
=
NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC
;
search_space
->
search_space_type
=
NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC
;
search_space
->
duration
=
1
;
search_space
->
duration
=
5
;
search_space
->
slot_monitoring_periodicity
=
NFAPI_NR_SS_PERIODICITY_SL10
;
search_space
->
slot_monitoring_periodicity
=
NFAPI_NR_SS_PERIODICITY_SL10
;
search_space
->
slot_monitoring_offset
=
1
;
search_space
->
slot_monitoring_offset
=
1
;
search_space
->
monitoring_symbols_in_slot
=
0x3000
;
// 14 bits field
search_space
->
monitoring_symbols_in_slot
=
0x3000
;
// 14 bits field
search_space
->
css_formats_0_0_and_1_0
=
1
;
search_space
->
css_formats_0_0_and_1_0
=
1
;
search_space
->
uss_dci_formats
=
0
;
// enum to be defined-- formats 0.0 and 1.0
search_space
->
uss_dci_formats
=
0
;
// enum to be defined-- formats 0.0 and 1.0
for
(
int
i
=
0
;
i
<
NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS
;
i
++
)
for
(
int
i
=
0
;
i
<
NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS
;
i
++
)
search_space
->
number_of_candidates
[
i
]
=
1
;
// TODO
search_space
->
number_of_candidates
[
i
]
=
4
;
// TODO
}
}
void
mac_top_init_gNB
(
void
)
void
mac_top_init_gNB
(
void
)
...
...
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