Commit Graph
488 Commits
Author SHA1 Message Date
bruno mongazon d62fe071cb Fix #582, ENABLE_PGM_TRANSPORT removed, RRH related removed 2018-01-16 10:15:35 +01:00
bruno mongazon cf0e9175dd Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed 2018-01-15 18:47:07 +01:00
bruno mongazon afcc9aabd8 Fix #582, USER_MODE flag removed 2018-01-11 16:50:50 +01:00
Cedric Roux b4a48e199e Merge remote-tracking branch 'origin/update-license' into RU-RAU-split
Conflicts:
	openair1/PHY/CODING/rate_matching.c
	openair1/PHY/LTE_REFSIG/primary_synch.h
	openair2/LAYER2/layer2_top.c
	openair2/RRC/LITE/rrc_config.c
2017-10-23 15:00:30 +02:00
Cedric Roux 1b1f941e3c upgrade license to version 1.1 2017-10-23 12:22:13 +02:00
Raymond Knopp bc9c587b48 Merge remote-tracking branch 'origin/develop' into RU-RAU-split
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/defs.h
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/defs.h
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SCHED/pusch_pc.c
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/MAC/ue_procedures.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim_functions.c
2017-09-26 21:43:03 -07:00
Cedric Roux 8633d6c2df remove compilation warnings 2017-08-03 10:40:04 +02:00
Cedric Roux 2ed9a48d6e more fix for dlsim_tm7 2017-08-03 10:24:16 +02:00
gabrielC 5917cdaff8 correct dlsim execution problem 2017-08-01 16:57:37 +02:00
tct-labo4 4c2c1a3631 fix dlsim 2017-07-31 16:18:57 +02:00
Cedric Roux 8d5901c815 bugfix: fix bug "Unknown UE_id for rnti"
This bug happens when we detect uplink failure for one UE.
In this case, a DCI format 1A is sent to the UE to ask it
to do random acces.

The way this DCI is generated was not compatible with how
the software is organized. It was expected that the DCI are
added (with add_ue_spec_dci and add_common_dci) in a very
specific order: first all DCIs in common space are added
(with add_common_dci) then all DCIs in UE specific space
are added (with add_ue_spec_dci).

The problem was that the DCI format 1A DCI sent to the UE
for it to do random access is added (with add_ue_spec_dci)
before the DCIs in common space.

That totally messed up the logic in add_common_dci and
add_ue_spec_dci.

The solution is to get rid of Num_common_dci and Num_ue_spec_dci,
replace those two counters by only one (Num_dci) and add
"search_space" in the dci_alloc structure to be used later by
the function "allocate_CCEs" when calling "get_nCCE_offset".

The software had to be adapted to the new variables, everywhere.

I am not sure that the simulators work. It seems that some
of them didn't use Num_common_dci and Num_ue_spec_dci to
decide on what space (common or UE specific) to put the DCI,
but relied on the rnti (comparing with SI_RNTI). To be tested
properly.

The modified simulators are:
  - openair1/SIMULATION/LTE_PHY/dlsim.c
  - openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
  - openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
  - openair1/SIMULATION/LTE_PHY/framegen.c
  - openair1/SIMULATION/LTE_PHY/pdcchsim.c
  - openair1/SIMULATION/LTE_PHY/syncsim.c
2017-07-27 17:12:19 +02:00
Cedric Roux 3f1e218a01 pre-integration cleanup 2017-06-16 11:51:10 +02:00
Elena_Lukashova 727782a04a Setting default use_sic_receiver, otherwise it was working properly
only with XFORMS enabled.
2017-06-15 12:05:32 +02:00
Elena_Lukashova adbb533de6 Setting a defaul state of the SIC button. 2017-06-13 16:31:16 +02:00
Elena_Lukashova 9be3a02fb9 Adding a button to XFORMS to switch dinamically between SIC and PIA. 2017-06-13 12:07:19 +02:00
Elena_Lukashova fadb9b8378 Add debugging level to dlsim_tm4. 2017-06-12 23:12:22 +02:00
Elena_Lukashova b7b13de36a Making sure llr is indexed per TB, and not per CW. 2017-06-12 23:10:45 +02:00
Elena_Lukashova ce29fca6b6 Enabling new code for dci format 2 and incrementing round in UE->dlsch[subframe&0x1][0][1]. 2017-06-12 23:08:00 +02:00
Elena_Lukashova a45fbd0fae Merge branch 'bugfix-243-dlsim' into feature-59-tm4 2017-06-08 15:12:57 +02:00
Florian Kaltenberger 68c72ac012 removing a few prints 2017-06-08 14:24:07 +02:00
Florian Kaltenberger e10dd54a9b dlsim now returns -1 if a test does not pass 2017-06-08 14:23:33 +02:00
Elena_Lukashova 09fe0bdc24 Merge branch 'bugfix-243-dlsim' into feature-59-tm4 2017-06-08 14:16:22 +02:00
Florian Kaltenberger 0ef58f685a proper checking for detection of PDCCH/PDSCH, fix of error counters 2017-06-07 11:20:51 +02:00
Elena_Lukashova 71ea13fa4b Merge branch 'bugfix-243-dlsim' into feature-59-tm4 2017-06-06 11:58:56 +02:00
Florian Kaltenberger 9ddaf93eab re-adding the possibility in dlsim to bypass the DCI/PDCCH generation. This is necessary for accuracy of the dlsim-tests, which are working again now. 2017-06-06 10:39:03 +02:00
Raymond Knopp d23697aef3 Merge branch 'develop' into RU-RAU-split
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.h
	openair1/PHY/LTE_TRANSPORT/pcfich.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/rar_tools.c
	openair1/PHY/LTE_TRANSPORT/srs_modulation.c
	openair1/PHY/defs.h
	openair1/PHY/impl_defs_lte.h
	openair1/PHY/impl_defs_top.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair2/COMMON/mac_rrc_primitives.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_config.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_mch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/main.c
	openair2/LAYER2/MAC/proto.h
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.h
	openair2/RRC/LITE/rrc_UE.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LITE/rrc_eNB.c
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/COMMON/common_lib.h
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
	targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
	targets/RT/USER/rt_wrapper.h
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
2017-06-05 15:33:38 -07:00
Raymond Knopp 413df163d8 first working version with oaisim. This is prior to MAC interface reworking 2017-06-04 02:44:26 -07:00
Elena_Lukashova 82545b8265 Merge branch 'develop' into feature-59-tm4 2017-05-24 12:49:52 +02:00
Elena_Lukashova 10ad08db41 Changes in files outputs. 2017-05-24 10:45:41 +02:00
Cedric Roux c15a9a8294 post-integration fix: remove compilation warnings 2017-05-22 10:23:24 +02:00
Cedric Roux 4eefaffb47 minor: change files mode (from 755 to 644) 2017-05-18 11:12:11 +02:00
Cedric Roux f12350ce62 integration fix: remove warnings in dlsim 2017-05-15 15:42:27 +02:00
Cedric Roux 9cd3e2e887 integration fix: remove warnings in ulsim 2017-05-15 15:42:01 +02:00
Cedric Roux 11006597c9 integration fix: let dlsim and ulsim work again
There is now the function copy_harq_proc_struct and some
procedures for the UE have changed, which makes necessary
to have UE->dlsch valid for both subframes (odd and even).

