maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,788 Commits 5 Branches 0 Tags
048c4d29a2c0a321b0f3683fdcfd82bf305ba663
Commit Graph
266 Commits
Author SHA1 Message Date
Robert Schmidt 048c4d29a2 add slice association in UE_list, test against it in slice_membership() 2018-09-03 18:10:28 +02:00
Robert Schmidt 58c2a00626 MAC: slicing conf struct in RC 
- introduce structure in RC for slicing conf (UL/DL)
- move global variables regarding slice configuration into RC
- change ue_slice_membership(): consider UL/DL
- remove the unnecessary header files
- set default parameters: one slice
 2018-09-03 18:10:28 +02:00
Niccolò Iardella e6168667d3 Add first_rb_offset 2018-09-03 18:10:28 +02:00
Niccolò Iardella 53c617cdcf Move slicing configuration variables in header files 2018-09-03 18:10:28 +02:00
Cedric Roux 7654f8a208 Merge remote-tracking branch 'origin/issue_344_segv_trace_wireshark' into develop_integration_2018_w35 2018-08-31 12:43:33 +02:00
laurent d5f28018ed fix 344 2018-08-23 13:06:17 +02:00
Rajeev Gangula 86f4d8c18f Remiving CQI scheduling on special SFs. 2018-08-20 14:17:19 +02:00
frtabu b85cbddeec log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common 2018-07-30 20:07:22 +02:00
Raymond Knopp 494348e2f0 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-07-06 06:24:31 +02:00
Raymond Knopp 27892e0935 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
 2018-06-28 14:44:47 -07:00
bruno mongazon b016bc229a fixed #320 issue 2018-06-25 18:23:36 +02:00
Cedric Roux 2f639e45b6 Merge remote-tracking branch 'origin/ulSNRs' into develop 
Conflicts:
	openair2/ENB_APP/MACRLC_paramdef.h
	openair2/LAYER2/MAC/mac.h
 2018-06-18 16:01:25 +02:00
Cedric Roux 5c6ad3142d Merge remote-tracking branch 'origin/develop' into mu_with_tdd1 
The monolithic eNodeB is not fully functional in FDD.

The TDD mode has not been tested.

Do not consider this commit as functional.

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	common/utils/itti/intertask_interface.c
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/pusch_pc.c
	openair2/COMMON/platform_types.h
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.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/flexran_agent_scheduler_dlsch_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/MAC/mac_proto.h
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/RLC/rlc.c
	openair2/LAYER2/RLC/rlc_rrc.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/UTIL/LOG/log.h
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
 2018-06-12 16:23:36 +02:00
Raymond Knopp 293110e2cc cleanup of warnings and default parameters for simulator target 2018-06-03 08:48:42 +02:00
Raymond Knopp 897de9f8e2 testing of rf simulation in UE 2018-06-02 10:10:35 -07:00
Rajeev Gangula c5c66eeb4a Merge branch 'develop' into ulSNRs 
Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/mac.h
 2018-05-29 09:50:05 +02:00
Masayuki HARADA fb054e6523 Merge branch 'sp3_master' into scd_refactoring 
# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
 2018-05-29 14:24:25 +09:00
Cedric Roux ed49592754 integration fix: remove warnings 
Remove warnings popping up on:
    ./build_oai --eNB -w USRP

Maybe not always the best solution.
 2018-05-24 17:15:42 +02:00
