Raymond Knopp 1fc396f57d Merge after bad rebase ...

Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/proto.h
	openair2/PHY_INTERFACE/defs.h

2015-11-29 01:06:14 -08:00

..

config.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

COPYING

add License

2014-07-23 20:21:37 +00:00

defs.h

Moved CCE allocations from PHY to MAC and updated MAC interfaces for BCCH/RA/UE-SPEC scheduling.

2015-11-24 14:35:20 -08:00

eNB_scheduler_bch.c

Merge after bad rebase

2015-11-29 01:06:14 -08:00

eNB_scheduler_dlsch.c

Merge after bad rebase

2015-11-29 01:06:14 -08:00

eNB_scheduler_mch.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

eNB_scheduler_primitives.c

Merge after bad rebase

2015-11-29 01:06:14 -08:00

eNB_scheduler_RA.c

Merge after bad rebase

2015-11-29 01:06:14 -08:00

eNB_scheduler_ulsch.c

Added DLSCH scheduling for subframes 0 and 5. Changes in MAC scheduling data structure to keep track of VRB allocations from SI,RA when scheduling regular DLSCH

2015-11-29 00:37:04 -08:00

eNB_scheduler.c

Merge after bad rebase

2015-11-29 01:06:14 -08:00

extern.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

l1_helpers.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

lte_transport_init.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

main.c

Added DLSCH scheduling for subframes 0 and 5. Changes in MAC scheduling data structure to keep track of VRB allocations from SI,RA when scheduling regular DLSCH

2015-11-29 00:37:04 -08:00

openair2_proc.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

pre_processor.c

Added DLSCH scheduling for subframes 0 and 5. Changes in MAC scheduling data structure to keep track of VRB allocations from SI,RA when scheduling regular DLSCH

2015-11-29 00:37:04 -08:00

proto.h

Merge after bad rebase

2015-11-29 01:06:14 -08:00

ra_procedures.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

rar_tools.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

ue_procedures.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

vars.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00