Commit c254ce07 authored by Francesco Mani's avatar Francesco Mani
Browse files

a unnotified conflict resolved

parent a81eafd0
...@@ -85,8 +85,7 @@ void config_common(int Mod_idP, ...@@ -85,8 +85,7 @@ void config_common(int Mod_idP,
uint64_t ssb_pattern, uint64_t ssb_pattern,
uint16_t ssb_periodicity, uint16_t ssb_periodicity,
uint64_t dl_CarrierFreqP, uint64_t dl_CarrierFreqP,
uint32_t dl_BandwidthP uint32_t dl_BandwidthP){
){
nfapi_nr_config_request_t *cfg = &RC.nrmac[Mod_idP]->config[CC_idP]; nfapi_nr_config_request_t *cfg = &RC.nrmac[Mod_idP]->config[CC_idP];
......
...@@ -38,9 +38,10 @@ void mac_top_init_gNB(void); ...@@ -38,9 +38,10 @@ void mac_top_init_gNB(void);
void config_common(int Mod_idP, void config_common(int Mod_idP,
int CC_idP, int CC_idP,
int Nid_cell, int Nid_cell,
int nr_bandP, int nr_bandP,
uint64_t ssb_pattern, uint64_t ssb_pattern,
uint16_t ssb_periodicity,
uint64_t dl_CarrierFreqP, uint64_t dl_CarrierFreqP,
uint32_t dl_BandwidthP); uint32_t dl_BandwidthP);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment