Raphael Defosseux
8f68d596f1
Merge remote-tracking branch 'origin/develop-entv' into develop_integration_2019_w25
2019-06-18 13:42:50 +02:00
Raphael Defosseux
56eb818d08
Merge remote-tracking branch 'origin/ru_rau_enhancement_L1_renaming' into develop_integration_2019_w25
2019-06-18 13:40:42 +02:00
Javier Morgade
8b4c23cf80
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-06-10 15:21:51 +02:00
SAWADA Kentaro
4acb50f99e
ReFix Coverity Scan CID 340196 (Using uninitialized value prose_addr_len when calling recvfrom.)
2019-05-29 15:25:38 +09:00
Dong Anyuan
29081f0a16
Fix Coverity Scan CID 300431 (Overrunning array pdu_info_pP->li_list of 128 2-byte elements at element index 128 (byte offset 256) using index pdu_info_pP->num_li (which evaluates to 128).)
2019-05-28 21:37:30 +09:00
SAWADA Kentaro
4939f38a57
Fix Coverity Scan CID 340196
2019-05-28 19:22:24 +09:00
SAWADA Kentaro
95c8693181
Fix Coverity Scan CID 340000
2019-05-28 19:18:27 +09:00
Wang Tsu-Han
6b2e064216
Merge branch 'develop' into ru_rau_enhancement_L1_renaming
...
Conflicts:
ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
2019-05-23 18:29:01 +02:00
Javier Morgade
b1c1c4545a
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-23 16:51:30 +02:00
Javier Morgade
27a3cff798
BUGFIX and cppcheck/warning suppression
2019-05-21 10:59:17 +02:00
Javier Morgade
fe89f107e3
Code cleanup & CI F1 CD/DU Bugfix
2019-05-20 13:14:51 +02:00
Javier Morgade
3056343c5b
Remove test code before CI
2019-05-18 16:11:55 +02:00
Javier Morgade
786895dcd9
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-17 18:11:55 +02:00
frtabu
0bf3d8f6bc
Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER
2019-04-29 18:46:55 +02: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
Raphael Defosseux
d312a9d797
Merge remote-tracking branch 'origin/fix-cudu' into develop_integration_2019_w17
2019-04-25 17:07:00 +02:00
Raymond Knopp
14374c1473
fixed cppcheck errors and warnings. Removal of oaisim files tha came back during merge.
2019-04-25 11:53:52 +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
Robert Schmidt
82db432191
Make separate func_ptr setters for PDCP Ind/RLC Req
2019-04-19 14:06:48 +02:00
Robert Schmidt
42713b95fc
Configure complete PDCP in lte-(ue)softmodem
...
* Instead of partly initializing in read_config_and_init(), everything of
PDCP is initialized in main() of lte-softmodem
* Omit RC.rrc access in RRU through checking of RC.nb_inst > 0
* Includes FlexRAN, i.e. do not start FlexRAN in RRU
* Function pointers to PDCP functions have to be set explicitly (avoid
confusion of multiply setting function pointers)
2019-04-19 14:05:51 +02:00
Robert Schmidt
b4f462b9c8
Align PROTO_AGENT functions with PDCP/RLC function pointers
2019-04-18 13:42:20 +02:00
Louis Adrien Dufrene
0e6431a7b9
Moved code for HARQ process from PHY layer to MAC layer
2019-04-18 11:51:20 +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
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
Javier Morgade
23e63be717
FeMBMS PBCH (Physical Broadcast Channel) 3GPP TS 36.211 version 14.2.0 Release 14 Section 6.6
...
Code cleanup
2019-04-12 09:13:09 +02:00
Javier Morgade
f1fa1e1f53
FeMBMS UE RRC<->MAC Procedures SI-MBMS and SIB1-MBMS(sib13, LTE_NonMBSFN_Subframe)
2019-04-11 22:04:40 +02:00
Javier Morgade
35421860f9
Bugfix RLC/PDCP MBMS Bearer settings
2019-04-11 22:01:24 +02:00
Javier Morgade
28b33ac048
Adding some basic prototypes
2019-04-11 21:42:23 +02:00
Louis Adrien Dufrene
46b0a9fb38
Remove bypass_cdrx variable and add cdrx_waiting_ack. The CDRX is now activated at RRC COnnection Reconfiguration Complete reception. To Test
2019-04-11 07:36:05 +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
Raphael Defosseux
064d7fd917
CI: fixing the build report and a few warnings
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-04-08 11:54:03 +02:00
frtabu
30b7c973e0
merge nfapi_cleanup
2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene
7817358197
Cleanup of enb_config.c config.c asn1_msg.c asn1_msg.h
2019-04-05 11:56:29 +02:00
Louis Adrien Dufrene
8359b9684e
Cleanup of mac.h and mac_proto.h
2019-04-05 08:28:23 +02:00
Louis Adrien Dufrene
ca11800087
Cleanup of eNB_scheduler.c
2019-04-05 08:14:27 +02:00
Stefan Schaffelder
42e0929a0c
apply last diff from ssr to local orange_cdrx branch. Remove SSR comments
2019-04-04 10:15:38 +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
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