Commit Graph
413 Commits
Author SHA1 Message Date
Nikos Makris 4195681fc9 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
Tested with one UE
Possibly broken FLEXRAN (different methods for configuring the link manager)
2018-04-05 13:22:12 +03:00
oai da50d68b06 more NB-IoT integration 2018-03-08 17:35:35 +01:00
Niccolò Iardella 7e3b1f5d0a Niccolo: Add sorting policy 2018-02-14 17:06:04 +01:00
Robert Schmidt a21bc513bb Merge branch 'develop' into feature-merge-f68 2018-02-08 18:05:28 +01:00
Nikos Makris bc0f49cea0 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
OAISIM NoS1 broken, needs fixing (no linking of libraries for the UE code)
2018-02-02 20:21:34 +02:00
Wu Jing ba8a111ea1 merge the latest develop branch into issue289 2018-02-01 19:25:29 +09:00
Xu Bo 664d1a4b5f merge issue271_hundreds_of_ues into ues_test and fix conflict in openair2/LAYER2/MAC/defs.h 2018-01-27 02:24:43 +00:00
Xu Bo b7e2a90ef4 fix release timer by starting timer after SCD DCCH(RRCConnectionRelease) 2018-01-27 02:06:08 +00:00
Navid Nikaein 0937339a53 Update MAC scheduler for slicing (not tested) 2018-01-24 11:51:35 +01:00
Cedric Roux 97ebc165cc Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04
Conflicts:
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/SCHED/defs.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/RRC/LITE/rrc_eNB.c
2018-01-22 17:47:01 +01:00
bruno mongazon cf0e9175dd Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed 2018-01-15 18:47:07 +01:00
Xu Bo 1471846030 Merge branch 'issue271_hundreds_of_ues' into ues_test 2018-01-13 10:53:27 +00:00
Xu Bo f6911c934b fix n1_pucch issue: 25RB pucch 2RB;50RB/100RB pucch 4RB 2018-01-13 08:23:22 +00:00
bruno mongazon afcc9aabd8 Fix #582, USER_MODE flag removed 2018-01-11 16:50:50 +01:00
Xu Bo 90476be196 Merge branch issue255_256_257_paging_reesta_release into branch ues_test 2017-12-28 15:49:37 +09:00
Xu Bo 3651852e16 1.NUMBER_OF_UE_MAX 16 -> 256 2.fix type of UE number from uint8_t to uint16_t 2017-12-07 11:40:52 +08:00
Xu Bo d81438cd17 merge the implemention of Paging, RRCConnectionRelease, RRCConnectionReestablishment, E-RAB Modify, E-RAB Release 2017-11-28 11:13:03 +09:00
Xu Bo ad859ddf5e modify for ue expansion 2017-11-16 12:11:21 +09:00
Xu Bo 34bc087707 modify function for issue271 2017-11-10 06:56:57 +09:00
Raymond Knopp 51a9107c14 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	targets/RT/USER/lte-ru.c
2017-10-25 00:40:20 +02:00
Cedric Roux b4a48e199e Merge remote-tracking branch 'origin/update-license' into RU-RAU-split
Conflicts:
	openair1/PHY/CODING/rate_matching.c
	openair1/PHY/LTE_REFSIG/primary_synch.h
	openair2/LAYER2/layer2_top.c
	openair2/RRC/LITE/rrc_config.c
