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
Michael Black
OpenXG-RAN
Commits
8b1138c8
Commit
8b1138c8
authored
Aug 16, 2021
by
Abhijith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hardcoding of bwp_id at UE removed
parent
274ea107
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
83 additions
and
59 deletions
+83
-59
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+22
-17
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+11
-9
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+1
-1
openair2/LAYER2/NR_MAC_UE/mac_defs.h
openair2/LAYER2/NR_MAC_UE/mac_defs.h
+5
-5
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+2
-2
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+42
-25
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
8b1138c8
...
...
@@ -1178,24 +1178,26 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
const
double
N_TA_max
=
Ta_max
*
bw_scaling
*
tc_factor
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
0
);
NR_BWP_Id_t
dl_bwp
=
(
mac
->
DL_BWP_Id
==
0
)
?
1
:
mac
->
DL_BWP_Id
;
NR_BWP_Id_t
ul_bwp
=
(
mac
->
UL_BWP_Id
==
0
)
?
1
:
mac
->
UL_BWP_Id
;
NR_BWP_Id_t
dl_bwp
=
mac
->
DL_BWP_Id
;
NR_BWP_Id_t
ul_bwp
=
mac
->
UL_BWP_Id
;
NR_PUSCH_TimeDomainResourceAllocationList_t
*
pusch_TimeDomainAllocationList
=
NULL
;
if
(
mac
->
ULbwp
[
ul_bwp
-
1
]
&&
if
(
ul_bwp
){
if
(
mac
->
ULbwp
[
ul_bwp
-
1
]
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Dedicated
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Dedicated
->
pusch_Config
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
->
pusch_TimeDomainAllocationList
)
{
pusch_TimeDomainAllocationList
=
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
->
pusch_TimeDomainAllocationList
->
choice
.
setup
;
}
else
if
(
mac
->
ULbwp
[
ul_bwp
-
1
]
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
->
pusch_TimeDomainAllocationList
)
{
pusch_TimeDomainAllocationList
=
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
->
pusch_TimeDomainAllocationList
;
}
pusch_TimeDomainAllocationList
=
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
->
pusch_TimeDomainAllocationList
->
choice
.
setup
;
}
else
if
(
mac
->
ULbwp
[
ul_bwp
-
1
]
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
&&
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
->
pusch_TimeDomainAllocationList
)
{
pusch_TimeDomainAllocationList
=
mac
->
ULbwp
[
ul_bwp
-
1
]
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
->
pusch_TimeDomainAllocationList
;
}
}
else
if
(
mac
->
scc_SIB
&&
mac
->
scc_SIB
->
uplinkConfigCommon
&&
mac
->
scc_SIB
->
uplinkConfigCommon
->
initialUplinkBWP
.
pusch_ConfigCommon
&&
...
...
@@ -1205,12 +1207,15 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
}
long
mapping_type_ul
=
pusch_TimeDomainAllocationList
?
pusch_TimeDomainAllocationList
->
list
.
array
[
0
]
->
mappingType
:
NR_PUSCH_TimeDomainResourceAllocation__mappingType_typeA
;
NR_PDSCH_Config_t
*
pdsch_Config
=
(
mac
->
DLbwp
[
dl_bwp
-
1
]
&&
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
)
?
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
:
NULL
;
NR_PDSCH_Config_t
*
pdsch_Config
=
NULL
;
NR_PDSCH_TimeDomainResourceAllocationList_t
*
pdsch_TimeDomainAllocationList
=
NULL
;
if
(
mac
->
DLbwp
[
dl_bwp
-
1
]
&&
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
)
pdsch_TimeDomainAllocationList
=
pdsch_Config
->
pdsch_TimeDomainAllocationList
->
choice
.
setup
;
else
if
(
mac
->
DLbwp
[
dl_bwp
-
1
]
&&
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
)
pdsch_TimeDomainAllocationList
=
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
;
if
(
dl_bwp
){
pdsch_Config
=
(
mac
->
DLbwp
[
dl_bwp
-
1
]
&&
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
)
?
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
:
NULL
;
if
(
mac
->
DLbwp
[
dl_bwp
-
1
]
&&
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
)
pdsch_TimeDomainAllocationList
=
pdsch_Config
->
pdsch_TimeDomainAllocationList
->
choice
.
setup
;
else
if
(
mac
->
DLbwp
[
dl_bwp
-
1
]
&&
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
)
pdsch_TimeDomainAllocationList
=
mac
->
DLbwp
[
dl_bwp
-
1
]
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
;
}
else
if
(
mac
->
scc_SIB
&&
mac
->
scc_SIB
->
downlinkConfigCommon
.
initialDownlinkBWP
.
pdsch_ConfigCommon
->
choice
.
setup
)
pdsch_TimeDomainAllocationList
=
mac
->
scc_SIB
->
downlinkConfigCommon
.
initialDownlinkBWP
.
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
;
long
mapping_type_dl
=
pdsch_TimeDomainAllocationList
?
pdsch_TimeDomainAllocationList
->
list
.
array
[
0
]
->
mappingType
:
NR_PDSCH_TimeDomainResourceAllocation__mappingType_typeA
;
...
...
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
8b1138c8
...
...
@@ -991,15 +991,17 @@ uint8_t get_downlink_ack(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_t
int
N_m_c_rx
=
0
;
int
V_DAI_m_DL
=
0
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
0
);
NR_BWP_Id_t
dl_bwp_id
=
(
mac
->
DL_BWP_Id
==
0
)
?
1
:
mac
->
DL_BWP_Id
;
if
(
mac
->
DLbwp
[
dl_bwp_id
-
1
]
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
->
pdsch_Config
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
maxNrofCodeWordsScheduledByDCI
[
0
]
==
2
)
{
two_transport_blocks
=
TRUE
;
number_of_code_word
=
2
;
NR_BWP_Id_t
dl_bwp_id
=
mac
->
DL_BWP_Id
;
if
(
dl_bwp_id
){
if
(
mac
->
DLbwp
[
dl_bwp_id
-
1
]
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
->
pdsch_Config
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
&&
mac
->
DLbwp
[
dl_bwp_id
-
1
]
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
maxNrofCodeWordsScheduledByDCI
[
0
]
==
2
)
{
two_transport_blocks
=
TRUE
;
number_of_code_word
=
2
;
}
}
else
{
number_of_code_word
=
1
;
...
...
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
8b1138c8
...
...
@@ -639,7 +639,7 @@ void config_control_ue(NR_UE_MAC_INST_t *mac){
// check pdcch_Config, pdcch_ConfigCommon and DL BWP
// Check dedicated UL BWP and pass to MAC
for
(
int
num_BWP
=
0
;
num_BWP
<
MAX_NUM_BWP
;
num_BWP
++
)
for
(
int
num_BWP
=
0
;
num_BWP
<
MAX_NUM_BWP
_UE
;
num_BWP
++
)
{
mac
->
DLbwp
[
num_BWP
]
=
scd
->
downlinkBWP_ToAddModList
->
list
.
array
[
num_BWP
];
mac
->
ULbwp
[
num_BWP
]
=
uplinkBWP_ToAddModList
->
list
.
array
[
num_BWP
];
...
...
openair2/LAYER2/NR_MAC_UE/mac_defs.h
View file @
8b1138c8
...
...
@@ -74,7 +74,7 @@
// ==========
#define NB_NR_UE_MAC_INST 1
#define MAX_NUM_BWP 4
#define MAX_NUM_BWP
_UE
4
#define NUM_SLOT_FRAME 10
/*!\brief value for indicating BSR Timer is not running */
...
...
@@ -330,10 +330,10 @@ typedef struct {
NR_RNTI_Value_t
*
cs_RNTI
;
NR_MIB_t
*
mib
;
NR_BWP_Downlink_t
*
DLbwp
[
MAX_NUM_BWP
];
NR_BWP_Uplink_t
*
ULbwp
[
MAX_NUM_BWP
];
NR_ControlResourceSet_t
*
coreset
[
MAX_NUM_BWP
][
FAPI_NR_MAX_CORESET_PER_BWP
];
NR_SearchSpace_t
*
SSpace
[
MAX_NUM_BWP
][
FAPI_NR_MAX_CORESET_PER_BWP
][
FAPI_NR_MAX_SS_PER_CORESET
];
NR_BWP_Downlink_t
*
DLbwp
[
MAX_NUM_BWP
_UE
];
NR_BWP_Uplink_t
*
ULbwp
[
MAX_NUM_BWP
_UE
];
NR_ControlResourceSet_t
*
coreset
[
MAX_NUM_BWP
_UE
][
FAPI_NR_MAX_CORESET_PER_BWP
];
NR_SearchSpace_t
*
SSpace
[
MAX_NUM_BWP
_UE
][
FAPI_NR_MAX_CORESET_PER_BWP
][
FAPI_NR_MAX_SS_PER_CORESET
];
lte_frame_type_t
frame_type
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
View file @
8b1138c8
...
...
@@ -244,10 +244,10 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
RA_config_t
*
ra
=
&
mac
->
ra
;
int
ss_id
;
NR_BWP_Id_t
bwp_id
=
(
mac
->
cg
)
?
((
mac
->
DL_BWP_Id
==
0
)
?
1
:
mac
->
DL_BWP_Id
)
:
0
;
NR_BWP_Id_t
bwp_id
=
(
mac
->
cg
)
?
mac
->
DL_BWP_Id
:
0
;
uint8_t
coreset_id
=
(
mac
->
cg
)
?
1
:
0
;
//NR_ServingCellConfig_t *scd = mac->scg->spCellConfig->spCellConfigDedicated;
NR_BWP_Downlink_t
*
bwp
=
(
mac
->
cg
)
?
mac
->
DLbwp
[
bwp_id
-
1
]
:
NULL
;
NR_BWP_Downlink_t
*
bwp
=
(
mac
->
cg
)
?
(
(
bwp_id
)
?
mac
->
DLbwp
[
bwp_id
-
1
]
:
NULL
)
:
NULL
;
LOG_D
(
MAC
,
"[DCI_CONFIG] ra_rnti %p (%x) crnti %p (%x) t_crnti %p (%x)
\n
"
,
&
ra
->
ra_rnti
,
ra
->
ra_rnti
,
&
mac
->
crnti
,
mac
->
crnti
,
&
ra
->
t_crnti
,
ra
->
t_crnti
);
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
8b1138c8
This diff is collapsed.
Click to expand it.
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