Raymond Knopp fa4a73bb1c Merge remote-tracking branch 'origin/develop-nr' into polar-decoder-optimizations ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/TESTBENCH/polartest.c
	openair1/PHY/CODING/nrPolar_init.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
	openair1/PHY/CODING/nrPolar_tools/nr_polar_rate_match.c
	openair1/PHY/NR_TRANSPORT/nr_pbch.c

2018-10-13 12:00:35 +02:00

..

CODING

Merge remote-tracking branch 'origin/develop-nr' into polar-decoder-optimizations

2018-10-13 12:00:35 +02:00

INIT

fixing merge

2018-10-11 07:45:54 -07:00

LTE_ESTIMATION

dlsim and ulsim are functional

2018-08-25 21:09:58 +02:00

LTE_REFSIG

reset for remerging

2018-07-30 11:24:08 +02:00

LTE_TRANSPORT

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

LTE_UE_TRANSPORT

Merge remote-tracking branch 'origin/develop' into develop-nr

2018-08-25 18:20:44 +02:00

MODULATION

Merge branch 'develop-nr-merge' into develop-nr

2018-08-30 07:08:26 -07:00

NBIoT_TRANSPORT

added README files to NBIoT/NR directories so they appear in gitlab

2018-03-19 01:23:34 -07:00

NR_REFSIG

NR PDCCH development warning clean up

2018-10-04 18:03:31 +02:00

NR_TRANSPORT

Merge remote-tracking branch 'origin/develop-nr' into polar-decoder-optimizations

2018-10-13 12:00:35 +02:00

NR_UE_ESTIMATION

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

NR_UE_TRANSPORT

fixing merge

2018-10-11 07:45:54 -07:00

TOOLS

Merge remote-tracking branch 'origin/develop' into develop-nr

2018-08-25 18:20:44 +02:00

defs_common.h

Merge remote-tracking branch 'origin/develop' into develop-nr

2018-08-25 18:20:44 +02:00

defs_eNB.h

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

defs_gNB.h

nr pbch format change

2018-09-19 15:10:43 +02:00

defs_L1_NB_IoT.h

Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19

2018-05-15 17:43:12 +02:00

defs_nr_common.h

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

defs_nr_UE.h

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

defs_RU.h

lte-softmodem compiles

2018-08-27 13:37:00 +02:00

defs_UE.h

reset for remerging

2018-07-30 11:24:08 +02:00

defs.h

Replace "#ifdef Rel14" by "#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))"

2018-08-09 06:08:33 -07:00

impl_defs_lte_NB_IoT.h

integration fix: fix license version to 1.1

2018-03-09 16:40:09 +01:00

impl_defs_lte.h

Merge branch 'develop-nr-merge' into develop-nr

2018-08-30 07:08:26 -07:00

impl_defs_nr.h

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

impl_defs_top_NB_IoT.h

integration fix: fix license version to 1.1

2018-03-09 16:40:09 +01:00

impl_defs_top.h

merge develop-nr

2018-08-29 04:38:46 -07:00

Makefile.inc

[OAI-UE] Mimo LLR computation AVX2 + fix in TM3 deprecoding

2017-03-08 12:16:38 +01:00

phy_extern_nr_ue.h

Fixed error during build procedure

2018-07-10 19:38:47 +02:00

phy_extern_ue.h

lte-uesoftmodem compiles

2018-08-27 15:53:34 +02:00

phy_extern.h

Merge remote-tracking branch 'origin/develop' into develop-nr

2018-08-25 18:20:44 +02:00

phy_vars_nr_ue.h

Merge branch 'develop-nr-merge' into develop-nr

2018-08-30 07:08:26 -07:00

phy_vars_ue.h

lte-uesoftmodem compiles

2018-08-27 15:53:34 +02:00

phy_vars.h

Merge remote-tracking branch 'origin/develop' into develop-nr

2018-08-25 18:20:44 +02:00

sse_intrin.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

types_NB_IoT.h

integration fix: fix license version to 1.1

2018-03-09 16:40:09 +01:00

types.h

Fix #582, USER_MODE flag removed

2018-01-11 16:50:50 +01:00