Merge branch 'enhancement-10-harmony' into develop_integration_w03
Conflicts: targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c
No related branches found
No related tags found
Showing
- openair1/PHY/INIT/lte_init.c 31 additions, 21 deletionsopenair1/PHY/INIT/lte_init.c
- openair1/PHY/INIT/lte_parms.c 22 additions, 1 deletionopenair1/PHY/INIT/lte_parms.c
- openair1/PHY/LTE_ESTIMATION/lte_sync_time.c 10 additions, 11 deletionsopenair1/PHY/LTE_ESTIMATION/lte_sync_time.c
- openair1/PHY/LTE_TRANSPORT/if4_tools.c 156 additions, 70 deletionsopenair1/PHY/LTE_TRANSPORT/if4_tools.c
- openair1/PHY/LTE_TRANSPORT/if4_tools.h 2 additions, 1 deletionopenair1/PHY/LTE_TRANSPORT/if4_tools.h
- openair1/PHY/LTE_TRANSPORT/if5_tools.c 165 additions, 13 deletionsopenair1/PHY/LTE_TRANSPORT/if5_tools.c
- openair1/PHY/LTE_TRANSPORT/pcfich.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/pcfich.c
- openair1/PHY/LTE_TRANSPORT/prach.c 6 additions, 3 deletionsopenair1/PHY/LTE_TRANSPORT/prach.c
- openair1/PHY/MODULATION/beamforming.c 14 additions, 13 deletionsopenair1/PHY/MODULATION/beamforming.c
- openair1/PHY/MODULATION/defs.h 1 addition, 1 deletionopenair1/PHY/MODULATION/defs.h
- openair1/PHY/MODULATION/ofdm_mod.c 11 additions, 11 deletionsopenair1/PHY/MODULATION/ofdm_mod.c
- openair1/PHY/MODULATION/slot_fep_ul.c 9 additions, 5 deletionsopenair1/PHY/MODULATION/slot_fep_ul.c
- openair1/PHY/defs.h 27 additions, 2 deletionsopenair1/PHY/defs.h
- openair1/PHY/impl_defs_lte.h 6 additions, 0 deletionsopenair1/PHY/impl_defs_lte.h
- openair1/SCHED/defs.h 1 addition, 1 deletionopenair1/SCHED/defs.h
- openair1/SCHED/phy_procedures_lte_eNb.c 37 additions, 29 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair1/SIMULATION/LTE_PHY/dlsim.c 9 additions, 2 deletionsopenair1/SIMULATION/LTE_PHY/dlsim.c
- openair2/LAYER2/MAC/eNB_scheduler.c 3 additions, 2 deletionsopenair2/LAYER2/MAC/eNB_scheduler.c
- openair2/LAYER2/MAC/pre_processor.c 8 additions, 1 deletionopenair2/LAYER2/MAC/pre_processor.c
- openair2/UTIL/LOG/vcd_signal_dumper.c 1 addition, 0 deletionsopenair2/UTIL/LOG/vcd_signal_dumper.c
Loading
Please register or sign in to comment