Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
OpenXG
OpenXG UE
Commits
26d12ce8
Commit
26d12ce8
authored
Nov 15, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change name of minRXTXTIME
parent
462b2684
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+1
-1
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+2
-2
openair2/GNB_APP/gnb_paramdef.h
openair2/GNB_APP/gnb_paramdef.h
+4
-4
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+3
-3
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_defs.h
+1
-1
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+1
-1
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
26d12ce8
...
...
@@ -412,7 +412,7 @@ typedef struct NRRrcConfigurationReq_s {
int
sib1_tda
;
int
pdsch_AntennaPorts
;
int
pusch_AntennaPorts
;
int
minRXTXTIME
pdsch
;
int
minRXTXTIME
;
int
do_CSIRS
;
int
pusch_TargetSNRx10
;
int
pucch_TargetSNRx10
;
...
...
openair2/GNB_APP/gnb_config.c
View file @
26d12ce8
...
...
@@ -1107,8 +1107,8 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pdsch_AntennaPorts
=
*
GNBParamList
.
paramarray
[
i
][
GNB_PDSCH_ANTENNAPORTS_IDX
].
iptr
;
printf
(
"pusch_AntennaPorts %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_PUSCH_ANTENNAPORTS_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
pusch_AntennaPorts
=
*
GNBParamList
.
paramarray
[
i
][
GNB_PUSCH_ANTENNAPORTS_IDX
].
iptr
;
printf
(
"minTXRXTIMEpdsch %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_MINRXTXTIME
PDSCH
_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
minRXTXTIME
pdsch
=
*
GNBParamList
.
paramarray
[
i
][
GNB_MINRXTXTIMEPDSCH
_IDX
].
iptr
;
printf
(
"minTXRXTIMEpdsch %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_MINRXTXTIME_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
minRXTXTIME
=
*
GNBParamList
.
paramarray
[
i
][
GNB_MINRXTXTIME
_IDX
].
iptr
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
sib1_tda
=
*
GNBParamList
.
paramarray
[
i
][
GNB_SIB1_TDA_IDX
].
iptr
;
printf
(
"Do CSI-RS %d
\n
"
,
*
GNBParamList
.
paramarray
[
i
][
GNB_DO_CSIRS_IDX
].
iptr
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
do_CSIRS
=
*
GNBParamList
.
paramarray
[
i
][
GNB_DO_CSIRS_IDX
].
iptr
;
...
...
openair2/GNB_APP/gnb_paramdef.h
View file @
26d12ce8
...
...
@@ -119,7 +119,7 @@ typedef enum {
#define GNB_CONFIG_STRING_SIB1TDA "sib1_tda"
#define GNB_CONFIG_STRING_DOCSIRS "do_CSIRS"
#define GNB_CONFIG_STRING_NRCELLID "nr_cellid"
#define GNB_CONFIG_STRING_MINRXTXTIME
PDSCH "min_rxtxtime_pdsch
"
#define GNB_CONFIG_STRING_MINRXTXTIME
"min_rxtxtime
"
#define GNB_CONFIG_STRING_ULPRBBLACKLIST "ul_prbblacklist"
...
...
@@ -148,8 +148,8 @@ typedef enum {
{GNB_CONFIG_STRING_SIB1TDA, NULL, 0, iptr:NULL, defintval:0, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_DOCSIRS, NULL, 0, iptr:NULL, defintval:0, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_NRCELLID, NULL, 0, u64ptr:NULL, defint64val:1, TYPE_UINT64, 0}, \
{GNB_CONFIG_STRING_MINRXTXTIME
PDSCH,
NULL, 0, iptr:NULL, defintval:2, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_ULPRBBLACKLIST, NULL, 0, strptr:NULL, defstrval:"",
TYPE_STRING, 0} \
{GNB_CONFIG_STRING_MINRXTXTIME
,
NULL, 0, iptr:NULL, defintval:2, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_ULPRBBLACKLIST, NULL, 0, strptr:NULL, defstrval:"", TYPE_STRING, 0} \
}
#define GNB_GNB_ID_IDX 0
...
...
@@ -172,7 +172,7 @@ typedef enum {
#define GNB_SIB1_TDA_IDX 17
#define GNB_DO_CSIRS_IDX 18
#define GNB_NRCELLID_IDX 19
#define GNB_MINRXTXTIME
PDSCH_IDX
20
#define GNB_MINRXTXTIME
_IDX
20
#define GNB_ULPRBBLACKLIST_IDX 21
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
26d12ce8
...
...
@@ -1181,9 +1181,9 @@ void fill_initial_SpCellConfig(rnti_t rnti,
long
*
delay
[
8
];
for
(
int
i
=
0
;
i
<
8
;
i
++
)
{
delay
[
i
]
=
calloc
(
1
,
sizeof
(
*
delay
[
i
]));
AssertFatal
(
carrier
->
minRXTXTIME
pdsch
>=
2
&&
carrier
->
minRXTXTIMEpdsch
<
7
,
"check minRXTXTIME
pdsch %d
\n
"
,
carrier
->
minRXTXTIMEpdsch
);
*
delay
[
i
]
=
(
i
+
carrier
->
minRXTXTIME
pdsch
);
AssertFatal
(
carrier
->
minRXTXTIME
>=
2
&&
carrier
->
minRXTXTIME
<
7
,
"check minRXTXTIME
%d
\n
"
,
carrier
->
minRXTXTIME
);
*
delay
[
i
]
=
(
i
+
carrier
->
minRXTXTIME
);
ASN_SEQUENCE_ADD
(
&
pucch_Config
->
dl_DataToUL_ACK
->
list
,
delay
[
i
]);
}
...
...
openair2/RRC/NR/nr_rrc_defs.h
View file @
26d12ce8
...
...
@@ -447,7 +447,7 @@ typedef struct {
int
sib1_tda
;
int
pdsch_AntennaPorts
;
int
pusch_AntennaPorts
;
int
minRXTXTIME
pdsch
;
int
minRXTXTIME
;
int
do_CSIRS
;
NR_BCCH_DL_SCH_Message_t
*
siblock1
;
NR_ServingCellConfigCommon_t
*
servingcellconfigcommon
;
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
26d12ce8
...
...
@@ -256,7 +256,7 @@ char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigu
rrc
->
carrier
.
ssb_SubcarrierOffset
=
configuration
->
ssb_SubcarrierOffset
;
rrc
->
carrier
.
pdsch_AntennaPorts
=
configuration
->
pdsch_AntennaPorts
;
rrc
->
carrier
.
pusch_AntennaPorts
=
configuration
->
pusch_AntennaPorts
;
rrc
->
carrier
.
minRXTXTIME
pdsch
=
configuration
->
minRXTXTIMEpdsch
;
rrc
->
carrier
.
minRXTXTIME
=
configuration
->
minRXTXTIME
;
rrc
->
carrier
.
sib1_tda
=
configuration
->
sib1_tda
;
rrc
->
carrier
.
do_CSIRS
=
configuration
->
do_CSIRS
;
/// System Information INIT
...
...
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