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
c9f737d3
Commit
c9f737d3
authored
2 years ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/NR_small_fixes_from_fujitsu_branch' into integration_2022_wk51
parents
ffb2d23b
98ca29b2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
11 deletions
+10
-11
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+1
-1
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+4
-5
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+2
-2
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+2
-2
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
+1
-1
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
View file @
c9f737d3
...
...
@@ -273,7 +273,7 @@ typedef struct {
// DCI pdu structures. Used by both gNB and UE.
typedef
struct
{
uint
16
_t
val
;
uint
32
_t
val
;
uint8_t
nbits
;
}
dci_field_t
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
c9f737d3
...
...
@@ -2476,7 +2476,7 @@ static inline uint8_t get_table_idx(uint8_t mcs_table, uint8_t dci_format, uint8
// Table 5.1.2.2.1-1 38.214
uint8_t
getRBGSize
(
uint16_t
bwp_size
,
long
rbg_size_config
)
{
AssertFatal
(
bwp_size
<
276
,
"
BWP Size > 275
\n
"
);
AssertFatal
(
bwp_size
<
276
,
"Invalid
BWP Size > 275
\n
"
);
if
(
bwp_size
<
37
)
return
(
rbg_size_config
?
4
:
2
);
if
(
bwp_size
<
73
)
return
(
rbg_size_config
?
8
:
4
);
...
...
@@ -2487,8 +2487,7 @@ uint8_t getRBGSize(uint16_t bwp_size, long rbg_size_config) {
uint8_t
getNRBG
(
uint16_t
bwp_size
,
uint16_t
bwp_start
,
long
rbg_size_config
)
{
uint8_t
rbg_size
=
getRBGSize
(
bwp_size
,
rbg_size_config
);
return
(
uint8_t
)
ceil
((
bwp_size
+
(
bwp_start
%
rbg_size
))
/
rbg_size
);
return
(
uint8_t
)
ceil
((
float
)(
bwp_size
+
(
bwp_start
%
rbg_size
))
/
(
float
)
rbg_size
);
}
uint8_t
getAntPortBitWidth
(
NR_SetupRelease_DMRS_DownlinkConfig_t
*
typeA
,
NR_SetupRelease_DMRS_DownlinkConfig_t
*
typeB
)
{
...
...
@@ -2770,7 +2769,7 @@ uint8_t compute_srs_resource_indicator(NR_PUSCH_ServingCellConfig_t *pusch_servi
NR_PUSCH_Config_t
*
pusch_Config
,
NR_SRS_Config_t
*
srs_config
,
nr_srs_feedback_t
*
srs_feedback
,
uint
16
_t
*
val
)
uint
32
_t
*
val
)
{
uint8_t
nbits
=
0
;
...
...
@@ -2892,7 +2891,7 @@ uint8_t compute_precoding_information(NR_PUSCH_Config_t *pusch_Config,
dci_field_t
srs_resource_indicator
,
nr_srs_feedback_t
*
srs_feedback
,
const
uint8_t
*
nrOfLayers
,
uint
16
_t
*
val
)
{
uint
32
_t
*
val
)
{
// It is only applicable to codebook based transmission. This field occupies 0 bits for non-codebook based
// transmission. It also occupies 0 bits for codebook based transmission using a single antenna port.
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
View file @
c9f737d3
...
...
@@ -66,14 +66,14 @@ uint8_t compute_srs_resource_indicator(NR_PUSCH_ServingCellConfig_t *pusch_servi
NR_PUSCH_Config_t
*
pusch_Config
,
NR_SRS_Config_t
*
srs_config
,
nr_srs_feedback_t
*
srs_feedback
,
uint
16
_t
*
val
);
uint
32
_t
*
val
);
uint8_t
compute_precoding_information
(
NR_PUSCH_Config_t
*
pusch_Config
,
NR_SRS_Config_t
*
srs_config
,
dci_field_t
srs_resource_indicator
,
nr_srs_feedback_t
*
srs_feedback
,
const
uint8_t
*
nrOfLayers
,
uint
16
_t
*
val
);
uint
32
_t
*
val
);
uint16_t
nr_dci_size
(
const
NR_BWP_DownlinkCommon_t
*
initialDLBWP
,
const
NR_BWP_UplinkCommon_t
*
initialULBWP
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
c9f737d3
...
...
@@ -432,7 +432,8 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
@returns void
*/
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint16_t
*
bwp_ind
,
uint8_t
*
dci_format
){
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint32_t
*
bwp_ind
,
uint8_t
*
dci_format
)
{
NR_ServingCellConfig_t
*
scd
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
;
...
...
@@ -471,7 +472,6 @@ void config_bwp_ue(NR_UE_MAC_INST_t *mac, uint16_t *bwp_ind, uint8_t *dci_format
}
LOG_D
(
MAC
,
"In %s setting DL_BWP_Id %ld UL_BWP_Id %ld
\n
"
,
__FUNCTION__
,
mac
->
DL_BWP_Id
,
mac
->
UL_BWP_Id
);
}
/** \brief This function is relavant for the UE procedures for control. It loads the search spaces, the BWPs and the CORESETs into the MAC instance and
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/mac_proto.h
View file @
c9f737d3
...
...
@@ -451,7 +451,7 @@ void fill_dci_search_candidates(NR_SearchSpace_t *ss,fapi_nr_dl_config_dci_dl_pd
void
build_ssb_to_ro_map
(
NR_UE_MAC_INST_t
*
mac
);
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint
16
_t
*
bwp_ind
,
uint8_t
*
dci_format
);
void
config_bwp_ue
(
NR_UE_MAC_INST_t
*
mac
,
uint
32
_t
*
bwp_ind
,
uint8_t
*
dci_format
);
void
configure_ss_coreset
(
NR_UE_MAC_INST_t
*
mac
,
NR_ServingCellConfig_t
*
scd
,
...
...
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