Commit Graph
1221 Commits
Author SHA1 Message Date
Raymond Knopp 8ea46f8f95 changed CI configuration files so that the scheduling paramter for TDD and TM2 is "PARALLEL_SINGLE_THREAD" 2019-04-24 07:40:35 +02:00
Raymond Knopp ed08f3ab1b Merge remote-tracking branch 'origin/signal-delay' into ru_rau_enhancement_L1_renaming
Conflicts:
	openair1/PHY/defs_eNB.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/prach_procedures.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2019-04-20 08:28:43 +02:00
Cedric Roux 9ea7073c68 Merge remote-tracking branch 'origin/fixes-mac-scheduler-2019-w13' into develop_integration_2019_w15
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2019-04-15 10:50:38 +02:00
Raymond Knopp ca111641d4 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
Conflicts:
	cmake_targets/build_oai
	cmake_targets/oaisim_build_oai/CMakeLists.template
	cmake_targets/oaisim_mme_build_oai/CMakeLists.template
	cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
2019-04-14 20:34:03 +02:00
Rohit Gupta a05255d246 increased size of maximum SI allocation (to mcs 9 with 3 PRBs) Fixes issues with SI message using eMTC information elementswq 2019-04-13 01:12:33 +02:00
frtabu 30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
Cedric Roux a5a1690394 bugfixes for UL scheduling
- size of PUCCH has been fixed to:
    - 2 RBs for N_RB_UL = 25 (1 RB at top of resource grid, 1 RB at bottom)
    - 4 RBs for N_RB_UL = 50
    - 6 RBs for N_RB_UL = 100
  this is arbitrary and will need some rework at some point.
  This may be also wrong. PUCCH size actually depends on DL traffic
  (if the ack/nack is not done in PUSCH) and scheduling request
  configurations.
- add sched_frame %= 1024 at one needed place
- reserve RBs for retransmission
  this was not done so new transmissions were scheduled in the same
  RBs. Since the code works with the notion of 'first_rb' only, it
  was decided to skip all RBs lower than those retransmitted. This
  works but is not correct (imagine we have to retransmit RB 23, then
  all RBs < 23 will not be used for new transmission). The work to
  fix this properly is complex, a lot has to change, so let's do it
  this simple way for now.
- sort_ue_ul was not correct
  - add the function maxround_ul to use the correct 'round' (the one
    from DL was used, which is totally wrong)
  - be sure to use the correct frame/subframe to get the correct HARQ pid
2019-03-30 15:19:27 +01:00
Cedric Roux 0e38852b05 bugfix: access correctly round_UL 2019-03-30 15:18:18 +01:00
Cedric Roux 26118ed860 bugfix: fix cqi_req usage in UL scheduler
For retransmission, let's use cqi_req used for the 1st transmission.