We increase memory usage, maybe it's not the correct solution.
To be kept in mind if something goes wrong at some point.
2017-05-15 11:13:56 +02:00
Cedric Roux 0bb229451a Merge remote-tracking branch 'origin/bugfix_Fujitsu_reviewed' into develop 2017-05-12 15:57:33 +02:00
Cedric Roux adb3b25c67 bug fixes from Fujitsu (bug 24)
----------------------------------------------------------
bug 24

Ttile:
The last line "multicast_group = multicast_group" is hard
to understand. The local variable should be different name
than the global variable.

Bug Location:
const char *multicast_group_list[MULTICAST_LINK_NUM_GROUPS] = {
  "239.0.0.161",
  "239.0.0.162",
  "239.0.0.163",
  "239.0.0.164"
};
:
:
void multicast_link_start(void (*rx_handlerP) (unsigned int, char *),
                          unsigned char multicast_group, char *multicast_ifname)
{
  rx_handler = rx_handlerP;
  multicast_group = multicast_group;

Note:
Detected by CppCheck
----------------------------------------------------------
2017-05-12 11:52:52 +02:00
HARADA Masayuki 7854030b90 Add pucch format3 test to pucchsim 2017-04-24 13:24:39 +09:00
Raymond Knopp b42aed9ed9 initial testing version of L1L-L1H split (RRU-RAU) 2017-04-17 10:40:23 -07:00
Cedric Roux 2437d0fbd0 Merge remote-tracking branch 'origin/fix-dlsim-w13' into develop_integration_w13 2017-03-28 17:33:26 +02:00
Cedric Roux 37c71e5a02 Merge remote-tracking branch 'origin/dlsim-fix-w13' into develop_integration_w13 2017-03-28 17:33:16 +02:00
Cedric Roux c207df8b0e bugfix: dlsim was not working anymore
When you ran it with the scope as:

    ./dlsim -X

you saw no activity in the "PDSCH I/Q of MF Output" window,
so matter what SNR you put (even for very high SNR, say: ./dlsim -X -s40)

this commit seems to fix it.

I am not sure it is the end of story. The 2 threads PDCCH/PDSCH structures
may still not be used correctly everywhere.
2017-03-28 17:25:27 +02:00
Florian Kaltenberger 99280926ed fix in dlsim to catch cases where pdcch is not decoded 2017-03-28 17:24:21 +02:00
Wilson Thong 924c421beb #220 add help printout for run options 2017-03-28 10:17:51 +08:00
Elena_Lukashova a0f40fd02b Merge remote-tracking branch 'origin/develop' into feature-59-tm4 2017-03-27 14:03:51 +02:00
Elena_Lukashova 800f66b3d4 Fixing a bug in HARQ for SIC.
Now the llrs after SIC procedure are updated.
In dlsim_tm in case of TB0_active==-1,
the llr were taken from the wrong buffer, and in dlsch_demodulation
the SIC llrs were written into the wrong buffer in the same case.
2017-03-27 11:50:58 +02:00
Elena_Lukashova e05a417cd2 Fixing previous commit 2017-03-26 20:17:47 +02:00
Elena_Lukashova 78bf45f3f3 Removing unnecessary arguments in SIC llr functions. 2017-03-25 18:18:42 +01:00
Cedric Roux c54cb41805 Merge remote-tracking branch 'origin/various-fixes-w12' into develop_integration_w12 2017-03-24 17:07:26 +01:00
Cedric Roux 6448738e9b bugfix/compilation warning removal in ulsim 2017-03-24 15:53:52 +01:00
Cedric Roux 583123e042 bugfix/compilation warning removal in dlsim 2017-03-24 15:49:19 +01:00