Commit Graph
387 Commits
Author SHA1 Message Date
laurent 8d9d80ee37 very big merge with merged develop, basic test done 2020-01-30 17:10:36 +01:00
laurent 3ce5d40064 add comments in data structures, gcc warnings fixed 2019-10-31 20:49:42 +01:00
yilmazt cd098f3971 develop&-nr merge 2019-10-30 16:17:41 +01:00
laurent 0b7489b122 astyle only 2019-10-08 16:15:29 +02:00
laurent 445cf84e94 clean up wireshark traces 2019-10-08 16:04:10 +02:00
yilmazt e5a9f02af6 develop-nr merge 2019-10-07 12:04:58 +02:00
frtabu b9b4d05e41 remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value) 2019-09-23 19:46:44 +02:00
Mohamed Gamal e45794ce08 Remove build warning
Signed-off-by: Mohamed Gamal <mohammed.abdelkhalek.ext@orange.com>
2019-07-31 13:00:41 +02:00
Mohamed Gamal 16c8762c2b PUSCH Repetition confoiguration and combining
Functionalities Added:
	- Modify RAR message to use number of repetitions configuration added in last commit
	- Configure msg3 with number of repetitions
	- DCI configuration for repetitions
	- Repeat MAC UL config each SF for the number of repetitions
	- PHY combining of repeated SF

Signed-off-by: Mohamed Gamal <mohammed.abdelkhalek.ext@orange.com>
2019-07-28 17:04:20 +02:00
Raphael Defosseux 0f91d708bd Fix merge conflict resolution error.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-24 08:59:13 +02:00
Raphael Defosseux 729aab5798 Merge remote-tracking branch 'origin/nfapi_cleanup1' into develop_integration_2019_w30 2019-07-24 08:29:01 +02:00
Raphael Defosseux 4eee2460f9 Merge remote-tracking branch 'origin/bugfix-pucch-power-estimation' into develop_integration_2019_w30 2019-07-23 13:02:42 +02:00
Cedric Roux d1fdbfedbc fix power estimation
Some computation has been fixed in PUCCH reception.

SNR has been fixed, uses measurement instead of
a fixed value for the noise.

normalized_rx_power and target_rx_power have been removed,
replaced by snr and target_snr. All the files using those
variables have been updated.
2019-07-19 17:10:42 +02:00
Wu Jing 79eb2d7066 Fix: skip c-rnti and reestablishment before first attach is completed. 2019-07-16 19:40:09 +09:00
Haruki NAOI 35385d84aa Fix: uplane_inactivity_timer dose not count time correctly about TDD.(rm2174) 2019-07-16 19:13:47 +09:00
luaihui 94af4d0eca Merge remote-tracking branch 'origin/OAI_develop' into oai_develop_nfapi 2019-07-09 12:45:45 +09:00
Wu Jing 4239dacd02 Merge branch 'OAI_develop' into oai_develop_nfapi 2019-07-02 22:23:35 +09:00
laurent 924e10f73a fix rfsim ue initial sync and legacy OAI C struct syntax 2019-07-01 15:17:07 +02:00
Wu Jing 61fc53f851 skip crnti if c-plane is not completed 2019-06-08 13:30:09 +09:00
Raymond Knopp 17eb5eedaf Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
also:
removed XFORMS from lte-softmodem target and associated extra functions in lte-softmodem.c
Conflicts:
	common/utils/T/T_defs.h
	targets/RT/USER/lte-softmodem.c
2019-04-28 10:30:56 +02:00
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
Louis Adrien Dufrene 5ae494e974 merge from develop 2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene 36cd05bcba Bug fix: dci0_ongoing timer ok, now impossible to set ul_SR when dci0 is ongoing. 2019-04-16 08:22:54 +02:00
Louis Adrien Dufrene d7cddc2825 Bug fix of drx_config == PrNothing is now handled. Bug fix for dci0_ongoing not working. To investigate 2019-04-15 10:57:39 +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
Louis Adrien Dufrene 4c931888e6 Add dci0_ongoing_timer. Commit to build and test. 2019-04-15 08:54:00 +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
Louis Adrien Dufrene 3406634b6b This is version 1.0. To test. Cleanup of phy_procedures_lte_eNb.c eNB_scheduler_dlsch.c eNB_scheduler_ulsch.c pre_processor.c and asn1_msg.c 2019-04-10 08:48:37 +02:00
frtabu 30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene 81f04d2982 Apply diff between ssr (CDRX) branch and develop 2019-04-04 08:17:26 +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 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
Robert Schmidt 1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +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
OAI-admin c22f10aa72 Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling 2019-02-26 12:44:59 +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
Louis Adrien Dufrene 22656b65ce fix RA_id again for add_new_ue() 2019-02-25 15:59:07 +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 cddba97c21 remove CDRX related stuff 2019-02-25 10:03:19 +01:00
Louis Adrien Dufrene 55460eafe1 some format for eMTC schedulers 2019-02-25 09:45:58 +01:00
Robert Schmidt 030e11ba9a Merge branch 'develop' into feature-127-protocol-split 2019-02-21 20:18:35 +01:00
Raphael Defosseux ee3b650904 Compilation fix
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-15 10:40:06 +01:00
Raphael Defosseux 4cdae9d93d Merge remote-tracking branch 'origin/x2' into develop_integration_2019_w07_v2
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-15 09:54:44 +01:00