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
yilmazt
5fa78b4d6e
Final --phy_simulators warning removals for this branch, and former polar coding function corrections
2019-04-16 17:24:58 +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
yilmazt
75f131ad54
--phy_simulators warning removals, except for nr_dlsim. Polar coding old implementation's approximation and a priori information options needs to be corrected or removed
2019-04-15 21:49:28 +02:00
Francesco Mani
8897b3c88d
conflicts solved after merge with develop-nr
2019-04-15 15:28:56 +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
yilmazt
c990cbc851
Added clean_gNB_ulsch, polartest fully working for all options and other minor warning removals.
2019-04-14 18:11:42 +02:00
yilmazt
b2add95524
Added clean_gNB_ulsch, fully working polartest, and many other minor warning removals.
2019-04-14 17:38:52 +02:00
Raymond Knopp
99c6c9227e
cleanup after merge with develop-nr
2019-04-12 13:27:20 +02:00
Raymond Knopp
231836ebbd
Merge remote-tracking branch 'origin/develop-nr' into shortBlockCoding
...
Conflicts:
openair1/SIMULATION/NR_PHY/dlsim.c
2019-04-12 08:56:49 +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
Hongzhi Wang
29e058df17
ue pdsch config from fapi removing hardcoded values
2019-04-11 14:45:03 +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
Florian Kaltenberger
2da6fb8efb
fixing a bug in adjust_sync
...
removing printfs
2019-04-09 09:06:00 +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
Florian Kaltenberger
d208283327
Merge branch 'nr_pdsch_debug' into fix-frame-rx-and-memory
...
Conflicts:
executables/nr-ue.c
2019-04-07 11:25:06 +02:00
Florian Kaltenberger
bdca3e4832
moving BWP config to MAC.
2019-04-07 08:12:13 +02:00
Florian Kaltenberger
71fc1b6890
makeing pdsch parameters dependent on DCI
2019-04-06 18:37:00 +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
Florian Kaltenberger
e0f4a9c5f7
Merge remote-tracking branch 'origin/nr_pdsch_debug' into fix-frame-rx-and-memory
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
2019-04-05 11:35:14 +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
Francesco Mani
2ff8bb2012
merged with branch fix-frame-rx-and-memory and conflicts solved
2019-04-04 16:33:46 +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
Raymond Knopp
1ca00e40b5
Merge remote-tracking branch 'origin/develop-nr' into shortBlockCoding
...
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/autotests/test_case_list.xml
cmake_targets/build_oai
openair1/PHY/CODING/TESTBENCH/polartest.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
openair1/PHY/CODING/nr_polar_init.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2019-04-04 09:14:37 +02:00
Louis Adrien Dufrene
81f04d2982
Apply diff between ssr (CDRX) branch and develop
2019-04-04 08:17:26 +02:00
laurent
48a103ea82
fixes
2019-04-03 22:12:10 +02:00
Florian Kaltenberger
05dd8743e9
first version of UE FAPI handling for DLSCH. paramters from DCI are now handled by MAC and passed back to the PHY to program PDSCH. Still need to check parameters and take them into account in PHY.
2019-04-03 17:16:00 +02:00
Florian Kaltenberger
6db55b2f24
- UE channel estimation no longer done in slot_fep. Also created dedicated memory for channel estimates of different channels
...
- using nr_extract_dci_info instead of nr_generate_ue_ul_dlsch_params_from_dci as in phy_procedures_nr_ue. The latter was only a (poor) wrapper and not doing what the name suggests. also with FAPI things have to be done differently now. This will come in a next commit.
- other minor changes to remove warning
prepreatory changes
2019-04-03 11:40: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