2017-10-23 15:00:30 +02:00
Cedric Roux 1b1f941e3c upgrade license to version 1.1 2017-10-23 12:22:13 +02:00
mohamed.said 7cecfa10e3 Stable version of configuration 2017-10-16 19:44:29 +02:00
kogo 1b429a63da refactored config file, SIB1 & SIB2 are sent/received successfully 2017-08-30 16:59:58 +02:00
kogo d45b6c1f20 rearranged conf file - added pdsch_configcommon_v1310 & pusch_configcommon_v1310 2017-08-21 13:34:20 +02:00
mohamed.said 8ec2f370b0 added frequncy hopping config in do_SIB23 - ready to test 2017-08-16 12:39:16 +02:00
islam.galal 291616328e integration and testing of SIB2 integrity 2017-08-15 19:01:47 +02:00
mohamed.said aeda8e5cec added pcch_config_v1310 to config file and handled in enb_config.c , asn1_msg.c 2017-08-15 15:49:11 +02:00
mohamed.said feaa8e2888 fixed fdd_uplinkBitmap 2017-08-15 13:55:36 +02:00
mohamed.said f0376c7e19 updated fdd_DownlinkSubframe in enb_config.c , do_SIB1 and rrc_message_types.h 2017-08-15 13:31:14 +02:00
khalidhamdy d847f3cad5 solving some errors 2017-08-14 11:04:50 +02:00
Ahmed.Elias 319372b68a passin BR paraemeter to rrc 2017-08-14 10:39:17 +02:00
kogo 74b7b9627b activated SIB1 & SIB23 reading from config files and added BR parameters 2017-08-07 15:21:24 +02:00
kogo 99dcb4ceb4 added config file + bug fixing 2017-07-27 19:53:39 +02:00
Raymond Knopp 64ee15062f added selection of LTE or BL/CE SIB1/2 configuration 2017-07-26 16:49:17 -07:00
ahmed elias 33e6766d41 adding all changes from ornage private branch 2017-07-25 20:56:22 +02:00
Raymond Knopp 8da1c4b5bb Note: this commit is work in progress. Contains initial integration of NFAPI data structures which are tested for TX path. RX path to follow. 2017-07-06 08:18:32 -07:00
Raymond Knopp d23697aef3 Merge branch 'develop' into RU-RAU-split
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.h
	openair1/PHY/LTE_TRANSPORT/pcfich.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/rar_tools.c
	openair1/PHY/LTE_TRANSPORT/srs_modulation.c
	openair1/PHY/defs.h
	openair1/PHY/impl_defs_lte.h
	openair1/PHY/impl_defs_top.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair2/COMMON/mac_rrc_primitives.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_config.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_mch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/main.c
	openair2/LAYER2/MAC/proto.h
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.h
	openair2/RRC/LITE/rrc_UE.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LITE/rrc_eNB.c
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/COMMON/common_lib.h
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
	targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
	targets/RT/USER/rt_wrapper.h
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
2017-06-05 15:33:38 -07:00
Raymond Knopp b42aed9ed9 initial testing version of L1L-L1H split (RRU-RAU) 2017-04-17 10:40:23 -07:00
fnabet 1213521c30 merge from 2017.w12 2017-03-27 11:38:52 +02:00
Cedric Roux 4fcb6272f4 RRC Rel14
- import RRC ASN.1 defintions from the specifications
  (file openair2/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e10.asn)
  contrary to rel8/10, all modules have been imported, maybe it's too much
  to refine in case of problems
- deal with rel14 in fix_asn1
- all code that was for Rel10 is now for Rel10/Rel14
- some incompatible changes (mostly in naming) were resolved in favor
  of rel14, see in openair2/RRC/LITE/defs.h
- unsure about the rlc layer, some arrays have changed (values appended),
  I only changed the definition and in tests in the code, I changed
  the index limit, maybe it's not enough

Rel14 is the default compilation mode.
2017-03-23 18:06:40 +01:00
fnabet daa308c33a Merge tag '2017.w07' into bugfix-189-rlc-am-fixes 2017-02-24 17:15:30 +01:00
gabrielC eadcba956e Merge branch 'develop-realtime-lts' into develop_integration_w07
Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2017-02-17 11:51:03 +01:00
fnabet fbe109a66c RLC/MAC UE interface changes for Tx and adapt to eNB 2017-02-16 11:26:37 +01:00
Laurent 9f33d0904b merge develop 2017-02-01 13:08:35 +01:00
Frédéric Leroy 3835f10659 UE/ESM: move esm_indication_callback_t from openair2 to esm_ebr.h 2017-01-25 13:06:13 +01:00
Frédéric Leroy 3df061b540 UE/EMM: move emm_indication_callback_t from openair2 to emm_main.h 2017-01-25 13:06:13 +01:00
Cedric Roux 669aa1fbcf fix duplicated definition of boolean_t
It is defined both in openair2/COMMON/commonDef.h and
openair2/COMMON/platform_types.h.

Removing one or the other definition creates many problems
when compiling this or that part of the system (ue_ip.ko,
at_nas_ue). Let's keep both and protect the definitions
inside #ifdefs.
2017-01-12 09:27:22 +01:00
laurent cedde4ad1f realtime for UE 2016-12-26 21:19:26 +01:00
Cedric Roux 46b2ee9577 integration fix: attempt to clarify ODD_PARITY
This may need to be refined.

The variable ODD_PARITY is defined at various places,
with different values, causing compilation warnings.

It's wrong to define a variable with different values.

A new variable is created, specific to IMEI case: IMEI_ODD_PARITY.
Maybe ODD_PARITY should also have 0xf as value, and so maybe only
one variable is necessary. To be checked at some point...
2016-12-08 17:51:02 +01:00