Masayuki HARADA 91db46b6ba Merge branch 'rm917_bugfix' into sp3_master 2018-05-24 17:06:10 +09:00
Wu Jing a37c29eb80 fix rm971 bug(delete #if 0) 2018-05-24 16:44:28 +09:00
Masayuki HARADA 44210a0a88 Fix PUSCH decode failure when recieve power is too high situation. 2018-05-24 13:21:37 +09:00
Wu Jing fadba8a1ed fix rm917 bug 2018-05-22 18:42:35 +09:00
Masayuki HARADA 677ad4298c Devide source file of scheduler 2018-05-17 10:48:39 +09:00
Cedric Roux 343bbbac68 Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.c
	openair2/PHY_INTERFACE/defs.h
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	targets/SIMU/USER/oaisim_functions.c
 2018-05-15 17:43:12 +02:00
Rajeev Gangula 899f50456e Changed config files to update ul channel SNRs. 2018-05-14 10:28:30 +02:00
Haruki NAOI bb6d116551 Merge remote-tracking branch 'remotes/origin/rm902_bugfix_sp3_master_base' into sp3_master 2018-05-10 12:52:43 +09:00
Wu Jing 7807e677e7 fix RM902 base on sp3_master 2018-05-10 11:53:06 +09:00
Haruki NAOI 54a36ff54d Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master 2018-05-10 11:40:16 +09:00
Rajeev Gangula dc9b0fa53a Added uplink channels SNR in config file. 2018-05-09 15:55:36 +02:00
Haruki NAOI 11d9a286c1 Merge remote-tracking branch 'remotes/origin/rm894_assertion' into sp3_master 2018-05-09 20:29:14 +09:00
jftt_wangshanshan 0928f049bb Fix cqi_req_flag, to prevent continously schedule cqi after set it to 1 and before actually receive it at the right subframe. 2018-05-09 18:22:22 +08:00
jftt_wangshanshan f1cd05c1e0 Fix ul config pdu info setting missing problem 2018-05-09 11:56:45 +08:00
Raymond Knopp ea784f2b4b full IF4p5 simulation working 2018-04-29 09:35:23 -07:00
jftt_wangshanshan ebbc7fadd0 add previous fix to non-ue-extension 2018-04-26 09:29:29 +08:00
jftt_wangshanshan a60ac11320 fix ul config pdu type while there are cqi,harq and ulsch at the same time. 2018-04-25 17:05:12 +08:00
jftt_wangshanshan 0889d79969 Modify CQI scheduling strategy 2018-04-23 09:45:08 +08:00
Raymond Knopp 861d06e855 UE directory splits, creation of UE-specific files, common UE/eNB files and extraction of UE/common components from eNodeB files. renaming of files to minimize common names across directories (i.e. defs.h, vars.h, extern.h) 2018-04-22 11:33:43 -07:00
Wu Jing 22da1eac0c fix rm894 bug 2018-04-17 20:12:16 +09:00
Bi-Ruei, Chiu 5c23af773a Compare version number using MAKE_VERSION macro to provide better SW configuration: 
1. Previous SW configuration for different RRC version relies on whether macro Rel10,
   Rel14 defined or not by checking #ifdef Rel14 or #if defined(Rel10) || defined(R14).
   Whenever there is a newer RRC version, e.g. Rel15, it will be very a tedious and
   error-prone job to add defined(Rel15) in every place.

2. Some RRC messages are defined in release 13 instead of release 14, NB-IoT
   feature is one of such example. Our code shall reflect this fact instead of using
   an afterward version number in software configuration.

3. Some RRC messages or some fields of certain RRC messages are added in the middle
   a release, e.g. SystemInformationBlockType1_v1310_IEs_t defined in RRC 13.1.0
   and RRC 9.2.0 made some changes to SIB12 and SIB13 so we have sib12_v920 and
   sib13_v920 fields in SIB12 and SIB13's struct.
   We need a finer grain of control when using ASN1 from different RRC version.

4. S1AP also has this problem that it use UPDATE_RELEASE_9 and UPDATE_RELEASE_10 to
   differentiate between various S1AP version.

This commit propose using MAKE_VERSION(x,y,z) to designate the version number and
modify current conditional compilation accordingly.

Note: 2018/04/16, Modified based on Cedric's comment.
 2018-04-16 12:32:29 +02:00
Wu Jing a32857885a Merge branch 'sp3_tdd_config1' of http://10.37.145.15:8000/gitlab/vran/release_enb into sp3_tdd_config1 2018-04-10 17:32:31 +09:00
Wu Jing b7a8889741 fix Assertion because of round==8 in extract_harq when re-establishment happen 2018-04-10 17:31:52 +09:00
Masayuki HARADA 5e4f0a924d Merge branch 'ues_test' into sp3_tdd_config1 
# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
 2018-04-09 20:21:24 +09:00
Masayuki HARADA f8f149fd1b Fix calculation of ul_total_buffer. 2018-04-09 20:05:45 +09:00
Masayuki HARADA 7ced1a2eb1 Remove nb_rb = 64 form rb_table in SCD. Because PHY UL cannot decode nb_rb = 64. 2018-04-09 19:56:33 +09:00
jftt_wangshanshan 1846c56d54 Add the missing part of DAI setting and harq_pid calculation to OAI SCD 2018-04-04 15:54:44 +08:00
Wu Jing 6d21972e43 merge ues_test branch 2018-04-03 17:24:27 +09:00
Masayuki HARADA 5646b07870 Fix ul scd problems. 
・Delete double BSR calculation.
・change TBS for mcs setting bit to byte.

(cherry picked from commit 39cd022424ebe98c95be32cbb4127aa9d0e0ff3b)
 2018-03-26 19:30:12 +09:00
Cedric Roux d393814772 bugfix: send UL NACK (on PHICH) at the right place 
The PHICH was not programmed for the last round (4) because it was
not programmed in rx_sdu but in schedule_ulsch_rnti, only in case
of a programmed retransmission (there is obviously no retransmission
programmed after the last round).

The case of Msg3 is not handled. To be done somehow.
 2018-03-19 10:28:16 +01:00
jftt_wangshanshan 2505f15eab Fix previous problem for no-ue-extension version of schedule_ulsch_rnti 2018-03-12 12:49:34 +08:00
jftt_wangshanshan 485b7fc060 Fix the defecitve process while there is an uci scheduled before an ulsch. 2018-03-12 11:07:59 +08:00