Thomas Schlichter 6868a3db0d Fix merge conflict in openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c ...

I had to remove the Msg2 transmission in phytest mode, which was present in branch 'benetel_integration'.
This caused following assertion:

Assertion (Foffset <= Ncb) failed!
In nr_rate_matching_ldpc() /home/sli/sudas-demonstrator/openair1/PHY/CODING/nr_rate_matching.c:411
Foffset 6492 > Ncb 924

2020-09-04 16:14:28 +02:00

..

config.c

getting rid of frame_rx and slot_rx in gnb scheduler

2020-08-28 15:42:14 +02:00

gNB_scheduler_bch.c

Merge branch 'develop' into NR_RRC_PRACH_procedures

2020-03-25 18:45:00 +01:00

gNB_scheduler_dlsch.c

added MAC statistics (Transport and logical channel interfaces)

2020-09-03 18:58:30 +02:00

gNB_scheduler_phytest.c

added MAC statistics (Transport and logical channel interfaces)

2020-09-03 18:58:30 +02:00

gNB_scheduler_primitives.c

getting rid of frame_rx and slot_rx in gnb scheduler

2020-08-28 15:42:14 +02:00

gNB_scheduler_RA.c

Merge remote-tracking branch 'origin/benetel_integration' into develop_integration_2020_w36

2020-09-03 16:47:39 +02:00

gNB_scheduler_ulsch.c

fixed ul harq assertion

2020-09-04 11:59:23 +02:00

gNB_scheduler.c

Fix merge conflict in openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

2020-09-04 16:14:28 +02:00

mac_proto.h

Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling

2020-09-03 20:59:58 +02:00

main.c

Merge remote-tracking branch 'origin/NR_UL_scheduling' into NR_RRC_PDCP

2020-08-06 14:27:54 +02:00

nr_compute_tbs_common.c

scheduling of msg2 and filling of fapi structures

2020-02-21 16:40:15 +01:00

nr_mac_gNB.h

added MAC statistics (Transport and logical channel interfaces)

2020-09-03 18:58:30 +02:00