Commit Graph
2374 Commits
Author SHA1 Message Date
Cedric Roux d0c99c296e Merge branch 'develop' into T 2016-06-28 13:21:32 +02:00
Cedric Roux bfa749a7fa hotfix: rrc_mac_remove_ue was wrong 2016-06-24 10:58:29 +02:00
Cedric Roux 6445cc95f5 add T traces for MAC PDU/SDU including full buffers 2016-06-23 12:39:57 +02:00
Raymond Knopp 1f274a7b04 Merge remote-tracking branch 'origin' into enhancement-10-harmony
Merge in develop too.
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/3gpplte_sse.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
	openair1/SCHED/phy_mac_stub.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/RT/USER/lte-softmodem.c
2016-06-21 23:36:23 -07:00
Florian Kaltenberger 2e2f6f9c20 transmission mode is now taken into account in RRC signalling
small bugfix in dlsch_demodulation
shunted out TM3-7 specific DCI generation in scheduler to enable basic operation. more work needed.
2016-06-21 15:33:57 +02:00
Cedric Roux 031e6a024f Merge branch 'develop' into T 2016-06-16 17:22:30 +02:00
Cedric Roux 70d58491fc bugfix: uplink transmission/retransmission traces were wrong 2016-06-16 11:09:25 +02:00
Cedric Roux 4ea0121cab hotfix: rewrite allocate_CCEs, it didn't work properly.
The distinction common space/user space still requires some
careful examination.
2016-06-15 22:24:15 +02:00
lukashov 199434b92c Merge branch 'develop' into feature-59-tm4
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-06-15 13:21:44 +02:00
Cedric Roux 26c3a6a039 forgot to include T.h
if you compile *without* T it fails because the T macro is interpreted
as a function call
2016-06-10 12:42:44 +02:00
Cedric Roux 310b027acd Merge remote-tracking branch 'main/develop' into T
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-softmodem.c
2016-06-10 11:49:59 +02:00
Cedric Roux 262cda6199 add PDCP traces to the code 2016-06-10 10:48:13 +02:00
Cedric Roux 10dbc33e01 add RLC traces to the code 2016-06-10 10:47:42 +02:00
Cedric Roux d7e072a413 MAC tracing in the code 2016-06-10 10:46:45 +02:00
Raymond Knopp 1654af9a63 removed some traces that flooded the screen. Added UE information in PHY/MAC/RRC to indicate status of active/failing UEs every 10.24 seconds. 2016-06-08 00:28:16 +02:00
Raymond Knopp fd70527bf2 updates for 2 RXn-TXnp4 threads 2016-06-02 16:00:02 -07:00
Xiwen JIANG 5370685740 Merge branch 'master' into feature-21-TM7 2016-05-30 17:13:09 +02:00
Navid Nikaein 3dc0e4dd86 * route DlInformationTransfer to SRB2 if it is active
* configure dedicated DRBs based on the transaction id
* fix the issue in oaisim to work with S1 interface
2016-05-30 13:17:34 +02:00
Raymond Knopp e198a7423f updated unitary simulations and corrected bugs in threading and scheduling of L1 procedures. 2016-05-27 10:21:23 -07:00
Raymond Knopp b188a5cfeb changed threading (acqusition is slot based). removal of eNB_thread. timing all based on received timestamp. 2016-05-26 15:14:57 -07:00
Navid Nikaein 107eec224e Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-05-25 09:36:32 +02:00
Navid Nikaein 05c44f1c2a merge with the develop branch 2016-05-25 09:36:15 +02:00
Raymond Knopp 3cfbb76840 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED/phy_procedures_lte_eNb.c
2016-05-20 03:49:36 -07:00
Xenofon Foukas 0f5b01457b Merge remote-tracking branch 'oai/develop' into oai-integration
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
2016-05-17 13:18:09 +01:00
Raymond Knopp d3d423f51e split phy_procedures_eNB_TX into sub-modules for better understanding. No functional differences. 2016-05-15 14:10:04 -07:00
Raymond Knopp 4070a3affa fixed CCE allocation bug. 2016-05-10 19:34:36 +02:00
Navid Nikaein 3430dbc41d merge with the develop branch 2016-05-03 15:51:07 +02:00
Rohit Gupta e59f659fad Merge from bugfix-48-L1L2Signalling to develop 2016-05-02 15:12:11 +02:00
Navid Nikaein 2493ea4a3c update the run_enb_ue_virt_s1 script to birng up oip interface automatically 2016-04-26 13:51:50 +02:00
Xenofon Foukas 59ba6f9e7b Made config changes for remote scheduler and eNB 2016-04-20 13:41:49 +01:00
Navid Nikaein 65cf0940e0 Merge branch 'feature-44-dedicated-drb' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-04-20 13:14:20 +02:00
Navid Nikaein 4b8251838d enabling SRB2 2016-04-20 13:14:16 +02:00
Florian Kaltenberger 2b213a0ccc Merge branch 'develop' into feature-59-tm4
Conflicts:
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-04-19 15:50:05 +02:00
Xenofon Foukas bcea7d5917 Fixed local scheduler bug when scheduling multiple UEs 2016-04-18 13:05:36 +01:00
Xenofon Foukas 673ef5fa7a Modified active harq reporting mechanism to support long schedule ahead of time values 2016-04-14 15:13:15 +01:00
Xenofon Foukas 345a9382f2 Fixed bug of local agent scheduler that did not allow the retransmission in HARQ processes 2016-04-14 14:50:22 +01:00
Xenofon Foukas a47f3654f8 Added basic support for policy reconfiguration using yaml parser 2016-04-12 13:00:20 +01:00
Raymond Knopp 2dfe84a7e4 bugfixing for UL. Remaining problems: CCE allocations in subframe 5 lead to occasional illegal DCI allocations (affects UL DCI which is missed by UE). waveform compliance with CQI in ULSCH. 2016-04-10 23:25:58 +02:00
Xenofon Foukas 6b15195ac5 Added statistics for total and missed scheduling deadlines of remote scheduler 2016-04-07 09:28:35 +01:00
Navid Nikaein b5e3fa0521 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-04-06 19:22:19 +02:00
Navid Nikaein 0a3a8a5daf fix the dedicated DRB setup with multiple E_RAB_SETUP_REQ 2016-04-06 19:21:53 +02:00
Navid Nikaein b8181d06f1 merge with the develop 2016-04-04 14:47:46 +02:00
Xenofon Foukas abcdd194ff Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent 2016-04-04 10:49:02 +01:00
Raymond Knopp b511419090 resolved residual warnings after merge with develop (no warnings again for lte-softmodem) 2016-04-01 09:17:37 -07:00
Raymond Knopp e71aebc603 Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts:
	openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/openair2_proc.c
	openair2/RRC/LITE/rrc_eNB.c
	openair3/NAS/UE/API/USIM/usim_api.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
2016-03-31 14:36:12 -07:00
Xenofon Foukas 985a2ec261 Merge remote-tracking branch 'oai/develop' into feature-68-enb-agent 2016-03-31 11:08:02 +01:00
Florian Kaltenberger f5c798e48c transmission mode is now taken into account in RRC signalling
small bugfix in dlsch_demodulation
shunted out TM3-7 specific DCI generation in scheduler to enable basic operation. more work needed.
2016-03-31 11:34:32 +02:00
Navid Nikaein b65065fa68 merge with the develop 2016-03-30 12:25:56 +02:00
Cedric Roux 600cce17c7 more warning removals 2016-03-29 12:00:57 +02:00
Cedric Roux 5f823b401a some more warning removals 2016-03-28 22:45:20 +02:00