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
spbro
OpenXG-RAN
Commits
03617b91
Commit
03617b91
authored
Mar 14, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more general SR config for period and offset
parent
a88a8dae
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
7 deletions
+53
-7
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+1
-1
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_config.c
+49
-4
openair2/RRC/NR/nr_rrc_config.h
openair2/RRC/NR/nr_rrc_config.h
+2
-1
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+1
-1
No files found.
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
03617b91
...
...
@@ -1184,7 +1184,7 @@ void fill_initial_SpCellConfig(int uid,
srs_res0
->
spatialRelationInfo
->
referenceSignal
.
choice
.
csi_RS_Index
=
0
;
ASN_SEQUENCE_ADD
(
&
srs_Config
->
srs_ResourceToAddModList
->
list
,
srs_res0
);
schedulingrequest_config
(
cellGroupConfig
->
mac_CellGroupConfig
,
pucch_Config
);
schedulingrequest_config
(
scc
,
cellGroupConfig
->
mac_CellGroupConfig
,
pucch_Config
);
set_dl_DataToUL_ACK
(
pucch_Config
,
carrier
->
minRXTXTIME
);
...
...
openair2/RRC/NR/nr_rrc_config.c
View file @
03617b91
...
...
@@ -286,7 +286,52 @@ void set_pucch_power_config(NR_PUCCH_Config_t *pucch_Config, int do_csirs) {
ASN_SEQUENCE_ADD
(
&
pucch_Config
->
spatialRelationInfoToAddModList
->
list
,
pucchspatial
);
}
void
schedulingrequest_config
(
NR_MAC_CellGroupConfig_t
*
mac_CellGroupConfig
,
void
set_SR_periodandoffset
(
NR_SchedulingRequestResourceConfig_t
*
schedulingRequestResourceConfig
,
NR_ServingCellConfigCommon_t
*
scc
)
{
const
NR_TDD_UL_DL_Pattern_t
*
tdd
=
scc
->
tdd_UL_DL_ConfigurationCommon
?
&
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
:
NULL
;
int
sr_slot
=
0
;
if
(
tdd
)
sr_slot
=
tdd
->
nrofDownlinkSlots
;
// SR in the first uplink slot
schedulingRequestResourceConfig
->
periodicityAndOffset
=
calloc
(
1
,
sizeof
(
*
schedulingRequestResourceConfig
->
periodicityAndOffset
));
if
(
sr_slot
<
10
){
schedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl10
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl10
=
sr_slot
;
return
;
}
if
(
sr_slot
<
20
){
schedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl20
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl20
=
sr_slot
;
return
;
}
if
(
sr_slot
<
40
){
schedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl40
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl40
=
sr_slot
;
return
;
}
if
(
sr_slot
<
80
){
schedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl80
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl80
=
sr_slot
;
return
;
}
if
(
sr_slot
<
160
){
schedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl160
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl160
=
sr_slot
;
return
;
}
if
(
sr_slot
<
320
){
schedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl320
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl320
=
sr_slot
;
return
;
}
schedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl640
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl640
=
sr_slot
;
}
void
schedulingrequest_config
(
NR_ServingCellConfigCommon_t
*
scc
,
NR_MAC_CellGroupConfig_t
*
mac_CellGroupConfig
,
NR_PUCCH_Config_t
*
pucch_Config
)
{
mac_CellGroupConfig
->
schedulingRequestConfig
=
calloc
(
1
,
sizeof
(
*
mac_CellGroupConfig
->
schedulingRequestConfig
));
...
...
@@ -306,9 +351,9 @@ void schedulingrequest_config(NR_MAC_CellGroupConfig_t *mac_CellGroupConfig,
NR_SchedulingRequestResourceConfig_t
*
schedulingRequestResourceConfig
=
calloc
(
1
,
sizeof
(
*
schedulingRequestResourceConfig
));
schedulingRequestResourceConfig
->
schedulingRequestResourceId
=
1
;
schedulingRequestResourceConfig
->
schedulingRequestID
=
0
;
schedulingRequestResourceConfig
->
periodicityAndOffset
=
calloc
(
1
,
sizeof
(
*
schedulingRequestResourceConfig
->
periodicityAndOffset
));
s
chedulingRequestResourceConfig
->
periodicityAndOffset
->
present
=
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl10
;
schedulingRequestResourceConfig
->
periodicityAndOffset
->
choice
.
sl10
=
7
;
s
et_SR_periodandoffset
(
schedulingRequestResourceConfig
,
scc
)
;
schedulingRequestResourceConfig
->
resource
=
calloc
(
1
,
sizeof
(
*
schedulingRequestResourceConfig
->
resource
));
*
schedulingRequestResourceConfig
->
resource
=
*
pucchressetid
;
ASN_SEQUENCE_ADD
(
&
pucch_Config
->
schedulingRequestResourceToAddModList
->
list
,
schedulingRequestResourceConfig
);
...
...
openair2/RRC/NR/nr_rrc_config.h
View file @
03617b91
...
...
@@ -117,7 +117,8 @@ void config_pucch_resset0(NR_PUCCH_Config_t *pucch_Config, int uid, int curr_bwp
void
config_pucch_resset1
(
NR_PUCCH_Config_t
*
pucch_Config
,
NR_UE_NR_Capability_t
*
uecap
);
void
set_dl_DataToUL_ACK
(
NR_PUCCH_Config_t
*
pucch_Config
,
int
min_feedback_time
);
void
set_pucch_power_config
(
NR_PUCCH_Config_t
*
pucch_Config
,
int
do_csirs
);
void
schedulingrequest_config
(
NR_MAC_CellGroupConfig_t
*
mac_CellGroupConfig
,
void
schedulingrequest_config
(
NR_ServingCellConfigCommon_t
*
scc
,
NR_MAC_CellGroupConfig_t
*
mac_CellGroupConfig
,
NR_PUCCH_Config_t
*
pucch_Config
);
void
set_dl_mcs_table
(
int
scs
,
NR_UE_NR_Capability_t
*
cap
,
NR_BWP_DownlinkDedicated_t
*
bwp_Dedicated
,
...
...
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
03617b91
...
...
@@ -859,7 +859,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
config_pucch_resset0
(
pucch_Config
,
uid
,
curr_bwp
,
uecap
);
// <= 2 bits
config_pucch_resset1
(
pucch_Config
,
uecap
);
// > 2 bits
schedulingrequest_config
(
secondaryCellGroup
->
mac_CellGroupConfig
,
pucch_Config
);
schedulingrequest_config
(
se
rvingcellconfigcommon
,
se
condaryCellGroup
->
mac_CellGroupConfig
,
pucch_Config
);
pucch_Config
->
schedulingRequestResourceToReleaseList
=
NULL
;
pucch_Config
->
multi_CSI_PUCCH_ResourceList
=
NULL
;
...
...
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