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
canghaiwuhen
OpenXG-RAN
Commits
cb399c88
Commit
cb399c88
authored
5 years ago
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added coreset and search configuration MAC from CellGroupConfig.
parent
0b4da471
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
364 additions
and
97 deletions
+364
-97
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+6
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+10
-13
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+299
-4
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_gNB/main.c
+37
-67
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+6
-5
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+4
-4
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
cb399c88
...
@@ -237,16 +237,20 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -237,16 +237,20 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
if
(
secondaryCellGroup
)
{
if
(
secondaryCellGroup
)
{
NR_UE_list_t
*
UE_list
=
&
RC
.
nrmac
[
Mod_idP
]
->
UE_list
;
NR_UE_list_t
*
UE_list
=
&
RC
.
nrmac
[
Mod_idP
]
->
UE_list
;
int
UE_id
;
if
(
add_ue
==
1
)
{
if
(
add_ue
==
1
)
{
int
UE_id
=
add_new_nr_ue
(
Mod_idP
,
rnti
);
UE_id
=
add_new_nr_ue
(
Mod_idP
,
rnti
);
UE_list
->
secondaryCellGroup
[
UE_id
]
=
secondaryCellGroup
;
UE_list
->
secondaryCellGroup
[
UE_id
]
=
secondaryCellGroup
;
LOG_I
(
PHY
,
"Added new UE_id %d/%x with initial secondaryCellGroup
\n
"
,
UE_id
,
rnti
);
LOG_I
(
PHY
,
"Added new UE_id %d/%x with initial secondaryCellGroup
\n
"
,
UE_id
,
rnti
);
}
}
else
{
// secondaryCellGroup has been updated
else
{
// secondaryCellGroup has been updated
int
UE_id
=
find_nr_UE_id
(
Mod_idP
,
rnti
);
UE_id
=
find_nr_UE_id
(
Mod_idP
,
rnti
);
UE_list
->
secondaryCellGroup
[
UE_id
]
=
secondaryCellGroup
;
UE_list
->
secondaryCellGroup
[
UE_id
]
=
secondaryCellGroup
;
LOG_I
(
PHY
,
"Modified UE_id %d/%x with secondaryCellGroup
\n
"
,
UE_id
,
rnti
);
LOG_I
(
PHY
,
"Modified UE_id %d/%x with secondaryCellGroup
\n
"
,
UE_id
,
rnti
);
}
}
fill_nfapi_coresets_and_searchspaces
(
secondaryCellGroup
,
UE_list
->
coreset
[
UE_id
],
UE_list
->
search_space
[
UE_id
]);
}
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
cb399c88
...
@@ -337,21 +337,18 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
...
@@ -337,21 +337,18 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
if
(
UE_list
->
active
[
i
])
{
if
(
UE_list
->
active
[
i
])
{
nfapi_nr_config_request_t
*
cfg
=
&
RC
.
nrmac
[
module_idP
]
->
config
[
CC_id
];
nfapi_nr_config_request_t
*
cfg
=
&
RC
.
nrmac
[
module_idP
]
->
config
[
CC_id
];
nfapi_nr_coreset_t
coreset
=
RC
.
nrmac
[
module_idP
]
->
coreset
[
CC_id
][
1
];
if
(
nr_is_dci_opportunity
(
UE_list
->
search_space
[
i
][
1
],
nfapi_nr_search_space_t
search_space
=
RC
.
nrmac
[
module_idP
]
->
search_space
[
CC_id
][
1
];
UE_list
->
coreset
[
i
][
1
],
frameP
,
if
(
nr_is_dci_opportunity
(
search_space
,
slotP
,
coreset
,
*
cfg
))
frameP
,
nr_schedule_uss_dlsch_phytest
(
module_idP
,
frameP
,
slotP
);
slotP
,
*
cfg
))
nr_schedule_uss_dlsch_phytest
(
module_idP
,
frameP
,
slotP
);
rnti
=
0
;
//UE_RNTI(module_idP, i);
rnti
=
0
;
//UE_RNTI(module_idP, i);
CC_id
=
0
;
//UE_PCCID(module_idP, i);
CC_id
=
0
;
//UE_PCCID(module_idP, i);
}
//END if (UE_list->active[i])
}
//END if (UE_list->active[i])
}
//END for (i = 0; i < MAX_MOBILES_PER_GNB; i++)
}
//END for (i = 0; i < MAX_MOBILES_PER_GNB; i++)
...
@@ -372,7 +369,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
...
@@ -372,7 +369,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
nr_schedule_css_dlsch_phytest(module_idP, frameP, slotP);*/
nr_schedule_css_dlsch_phytest(module_idP, frameP, slotP);*/
if
(
slotP
==
1
)
if
(
slotP
==
1
)
nr_schedule_uss_dlsch_phytest
(
module_idP
,
frameP
,
slotP
);
nr_schedule_uss_dlsch_phytest
(
module_idP
,
frameP
,
slotP
);
/*
/*
// Allocate CCEs for good after scheduling is done
// Allocate CCEs for good after scheduling is done
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @
cb399c88
...
@@ -208,8 +208,8 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
...
@@ -208,8 +208,8 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
LOG_D
(
MAC
,
"Scheduling UE specific search space DCI type 1 for CC_id %d
\n
"
,
CC_id
);
LOG_D
(
MAC
,
"Scheduling UE specific search space DCI type 1 for CC_id %d
\n
"
,
CC_id
);
nfapi_nr_coreset_t
*
coreset
=
&
nr_mac
->
coreset
[
CC_id
][
1
];
nfapi_nr_coreset_t
*
coreset
=
&
nr_mac
->
UE_list
.
coreset
[
0
][
1
];
nfapi_nr_search_space_t
*
search_space
=
&
nr_mac
->
search_space
[
CC_id
][
1
];
nfapi_nr_search_space_t
*
search_space
=
&
nr_mac
->
UE_list
.
search_space
[
0
][
1
];
dl_req
=
&
nr_mac
->
DL_req
[
CC_id
].
dl_config_request_body
;
dl_req
=
&
nr_mac
->
DL_req
[
CC_id
].
dl_config_request_body
;
dl_config_dci_pdu
=
&
dl_req
->
dl_config_pdu_list
[
dl_req
->
number_pdu
];
dl_config_dci_pdu
=
&
dl_req
->
dl_config_pdu_list
[
dl_req
->
number_pdu
];
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
cb399c88
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/main.c
View file @
cb399c88
...
@@ -44,34 +44,6 @@
...
@@ -44,34 +44,6 @@
extern
RAN_CONTEXT_t
RC
;
extern
RAN_CONTEXT_t
RC
;
void
nr_init_coreset
(
nfapi_nr_coreset_t
*
coreset
)
{
coreset
->
coreset_id
=
1
;
coreset
->
frequency_domain_resources
=
0x1E0000000000
;
//0x1FFFE0000000; // 96 RB starting from CRB0
coreset
->
duration
=
2
;
coreset
->
cce_reg_mapping_type
=
NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED
;
coreset
->
reg_bundle_size
=
6
;
coreset
->
interleaver_size
=
2
;
coreset
->
precoder_granularity
=
NFAPI_NR_CSET_SAME_AS_REG_BUNDLE
;
coreset
->
tci_present_in_dci
=
0
;
coreset
->
dmrs_scrambling_id
=
0
;
}
void
nr_init_search_space
(
nfapi_nr_search_space_t
*
search_space
)
{
search_space
->
search_space_id
=
1
;
search_space
->
coreset_id
=
1
;
search_space
->
search_space_type
=
NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC
;
search_space
->
duration
=
5
;
search_space
->
slot_monitoring_periodicity
=
NFAPI_NR_SS_PERIODICITY_SL10
;
search_space
->
slot_monitoring_offset
=
1
;
search_space
->
monitoring_symbols_in_slot
=
0xC0000000
;
// first 2 ofdm symbols
search_space
->
css_formats_0_0_and_1_0
=
1
;
search_space
->
uss_dci_formats
=
0
;
// enum to be defined-- formats 0.0 and 1.0
for
(
int
i
=
0
;
i
<
NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS
;
i
++
)
search_space
->
number_of_candidates
[
i
]
=
4
;
// TODO
}
void
mac_top_init_gNB
(
void
)
void
mac_top_init_gNB
(
void
)
{
{
module_id_t
i
,
j
;
module_id_t
i
,
j
;
...
@@ -84,73 +56,71 @@ void mac_top_init_gNB(void)
...
@@ -84,73 +56,71 @@ void mac_top_init_gNB(void)
if
(
RC
.
nb_nr_macrlc_inst
>
0
)
{
if
(
RC
.
nb_nr_macrlc_inst
>
0
)
{
RC
.
nrmac
=
(
gNB_MAC_INST
**
)
malloc16
(
RC
.
nb_nr_macrlc_inst
*
sizeof
(
gNB_MAC_INST
*
));
RC
.
nrmac
=
(
gNB_MAC_INST
**
)
malloc16
(
RC
.
nb_nr_macrlc_inst
*
sizeof
(
gNB_MAC_INST
*
));
AssertFatal
(
RC
.
nrmac
!=
NULL
,
"can't ALLOCATE %zu Bytes for %d gNB_MAC_INST with size %zu
\n
"
,
AssertFatal
(
RC
.
nrmac
!=
NULL
,
"can't ALLOCATE %zu Bytes for %d gNB_MAC_INST with size %zu
\n
"
,
RC
.
nb_nr_macrlc_inst
*
sizeof
(
gNB_MAC_INST
*
),
RC
.
nb_nr_macrlc_inst
*
sizeof
(
gNB_MAC_INST
*
),
RC
.
nb_nr_macrlc_inst
,
sizeof
(
gNB_MAC_INST
));
RC
.
nb_nr_macrlc_inst
,
sizeof
(
gNB_MAC_INST
));
for
(
i
=
0
;
i
<
RC
.
nb_nr_macrlc_inst
;
i
++
)
{
for
(
i
=
0
;
i
<
RC
.
nb_nr_macrlc_inst
;
i
++
)
{
RC
.
nrmac
[
i
]
=
(
gNB_MAC_INST
*
)
malloc16
(
sizeof
(
gNB_MAC_INST
));
RC
.
nrmac
[
i
]
=
(
gNB_MAC_INST
*
)
malloc16
(
sizeof
(
gNB_MAC_INST
));
AssertFatal
(
RC
.
nrmac
!=
NULL
,
"can't ALLOCATE %zu Bytes for %d gNB_MAC_INST with size %zu
\n
"
,
AssertFatal
(
RC
.
nrmac
!=
NULL
,
"can't ALLOCATE %zu Bytes for %d gNB_MAC_INST with size %zu
\n
"
,
RC
.
nb_nr_macrlc_inst
*
sizeof
(
gNB_MAC_INST
*
),
RC
.
nb_nr_macrlc_inst
*
sizeof
(
gNB_MAC_INST
*
),
RC
.
nb_nr_macrlc_inst
,
sizeof
(
gNB_MAC_INST
));
RC
.
nb_nr_macrlc_inst
,
sizeof
(
gNB_MAC_INST
));
LOG_D
(
MAC
,
"[MAIN] ALLOCATE %zu Bytes for %d gNB_MAC_INST @ %p
\n
"
,
sizeof
(
gNB_MAC_INST
),
RC
.
nb_nr_macrlc_inst
,
RC
.
mac
);
LOG_D
(
MAC
,
"[MAIN] ALLOCATE %zu Bytes for %d gNB_MAC_INST @ %p
\n
"
,
sizeof
(
gNB_MAC_INST
),
RC
.
nb_nr_macrlc_inst
,
RC
.
mac
);
bzero
(
RC
.
nrmac
[
i
],
sizeof
(
gNB_MAC_INST
));
bzero
(
RC
.
nrmac
[
i
],
sizeof
(
gNB_MAC_INST
));
RC
.
nrmac
[
i
]
->
Mod_id
=
i
;
RC
.
nrmac
[
i
]
->
Mod_id
=
i
;
for
(
j
=
0
;
j
<
MAX_NUM_CCs
;
j
++
)
{
for
(
j
=
0
;
j
<
MAX_NUM_CCs
;
j
++
)
{
RC
.
nrmac
[
i
]
->
DL_req
[
j
].
dl_config_request_body
.
dl_config_pdu_list
=
RC
.
nrmac
[
i
]
->
dl_config_pdu_list
[
j
];
RC
.
nrmac
[
i
]
->
DL_req
[
j
].
dl_config_request_body
.
dl_config_pdu_list
=
RC
.
nrmac
[
i
]
->
dl_config_pdu_list
[
j
];
RC
.
nrmac
[
i
]
->
UL_req
[
j
].
ul_config_request_body
.
ul_config_pdu_list
=
RC
.
nrmac
[
i
]
->
ul_config_pdu_list
[
j
];
RC
.
nrmac
[
i
]
->
UL_req
[
j
].
ul_config_request_body
.
ul_config_pdu_list
=
RC
.
nrmac
[
i
]
->
ul_config_pdu_list
[
j
];
for
(
int
k
=
0
;
k
<
10
;
k
++
)
RC
.
nrmac
[
i
]
->
UL_req_tmp
[
j
][
k
].
ul_config_request_body
.
ul_config_pdu_list
=
RC
.
nrmac
[
i
]
->
ul_config_pdu_list_tmp
[
j
][
k
];
for
(
int
k
=
0
;
k
<
10
;
k
++
)
RC
.
nrmac
[
i
]
->
UL_req_tmp
[
j
][
k
].
ul_config_request_body
.
ul_config_pdu_list
=
RC
.
nrmac
[
i
]
->
ul_config_pdu_list_tmp
[
j
][
k
];
RC
.
nrmac
[
i
]
->
HI_DCI0_req
[
j
].
hi_dci0_request_body
.
hi_dci0_pdu_list
=
RC
.
nrmac
[
i
]
->
hi_dci0_pdu_list
[
j
];
RC
.
nrmac
[
i
]
->
HI_DCI0_req
[
j
].
hi_dci0_request_body
.
hi_dci0_pdu_list
=
RC
.
nrmac
[
i
]
->
hi_dci0_pdu_list
[
j
];
RC
.
nrmac
[
i
]
->
TX_req
[
j
].
tx_request_body
.
tx_pdu_list
=
RC
.
nrmac
[
i
]
->
tx_request_pdu
[
j
];
RC
.
nrmac
[
i
]
->
TX_req
[
j
].
tx_request_body
.
tx_pdu_list
=
RC
.
nrmac
[
i
]
->
tx_request_pdu
[
j
];
RC
.
nrmac
[
i
]
->
ul_handle
=
0
;
RC
.
nrmac
[
i
]
->
ul_handle
=
0
;
// Init PDCCH structures
}
nr_init_coreset
(
&
RC
.
nrmac
[
i
]
->
coreset
[
j
][
1
]);
nr_init_search_space
(
&
RC
.
nrmac
[
i
]
->
search_space
[
j
][
1
]);
}
}
//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
}
//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
AssertFatal
(
rlc_module_init
()
==
0
,
"Could not initialize RLC layer
\n
"
);
AssertFatal
(
rlc_module_init
()
==
0
,
"Could not initialize RLC layer
\n
"
);
// These should be out of here later
// These should be out of here later
pdcp_layer_init
();
pdcp_layer_init
();
rrc_init_nr_global_param
();
rrc_init_nr_global_param
();
}
else
{
}
else
{
RC
.
nrmac
=
NULL
;
RC
.
nrmac
=
NULL
;
}
}
// Initialize Linked-List for Active UEs
// Initialize Linked-List for Active UEs
for
(
i
=
0
;
i
<
RC
.
nb_nr_macrlc_inst
;
i
++
)
{
for
(
i
=
0
;
i
<
RC
.
nb_nr_macrlc_inst
;
i
++
)
{
nrmac
=
RC
.
nrmac
[
i
];
nrmac
=
RC
.
nrmac
[
i
];
nrmac
->
if_inst
=
NR_IF_Module_init
(
i
);
nrmac
->
if_inst
=
NR_IF_Module_init
(
i
);
UE_list
=
&
nrmac
->
UE_list
;
UE_list
=
&
nrmac
->
UE_list
;
UE_list
->
num_UEs
=
0
;
UE_list
->
num_UEs
=
0
;
UE_list
->
head
=
-
1
;
UE_list
->
head
=
-
1
;
UE_list
->
head_ul
=
-
1
;
UE_list
->
head_ul
=
-
1
;
UE_list
->
avail
=
0
;
UE_list
->
avail
=
0
;
for
(
list_el
=
0
;
list_el
<
MAX_MOBILES_PER_ENB
-
1
;
list_el
++
)
{
for
(
list_el
=
0
;
list_el
<
MAX_MOBILES_PER_ENB
-
1
;
list_el
++
)
{
UE_list
->
next
[
list_el
]
=
list_el
+
1
;
UE_list
->
next
[
list_el
]
=
list_el
+
1
;
UE_list
->
next_ul
[
list_el
]
=
list_el
+
1
;
UE_list
->
next_ul
[
list_el
]
=
list_el
+
1
;
UE_list
->
active
[
list_el
]
=
FALSE
;
UE_list
->
active
[
list_el
]
=
FALSE
;
}
}
UE_list
->
next
[
list_el
]
=
-
1
;
UE_list
->
next
[
list_el
]
=
-
1
;
UE_list
->
next_ul
[
list_el
]
=
-
1
;
UE_list
->
next_ul
[
list_el
]
=
-
1
;
UE_list
->
active
[
list_el
]
=
FALSE
;
UE_list
->
active
[
list_el
]
=
FALSE
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
cb399c88
...
@@ -115,6 +115,12 @@ typedef struct {
...
@@ -115,6 +115,12 @@ typedef struct {
boolean_t
active
[
MAX_MOBILES_PER_GNB
];
boolean_t
active
[
MAX_MOBILES_PER_GNB
];
rnti_t
rnti
[
MAX_MOBILES_PER_GNB
];
rnti_t
rnti
[
MAX_MOBILES_PER_GNB
];
NR_CellGroupConfig_t
*
secondaryCellGroup
[
MAX_MOBILES_PER_GNB
];
NR_CellGroupConfig_t
*
secondaryCellGroup
[
MAX_MOBILES_PER_GNB
];
/// NFAPI coreset structure
nfapi_nr_coreset_t
coreset
[
MAX_MOBILES_PER_GNB
][
NFAPI_NR_MAX_NB_CORESETS
];
/// NFAPI search space structure
nfapi_nr_search_space_t
search_space
[
MAX_MOBILES_PER_GNB
][
NFAPI_NR_MAX_NB_SEARCH_SPACES
];
}
NR_UE_list_t
;
}
NR_UE_list_t
;
/*! \brief top level eNB MAC structure */
/*! \brief top level eNB MAC structure */
...
@@ -158,11 +164,6 @@ typedef struct gNB_MAC_INST_s {
...
@@ -158,11 +164,6 @@ typedef struct gNB_MAC_INST_s {
nfapi_tx_request_pdu_t
tx_request_pdu
[
NFAPI_CC_MAX
][
MAX_NUM_TX_REQUEST_PDU
];
nfapi_tx_request_pdu_t
tx_request_pdu
[
NFAPI_CC_MAX
][
MAX_NUM_TX_REQUEST_PDU
];
/// NFAPI DL PDU structure
/// NFAPI DL PDU structure
nfapi_tx_request_t
TX_req
[
NFAPI_CC_MAX
];
nfapi_tx_request_t
TX_req
[
NFAPI_CC_MAX
];
/// NFAPI coreset structure
nfapi_nr_coreset_t
coreset
[
NFAPI_CC_MAX
][
NFAPI_NR_MAX_NB_CORESETS
];
/// NFAPI search space structure
nfapi_nr_search_space_t
search_space
[
NFAPI_CC_MAX
][
NFAPI_NR_MAX_NB_SEARCH_SPACES
];
NR_UE_list_t
UE_list
;
NR_UE_list_t
UE_list
;
/// UL handle
/// UL handle
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
cb399c88
...
@@ -513,8 +513,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -513,8 +513,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
ss3
->
monitoringSymbolsWithinSlot
->
buf
=
calloc
(
1
,
2
);
ss3
->
monitoringSymbolsWithinSlot
->
buf
=
calloc
(
1
,
2
);
ss3
->
monitoringSymbolsWithinSlot
->
size
=
2
;
ss3
->
monitoringSymbolsWithinSlot
->
size
=
2
;
ss3
->
monitoringSymbolsWithinSlot
->
bits_unused
=
2
;
ss3
->
monitoringSymbolsWithinSlot
->
bits_unused
=
2
;
ss3
->
monitoringSymbolsWithinSlot
->
buf
[
0
]
=
0x
3
;
ss3
->
monitoringSymbolsWithinSlot
->
buf
[
0
]
=
0x
c0
;
ss3
->
monitoringSymbolsWithinSlot
->
buf
[
0
]
=
0x0
;
ss3
->
monitoringSymbolsWithinSlot
->
buf
[
1
]
=
0x0
;
ss3
->
nrofCandidates
=
calloc
(
1
,
sizeof
(
*
ss3
->
nrofCandidates
));
ss3
->
nrofCandidates
=
calloc
(
1
,
sizeof
(
*
ss3
->
nrofCandidates
));
ss3
->
nrofCandidates
->
aggregationLevel1
=
NR_SearchSpace__nrofCandidates__aggregationLevel1_n0
;
ss3
->
nrofCandidates
->
aggregationLevel1
=
NR_SearchSpace__nrofCandidates__aggregationLevel1_n0
;
ss3
->
nrofCandidates
->
aggregationLevel2
=
NR_SearchSpace__nrofCandidates__aggregationLevel2_n0
;
ss3
->
nrofCandidates
->
aggregationLevel2
=
NR_SearchSpace__nrofCandidates__aggregationLevel2_n0
;
...
@@ -540,8 +540,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -540,8 +540,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
ss2
->
monitoringSymbolsWithinSlot
->
buf
=
calloc
(
1
,
2
);
ss2
->
monitoringSymbolsWithinSlot
->
buf
=
calloc
(
1
,
2
);
ss2
->
monitoringSymbolsWithinSlot
->
size
=
2
;
ss2
->
monitoringSymbolsWithinSlot
->
size
=
2
;
ss2
->
monitoringSymbolsWithinSlot
->
bits_unused
=
2
;
ss2
->
monitoringSymbolsWithinSlot
->
bits_unused
=
2
;
ss2
->
monitoringSymbolsWithinSlot
->
buf
[
0
]
=
0x
3
;
ss2
->
monitoringSymbolsWithinSlot
->
buf
[
0
]
=
0x
c0
;
ss2
->
monitoringSymbolsWithinSlot
->
buf
[
0
]
=
0x0
;
ss2
->
monitoringSymbolsWithinSlot
->
buf
[
1
]
=
0x0
;
ss2
->
nrofCandidates
=
calloc
(
1
,
sizeof
(
*
ss2
->
nrofCandidates
));
ss2
->
nrofCandidates
=
calloc
(
1
,
sizeof
(
*
ss2
->
nrofCandidates
));
ss2
->
nrofCandidates
->
aggregationLevel1
=
NR_SearchSpace__nrofCandidates__aggregationLevel1_n0
;
ss2
->
nrofCandidates
->
aggregationLevel1
=
NR_SearchSpace__nrofCandidates__aggregationLevel1_n0
;
ss2
->
nrofCandidates
->
aggregationLevel2
=
NR_SearchSpace__nrofCandidates__aggregationLevel2_n0
;
ss2
->
nrofCandidates
->
aggregationLevel2
=
NR_SearchSpace__nrofCandidates__aggregationLevel2_n0
;
...
...
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