Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts: common/config/config_userapi.h openair2/ENB_APP/enb_config.c targets/RT/USER/lte-softmodem.c
No related branches found
No related tags found
Showing
- common/config/config_cmdline.c 37 additions, 23 deletionscommon/config/config_cmdline.c
- common/config/config_load_configmodule.c 1 addition, 2 deletionscommon/config/config_load_configmodule.c
- common/config/config_load_configmodule.h 1 addition, 2 deletionscommon/config/config_load_configmodule.h
- common/config/config_userapi.h 0 additions, 1 deletioncommon/config/config_userapi.h
- openair1/PHY/defs.h 2 additions, 1 deletionopenair1/PHY/defs.h
- openair2/ENB_APP/enb_config.c 36 additions, 2738 deletionsopenair2/ENB_APP/enb_config.c
- openair2/ENB_APP/enb_config.h 5 additions, 1 deletionopenair2/ENB_APP/enb_config.h
- openair2/ENB_APP/enb_paramdef.h 1 addition, 1 deletionopenair2/ENB_APP/enb_paramdef.h
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf 3 additions, 4 deletions...TS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
- targets/RT/USER/lte-softmodem.c 16 additions, 12 deletionstargets/RT/USER/lte-softmodem.c
- targets/RT/USER/lte-softmodem.h 1 addition, 1 deletiontargets/RT/USER/lte-softmodem.h
Loading
Please register or sign in to comment