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
wangjie
OpenXG-RAN
Commits
9202c583
Commit
9202c583
authored
3 years ago
by
Parminder Singh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spaces are corrected, tabs replaced with spaces
parent
222b37ff
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
35 deletions
+35
-35
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+6
-6
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+29
-29
No files found.
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
9202c583
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
View file @
9202c583
...
@@ -294,38 +294,38 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
...
@@ -294,38 +294,38 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
void
prepare_scd
(
NR_ServingCellConfig_t
*
scd
)
{
void
prepare_scd
(
NR_ServingCellConfig_t
*
scd
)
{
// Allocate downlink structures
// Allocate downlink structures
scd
->
downlinkBWP_ToAddModList
=
CALLOC
(
1
,
sizeof
(
scd
->
downlinkBWP_ToAddModList
));
scd
->
downlinkBWP_ToAddModList
=
CALLOC
(
1
,
sizeof
(
scd
->
downlinkBWP_ToAddModList
));
// Downlink bandwidth part
// Downlink bandwidth part
NR_BWP_Downlink_t
*
bwp
=
calloc
(
1
,
sizeof
(
*
bwp
));
NR_BWP_Downlink_t
*
bwp
=
calloc
(
1
,
sizeof
(
*
bwp
));
bwp
->
bwp_Id
=
1
;
bwp
->
bwp_Id
=
1
;
// Allocate downlink dedicated bandwidth part and PDSCH structures
// Allocate downlink dedicated bandwidth part and PDSCH structures
bwp
->
bwp_Dedicated
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
));
bwp
->
bwp_Dedicated
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
));
bwp
->
bwp_Dedicated
->
pdsch_Config
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
));
bwp
->
bwp_Dedicated
->
pdsch_Config
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
));
bwp
->
bwp_Dedicated
->
pdsch_Config
->
present
=
NR_SetupRelease_PDSCH_Config_PR_setup
;
bwp
->
bwp_Dedicated
->
pdsch_Config
->
present
=
NR_SetupRelease_PDSCH_Config_PR_setup
;
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
));
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
));
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
));
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
));
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
present
=
NR_SetupRelease_DMRS_DownlinkConfig_PR_setup
;
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
present
=
NR_SetupRelease_DMRS_DownlinkConfig_PR_setup
;
// Allocate DL DMRS and PTRS configuration
// Allocate DL DMRS and PTRS configuration
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
));
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
));
NR_DMRS_DownlinkConfig_t
*
NR_DMRS_DownlinkCfg
=
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
;
NR_DMRS_DownlinkConfig_t
*
NR_DMRS_DownlinkCfg
=
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
;
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
));
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
));
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
present
=
NR_SetupRelease_PTRS_DownlinkConfig_PR_setup
;
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
present
=
NR_SetupRelease_PTRS_DownlinkConfig_PR_setup
;
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
choice
.
setup
));
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
choice
.
setup
));
NR_PTRS_DownlinkConfig_t
*
NR_PTRS_DownlinkCfg
=
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
choice
.
setup
;
NR_PTRS_DownlinkConfig_t
*
NR_PTRS_DownlinkCfg
=
NR_DMRS_DownlinkCfg
->
phaseTrackingRS
->
choice
.
setup
;
NR_PTRS_DownlinkCfg
->
frequencyDensity
=
CALLOC
(
1
,
sizeof
(
NR_PTRS_DownlinkCfg
->
frequencyDensity
));
NR_PTRS_DownlinkCfg
->
frequencyDensity
=
CALLOC
(
1
,
sizeof
(
NR_PTRS_DownlinkCfg
->
frequencyDensity
));
int
*
dl_rbs
[
2
];
int
*
dl_rbs
[
2
];
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
dl_rbs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
dl_rbs
[
i
]));
dl_rbs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
dl_rbs
[
i
]));
*
dl_rbs
[
i
]
=
0
;
*
dl_rbs
[
i
]
=
0
;
ASN_SEQUENCE_ADD
(
&
NR_PTRS_DownlinkCfg
->
frequencyDensity
->
list
,
dl_rbs
[
i
]);
ASN_SEQUENCE_ADD
(
&
NR_PTRS_DownlinkCfg
->
frequencyDensity
->
list
,
dl_rbs
[
i
]);
}
}
NR_PTRS_DownlinkCfg
->
timeDensity
=
CALLOC
(
1
,
sizeof
(
NR_PTRS_DownlinkCfg
->
timeDensity
));
NR_PTRS_DownlinkCfg
->
timeDensity
=
CALLOC
(
1
,
sizeof
(
NR_PTRS_DownlinkCfg
->
timeDensity
));
int
*
dl_mcs
[
3
];
int
*
dl_mcs
[
3
];
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
dl_mcs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
dl_mcs
[
i
]));
dl_mcs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
dl_mcs
[
i
]));
*
dl_mcs
[
i
]
=
0
;
*
dl_mcs
[
i
]
=
0
;
ASN_SEQUENCE_ADD
(
&
NR_PTRS_DownlinkCfg
->
timeDensity
->
list
,
dl_mcs
[
i
]);
ASN_SEQUENCE_ADD
(
&
NR_PTRS_DownlinkCfg
->
timeDensity
->
list
,
dl_mcs
[
i
]);
}
}
...
@@ -337,31 +337,31 @@ void prepare_scd(NR_ServingCellConfig_t *scd) {
...
@@ -337,31 +337,31 @@ void prepare_scd(NR_ServingCellConfig_t *scd) {
// Allocate uplink structures
// Allocate uplink structures
scd
->
uplinkConfig
=
CALLOC
(
1
,
sizeof
(
NR_UplinkConfig_t
));
scd
->
uplinkConfig
=
CALLOC
(
1
,
sizeof
(
NR_UplinkConfig_t
));
scd
->
uplinkConfig
->
uplinkBWP_ToAddModList
=
CALLOC
(
1
,
sizeof
(
scd
->
uplinkConfig
->
uplinkBWP_ToAddModList
));
scd
->
uplinkConfig
->
uplinkBWP_ToAddModList
=
CALLOC
(
1
,
sizeof
(
scd
->
uplinkConfig
->
uplinkBWP_ToAddModList
));
NR_PUSCH_Config_t
*
pusch_Config
=
CALLOC
(
1
,
sizeof
(
*
pusch_Config
));
NR_PUSCH_Config_t
*
pusch_Config
=
CALLOC
(
1
,
sizeof
(
*
pusch_Config
));
// Allocate UL DMRS and PTRS structures
// Allocate UL DMRS and PTRS structures
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
=
CALLOC
(
1
,
sizeof
(
*
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
));
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
=
CALLOC
(
1
,
sizeof
(
*
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
));
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
present
=
NR_SetupRelease_DMRS_UplinkConfig_PR_setup
;
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
present
=
NR_SetupRelease_DMRS_UplinkConfig_PR_setup
;
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
*
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
));
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
*
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
));
NR_DMRS_UplinkConfig_t
*
NR_DMRS_UplinkConfig
=
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
;
NR_DMRS_UplinkConfig_t
*
NR_DMRS_UplinkConfig
=
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
;
NR_DMRS_UplinkConfig
->
phaseTrackingRS
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_UplinkConfig
->
phaseTrackingRS
));
NR_DMRS_UplinkConfig
->
phaseTrackingRS
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_UplinkConfig
->
phaseTrackingRS
));
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
present
=
NR_SetupRelease_PTRS_UplinkConfig_PR_setup
;
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
present
=
NR_SetupRelease_PTRS_UplinkConfig_PR_setup
;
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
choice
.
setup
));
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
*
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
choice
.
setup
));
NR_PTRS_UplinkConfig_t
*
NR_PTRS_UplinkConfig
=
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
choice
.
setup
;
NR_PTRS_UplinkConfig_t
*
NR_PTRS_UplinkConfig
=
NR_DMRS_UplinkConfig
->
phaseTrackingRS
->
choice
.
setup
;
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
=
CALLOC
(
1
,
sizeof
(
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
));
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
=
CALLOC
(
1
,
sizeof
(
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
));
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
frequencyDensity
=
CALLOC
(
1
,
sizeof
(
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
frequencyDensity
));
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
frequencyDensity
=
CALLOC
(
1
,
sizeof
(
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
frequencyDensity
));
int
*
n_rbs
[
2
];
int
*
n_rbs
[
2
];
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
n_rbs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
n_rbs
[
i
]));
n_rbs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
n_rbs
[
i
]));
*
n_rbs
[
i
]
=
0
;
*
n_rbs
[
i
]
=
0
;
ASN_SEQUENCE_ADD
(
&
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
frequencyDensity
->
list
,
n_rbs
[
i
]);
ASN_SEQUENCE_ADD
(
&
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
frequencyDensity
->
list
,
n_rbs
[
i
]);
}
}
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
timeDensity
=
CALLOC
(
1
,
sizeof
(
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
timeDensity
));
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
timeDensity
=
CALLOC
(
1
,
sizeof
(
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
timeDensity
));
int
*
ptrs_mcs
[
3
];
int
*
ptrs_mcs
[
3
];
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
ptrs_mcs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
ptrs_mcs
[
i
]));
ptrs_mcs
[
i
]
=
CALLOC
(
1
,
sizeof
(
*
ptrs_mcs
[
i
]));
*
ptrs_mcs
[
i
]
=
0
;
*
ptrs_mcs
[
i
]
=
0
;
ASN_SEQUENCE_ADD
(
&
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
timeDensity
->
list
,
ptrs_mcs
[
i
]);
ASN_SEQUENCE_ADD
(
&
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
timeDensity
->
list
,
ptrs_mcs
[
i
]);
}
}
...
@@ -369,11 +369,11 @@ void prepare_scd(NR_ServingCellConfig_t *scd) {
...
@@ -369,11 +369,11 @@ void prepare_scd(NR_ServingCellConfig_t *scd) {
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
resourceElementOffset
=
0
;
*
NR_PTRS_UplinkConfig
->
transformPrecoderDisabled
->
resourceElementOffset
=
0
;
// UL bandwidth part
// UL bandwidth part
NR_BWP_Uplink_t
*
ubwp
=
CALLOC
(
1
,
sizeof
(
*
ubwp
));
NR_BWP_Uplink_t
*
ubwp
=
CALLOC
(
1
,
sizeof
(
*
ubwp
));
ubwp
->
bwp_Id
=
1
;
ubwp
->
bwp_Id
=
1
;
ubwp
->
bwp_Dedicated
=
CALLOC
(
1
,
sizeof
(
*
ubwp
->
bwp_Dedicated
));
ubwp
->
bwp_Dedicated
=
CALLOC
(
1
,
sizeof
(
*
ubwp
->
bwp_Dedicated
));
ubwp
->
bwp_Dedicated
->
pusch_Config
=
CALLOC
(
1
,
sizeof
(
*
ubwp
->
bwp_Dedicated
->
pusch_Config
));
ubwp
->
bwp_Dedicated
->
pusch_Config
=
CALLOC
(
1
,
sizeof
(
*
ubwp
->
bwp_Dedicated
->
pusch_Config
));
ubwp
->
bwp_Dedicated
->
pusch_Config
->
present
=
NR_SetupRelease_PUSCH_Config_PR_setup
;
ubwp
->
bwp_Dedicated
->
pusch_Config
->
present
=
NR_SetupRelease_PUSCH_Config_PR_setup
;
ubwp
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
=
pusch_Config
;
ubwp
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
=
pusch_Config
;
...
...
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