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
762eba23
Commit
762eba23
authored
May 30, 2022
by
Roberto Louro Magueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implementation of tables and get values to SRS resource indicator
parent
82ef4b3d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
87 additions
and
3 deletions
+87
-3
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+23
-0
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+51
-3
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+1
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+2
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+7
-0
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+1
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+1
-0
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
View file @
762eba23
...
...
@@ -512,5 +512,28 @@ typedef struct Type0_PDCCH_CSS_config_s {
bool
active
;
}
NR_Type0_PDCCH_CSS_config_t
;
typedef
enum
{
NR_SRS_SRI_0
=
0
,
NR_SRS_SRI_1
,
NR_SRS_SRI_2
,
NR_SRS_SRI_3
,
NR_SRS_SRI_0_1
,
NR_SRS_SRI_0_2
,
NR_SRS_SRI_0_3
,
NR_SRS_SRI_1_2
,
NR_SRS_SRI_1_3
,
NR_SRS_SRI_2_3
,
NR_SRS_SRI_0_1_2
,
NR_SRS_SRI_0_1_3
,
NR_SRS_SRI_0_2_3
,
NR_SRS_SRI_1_2_3
,
NR_SRS_SRI_0_1_2_3
}
nr_srs_sri_t
;
typedef
struct
nr_srs_feedback
{
uint8_t
sri
;
uint8_t
tpmi
;
}
nr_srs_feedback_t
;
#endif
/*__LAYER2_MAC_H__ */
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
762eba23
...
...
@@ -1956,6 +1956,32 @@ int32_t table_6_4_1_1_3_4_pusch_dmrs_positions_l [12][8] = {
{
0
,
3072
,
-
1
,
-
1
,
3
,
1539
,
-
1
,
-
1
},
//14 // (DMRS l' position)
};
// TS 38.212
uint16_t
table_7_3_1_1_2_28
[
3
][
15
]
=
{
{
0
,
1
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
3
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
};
uint16_t
table_7_3_1_1_2_29
[
3
][
15
]
=
{
{
0
,
1
,
0
,
0
,
2
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
0
,
3
,
4
,
0
,
5
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
0
,
0
,
0
,
0
,
0
},
};
uint16_t
table_7_3_1_1_2_30
[
3
][
15
]
=
{
{
0
,
1
,
0
,
0
,
2
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
0
,
3
,
4
,
0
,
5
,
0
,
0
,
6
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
,
12
,
13
,
0
},
};
uint16_t
table_7_3_1_1_2_31
[
3
][
15
]
=
{
{
0
,
1
,
0
,
0
,
2
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
0
,
3
,
4
,
0
,
5
,
0
,
0
,
6
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
,
12
,
13
,
14
},
};
uint16_t
table_7_3_1_1_2_32
[
3
][
15
]
=
{
{
0
,
1
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
1
,
2
,
3
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
};
void
get_delta_arfcn
(
int
i
,
uint32_t
nrarfcn
,
uint64_t
N_OFFs
){
...
...
@@ -2617,6 +2643,7 @@ uint8_t get_pusch_nb_antenna_ports(NR_PUSCH_Config_t *pusch_Config,
uint8_t
compute_srs_resource_indicator
(
NR_UplinkConfig_t
*
uplinkConfig
,
NR_PUSCH_Config_t
*
pusch_Config
,
NR_SRS_Config_t
*
srs_config
,
nr_srs_feedback_t
*
srs_feedback
,
uint16_t
*
val
)
{
uint8_t
nbits
=
0
;
...
...
@@ -2625,7 +2652,7 @@ uint8_t compute_srs_resource_indicator(NR_UplinkConfig_t *uplinkConfig,
// transmission, the SRI is used to select between SRS Resources belonging to different antenna panels
// (kind of directional antenna). There can be up to 2 SRS Resources (2 antenna panels). In the case of non-codebook
// based transmission, the SRI is used to select one or more SRS Resources from a set of N_SRS resources. The number
// of SRS Resources selected corresponds to the number of layers (rank) to be transmitted.
For now, we set SRI = 0.
// of SRS Resources selected corresponds to the number of layers (rank) to be transmitted.
if
(
val
)
{
*
val
=
0
;
}
...
...
@@ -2650,6 +2677,9 @@ uint8_t compute_srs_resource_indicator(NR_UplinkConfig_t *uplinkConfig,
}
if
(
count
>
0
)
{
nbits
=
ceil
(
log2
(
count
));
if
(
val
&&
srs_feedback
&&
nbits
>
0
)
{
*
val
=
table_7_3_1_1_2_32
[
count
-
2
][
srs_feedback
->
sri
];
}
}
#ifdef DEBUG_SRS_RESOURCE_IND
...
...
@@ -2697,6 +2727,24 @@ uint8_t compute_srs_resource_indicator(NR_UplinkConfig_t *uplinkConfig,
}
if
(
lsum
>
0
)
{
nbits
=
ceil
(
log2
(
lsum
));
if
(
val
&&
srs_feedback
&&
nbits
>
0
)
{
switch
(
Lmax
)
{
case
1
:
*
val
=
table_7_3_1_1_2_28
[
count
-
2
][
srs_feedback
->
sri
];
break
;
case
2
:
*
val
=
table_7_3_1_1_2_29
[
count
-
2
][
srs_feedback
->
sri
];
break
;
case
3
:
*
val
=
table_7_3_1_1_2_30
[
count
-
2
][
srs_feedback
->
sri
];
break
;
case
4
:
*
val
=
table_7_3_1_1_2_31
[
count
-
2
][
srs_feedback
->
sri
];
break
;
default:
LOG_E
(
NR_MAC
,
"%s (%d) - Invalid Lmax %d
\n
"
,
__FUNCTION__
,
__LINE__
,
Lmax
);
}
}
}
#ifdef DEBUG_SRS_RESOURCE_IND
...
...
@@ -2856,9 +2904,9 @@ uint16_t nr_dci_size(const NR_BWP_DownlinkCommon_t *initialDownlinkBWP,
size
+=
dci_pdu
->
dai
[
1
].
nbits
;
}
// SRS resource indicator
dci_pdu
->
srs_resource_indicator
.
nbits
=
compute_srs_resource_indicator
(
uplinkConfig
,
pusch_Config
,
srs_config
,
NULL
);
dci_pdu
->
srs_resource_indicator
.
nbits
=
compute_srs_resource_indicator
(
uplinkConfig
,
pusch_Config
,
srs_config
,
NULL
,
NULL
);
size
+=
dci_pdu
->
srs_resource_indicator
.
nbits
;
LOG_
W
(
NR_MAC
,
"dci_pdu->srs_resource_indicator.nbits %d
\n
"
,
dci_pdu
->
srs_resource_indicator
.
nbits
);
LOG_
D
(
NR_MAC
,
"dci_pdu->srs_resource_indicator.nbits %d
\n
"
,
dci_pdu
->
srs_resource_indicator
.
nbits
);
// Precoding info and number of layers
long
transformPrecoder
=
get_transformPrecoding
(
initialUplinkBWP
,
pusch_Config
,
ubwpd
,
(
uint8_t
*
)
&
format
,
rnti_type
,
0
);
uint8_t
pusch_antenna_ports
=
get_pusch_nb_antenna_ports
(
pusch_Config
,
srs_config
,
dci_pdu
->
srs_resource_indicator
);
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
View file @
762eba23
...
...
@@ -50,6 +50,7 @@ int is_nr_UL_slot(NR_TDD_UL_DL_ConfigCommon_t *tdd_UL_DL_ConfigurationCommon, sl
uint8_t
compute_srs_resource_indicator
(
NR_UplinkConfig_t
*
uplinkConfig
,
NR_PUSCH_Config_t
*
pusch_Config
,
NR_SRS_Config_t
*
srs_config
,
nr_srs_feedback_t
*
srs_feedback
,
uint16_t
*
val
);
uint16_t
nr_dci_size
(
const
NR_BWP_DownlinkCommon_t
*
initialDLBWP
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
762eba23
...
...
@@ -888,6 +888,7 @@ void nr_generate_Msg3_retransmission(module_id_t module_idP, int CC_id, frame_t
NULL
,
pusch_pdu
,
&
uldci_payload
,
NULL
,
NR_UL_DCI_FORMAT_0_0
,
ra
->
Msg3_tda_id
,
ra
->
msg3_TPC
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
762eba23
...
...
@@ -1033,6 +1033,7 @@ void config_uldci(const NR_SIB1_t *sib1,
const
NR_CellGroupConfig_t
*
cg
,
const
nfapi_nr_pusch_pdu_t
*
pusch_pdu
,
dci_pdu_rel15_t
*
dci_pdu_rel15
,
nr_srs_feedback_t
*
srs_feedback
,
int
dci_format
,
int
time_domain_assignment
,
uint8_t
tpc
,
...
...
@@ -1081,6 +1082,7 @@ void config_uldci(const NR_SIB1_t *sib1,
compute_srs_resource_indicator
(
uplinkConfig
,
ubwpd
->
pusch_Config
?
ubwpd
->
pusch_Config
->
choice
.
setup
:
NULL
,
ubwpd2
&&
ubwpd2
->
srs_Config
?
ubwpd
->
srs_Config
->
choice
.
setup
:
NULL
,
srs_feedback
,
&
dci_pdu_rel15
->
srs_resource_indicator
.
val
);
}
dci_pdu_rel15
->
precoding_information
.
val
=
0
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
762eba23
...
...
@@ -809,6 +809,12 @@ void handle_nr_srs_measurements(const module_id_t module_id,
}
LOG_D
(
NR_MAC
,
"ulprbbl[%3i] = 0x%x
\n
"
,
rb
,
ulprbbl
[
rb
]);
}
// TODO: This should be improved
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
NR_pusch_semi_static_t
*
ps
=
&
sched_ctrl
->
pusch_semi_static
;
ps
->
srs_feedback
.
sri
=
NR_SRS_SRI_0
;
ps
->
srs_feedback
.
tpmi
=
0
;
}
long
get_K2
(
NR_ServingCellConfigCommon_t
*
scc
,
...
...
@@ -1879,6 +1885,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
cg
,
pusch_pdu
,
&
uldci_payload
,
&
ps
->
srs_feedback
,
ps
->
dci_format
,
ps
->
time_domain_allocation
,
UE_info
->
UE_sched_ctrl
[
UE_id
].
tpc0
,
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
762eba23
...
...
@@ -198,6 +198,7 @@ void config_uldci(const NR_SIB1_t *sib1,
const
NR_CellGroupConfig_t
*
cg
,
const
nfapi_nr_pusch_pdu_t
*
pusch_pdu
,
dci_pdu_rel15_t
*
dci_pdu_rel15
,
nr_srs_feedback_t
*
srs_feedback
,
int
dci_format
,
int
time_domain_assignment
,
uint8_t
tpc
,
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
762eba23
...
...
@@ -348,6 +348,7 @@ typedef struct NR_pusch_semi_static_t {
int
dci_format
;
int
time_domain_allocation
;
uint8_t
nrOfLayers
;
nr_srs_feedback_t
srs_feedback
;
uint8_t
num_dmrs_cdm_grps_no_data
;
int
startSymbolIndex
;
...
...
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