maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a unnotified conflict resolved

Browse Source
This commit is contained in:
Francesco Mani
2019-05-14 14:39:39 +02:00
parent a81eafd0ae
commit c254ce07a0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/config.c
+1 -2
View File
@@ -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];
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+3 -2
View File
@@ -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);