Maybe incorrect, should check the specs. (In the worst case, we
simply won't decode this transmission at all. No big deal.)
2019-03-30 15:18:18 +01:00
Cedric Roux 9565544e3f bugfix: test free RBs and CCE allocation feasible only for new transmissions 2019-03-30 15:18:18 +01:00
Cedric Roux 04c24ff698 minor cleanup 2019-03-30 15:13:37 +01:00
Cedric Roux daee800e3e bugfix: keep frame in [0..1023] 2019-03-30 15:13:37 +01:00
Cedric Roux 35a38fbee8 bugfix: fix T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION parameters 2019-03-30 15:13:37 +01:00
Raphael Defosseux 551319ef87 Fix segmentation fault. The si_Periodicity value was taking very lage values.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-26 13:52:53 +01:00
Robert Schmidt 024007716a Check type of node using NODE_IS_CU/DU/MONOLITHIC macros 2019-03-26 13:15:02 +01:00
Robert Schmidt 1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +01:00
Raphael Defosseux 2fcd4fcec1 Fixing error in LTE-M MAC scheduling 2019-03-18 11:40:38 +01:00
Robert Schmidt 62d9b8cf36 Merge branch 'develop' into feature-127-protocol-split 2019-03-14 13:10:21 +01:00
Raphael Defosseux d8e16e37a5 Merge remote-tracking branch 'origin/develop' into eMTC-testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 14:17:24 +01:00
Raphael Defosseux cd5e140eb7 Fixes for FDD attachment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 12:07:17 +01:00
Robert Schmidt ede37e56b8 Use correct RNTI for RRC data req 2019-03-07 12:46:34 +01:00
Konstantinos Alexandris f76f1f1e1c x2: bugfix: pass correct rach resource type 2019-03-05 14:56:42 +01:00
Robert Schmidt f9c4c501e3 Merge branch 'develop' into feature-127-protocol-split 2019-03-05 14:17:38 +01:00
nepes 40cb79e44f Merge remote-tracking branch 'origin/develop' into eMTC-testing 2019-03-02 22:41:48 +01:00
nepes 1d2ee01b6c removal of logs 2019-02-28 18:28:35 +01:00
OAI-admin c22f10aa72 Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling 2019-02-26 12:44:59 +01:00
Louis Adrien Dufrene 9b9ef32a20 Fix RRC version variable to allow dlsch scheduling for eMTC 2019-02-26 11:04:55 +01:00
Louis Adrien Dufrene 4e176e112e Merge branch 'eMTC-testing' into eMTC-testing-orange 2019-02-26 07:21:15 +01:00
nepes a4b57f3150 loggin reduction for LTE-M. 2019-02-26 01:43:56 +01:00
nepes 282985eb2b RRC bugfix 2019-02-25 21:52:47 +01:00
Robert Schmidt 544d80c40d Merge branch 'develop' into feature-127-protocol-split 2019-02-25 18:06:35 +01:00
nepes 67aa968001 Merge branch 'eMTC-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into eMTC-testing 2019-02-25 17:55:16 +01:00
nepes d74f2da9a8 changes to configuration file for eMTC (pucch parameters) 2019-02-25 17:54:44 +01:00
frtabu 79d0042c4a Merge branch 'develop' into issue392-simplify-s1-nos1step2 2019-02-25 17:37:20 +01:00
frtabu fb46545526 Fix corrupted LOGs in L1L2simulator, introducing two new components NFAPI_VNF and NFAPI_pnf. Integrate Fujitsu fix for up to 50 UEs. Apply astyle to all modified files in the branch 2019-02-25 16:50:03 +01:00
Louis Adrien Dufrene 22656b65ce fix RA_id again for add_new_ue() 2019-02-25 15:59:07 +01:00
Louis Adrien Dufrene 90c53b11c3 Merge branch 'eMTC-testing' into eMTC-testing-orange 2019-02-25 14:03:14 +01:00
Louis Adrien Dufrene 27d01dcea9 remove some debug 2019-02-25 14:02:05 +01:00
nepes 669724c100 Merge branch 'eMTC-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into eMTC-testing 2019-02-25 13:30:14 +01:00
nepes b28b14411e modifications for LTE-M testing 2019-02-25 13:29:43 +01:00
Louis Adrien Dufrene f552fd73ba Merge branch 'eMTC-testing' into eMTC-testing-orange 2019-02-25 11:28:41 +01:00
Louis Adrien Dufrene 87f415d2dd Fix wrong RA_id index in rx_sdu for add_new_ue 2019-02-25 11:21:53 +01:00
Louis Adrien Dufrene a4259b9071 Fix build error 2019-02-25 10:34:30 +01:00
Louis Adrien Dufrene 1e374fdf60 Add some debug in eNB_scheduler_primitives to test 2019-02-25 10:21:47 +01:00
Louis Adrien Dufrene 46bbfb820c remove some debug 2019-02-25 10:06:31 +01:00
Louis Adrien Dufrene cddba97c21 remove CDRX related stuff 2019-02-25 10:03:19 +01:00
Louis Adrien Dufrene ad511a4a3d some format in generate_Msg4() 2019-02-25 09:51:21 +01:00
Louis Adrien Dufrene 55460eafe1 some format for eMTC schedulers 2019-02-25 09:45:58 +01:00
Louis Adrien Dufrene 0ead4bdb12 some format for eNB_scheduler_RA.c and rar_tools.c + some fix in RAR PDU 2019-02-25 08:16:23 +01:00
tomita.y 2e49f833a3 Modified for L2 simulator with using TUN. 2019-02-25 13:34:23 +09:00