Commit Graph
330 Commits
Author SHA1 Message Date
Raymond Knopp 15cd4ab077 cleanup for Mdlharq usage/meaning 2016-04-06 11:27:19 +02:00
Raymond Knopp b511419090 resolved residual warnings after merge with develop (no warnings again for lte-softmodem) 2016-04-01 09:17:37 -07:00
Raymond Knopp e71aebc603 Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts:
	openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/openair2_proc.c
	openair2/RRC/LITE/rrc_eNB.c
	openair3/NAS/UE/API/USIM/usim_api.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
2016-03-31 14:36:12 -07:00
Cedric Roux 20b6fee632 remove more warnings 2016-03-27 13:36:37 +02:00
Raymond Knopp 1d3ce6d99c Merge branch 'cleanup' into bugfix-48-L1L2signaling
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/COMMON/common_lib.c
2016-03-27 03:09:22 -07:00
Raymond Knopp aab91dd0d4 removal of MAC_INTERFACE directory and its consequences 2016-03-27 02:50:47 -07:00
Cedric Roux 77363df00b remove #warning lines (comment them out) 2016-03-26 22:52:19 +01:00
Cedric Roux 04eed3bd6e remove "unused variable" and "set but not used" warnings 2016-03-25 23:58:58 +01:00
Cedric Roux 3f8c74caba avoid duplicate #define 2016-03-25 22:26:40 +01:00
Raymond Knopp b1e28edd63 Merge branch 'enhancement-43-AVX2' into bugfix-48-L1L2signaling
corrected some additional FFT related issues from AVX2 merge when running with real-time MODEM.

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
2016-03-20 23:37:06 +01:00
Raymond Knopp c0f6881c15 fixes after merge 2016-03-20 22:07:17 +01:00
Raymond Knopp 1d7728b4d8 Merge remote-tracking branch 'origin/develop' into enhancement-43-AVX2
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/MODULATION/ofdm_mod.c
	openair1/PHY/TOOLS/lte_dfts.c
2016-03-20 21:46:13 +01:00
Raymond Knopp bed47a441d activated 8-bit LLR decoding for DLSCH. added gtkw configuration for UE usrp. 2016-03-20 21:24:38 +01:00
Raymond Knopp 84a1c7377b Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts:
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
2016-03-17 17:47:16 +01:00
Florian Kaltenberger ede2d8e672 small bug in scope 2016-03-16 15:51:42 +01:00
gauthier 26f5d0d93d more changes to uplink scheduling and vcd logging 2016-03-15 17:41:06 +01:00
Raymond Knopp d9e40977ed changes to VCD logging for UL debugging 2016-03-13 22:58:00 +01:00
Florian Kaltenberger 3b4a5f25ec Merge remote-tracking branch 'origin/develop' into enhancement-64-phy_test
Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/SIMU/USER/oaisim_functions.c
2016-03-09 09:08:00 +01:00
Florian Kaltenberger 0a8a6c44a5 Merge branch 'develop' into enhancement-64-phy_test
Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
2016-03-08 15:36:32 +01:00
Raymond Knopp c48f074aae changes in BSR handling in eNodeB. UL throughput on 5 MHz is 8 Mbit/s (mcs 19, 20 PRB). MCS 20 is not working for an unknown reason. 2016-03-06 23:57:42 +01:00
Aikaterini 8f0ac37eda modifications in UE NAS to allow OAI UE to connect to. Note this is hard-coded in NAS, it will no longer work with openairCN. To be fixed before merging into develop branch
.
2016-03-02 20:58:20 +01:00
Florian Kaltenberger 0b58a7e86e Merge branch 'develop' into hotfix-81-oaisim
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/initial_sync.c
	openair1/SCHED/phy_procedures_lte_ue.c
2016-03-01 15:20:24 +01:00
Raymond Knopp f6beede730 fixed bug in generate_RIVtables for 20 MHz distributed VRB allocations (openair1/PHY/LTE_TRANSPORT/dci_tools.c) 2016-02-25 09:30:44 -08:00
Aikaterini 33d9e8f2b5 Merge branch 'develop' into bugfix-48-L1L2signaling 2016-02-19 15:54:33 +01:00
Florian Kaltenberger 8984944444 fixing a bug in cmult_vv, removing unused code. 2016-02-19 11:47:25 +01:00
Raymond Knopp cac00e34e1 temporary commit for debugging on another computer 2016-02-19 10:06:58 +01:00
kaltenbe 80fe53c2f5 Merge remote-tracking branch 'origin' into bugfix-48-L1L2signaling 2016-02-17 14:03:47 +01:00
kaltenbe d9ec978c9c Merge remote-tracking branch 'origin/develop' into enhancement-74-SoDeRa
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/COMMON/common_lib.h
	targets/RT/USER/lte-softmodem.c
2016-02-16 15:45:12 +01:00
kaltenbe 92987e4c9b small modifications in lms_lib.cpp
added configuration file for lowband of SoDeRa
2016-02-14 20:31:38 +01:00
kaltenbe 051a4e2aa5 added Si5351C directory
changes in lmslib.cpp
2016-02-11 10:04:36 +01:00
Florian Kaltenberger 6412b22658 phy test for UE 2016-02-11 09:41:37 +01:00
Rohit Gupta eb690c8919 merge develop + resolve conflicts 2016-02-10 19:24:13 +01:00
Florian Kaltenberger b60c3c9556 phy test for UE first version 2016-02-09 10:23:57 +01:00
Florian Kaltenberger 36fb0aae16 initial synch gain control measurement when unsynchronized reverted to take measurement around PSS 2016-02-09 10:18:00 +01:00
Florian Kaltenberger 41e3429e65 reverting to LOG_D in gain control 2016-02-08 16:53:54 +01:00
Florian Kaltenberger 392e38ab22 Merge branch 'develop' into enhancement-64-phy_test
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
2016-02-04 14:49:14 +01:00
Florian Kaltenberger 1769eca225 improved gain control when not synched 2016-02-04 14:42:16 +01:00
Aikaterini d209fe5dd8 merge develop into branch 2016-02-03 19:27:05 +01:00
gauthier 2a91fa88c7 bugfix in phy_scope_lte
increase maximum users in eNodeB to 16
2016-02-03 11:17:27 +01:00
Rohit Gupta a5f21b0488 Merge branch 'develop' into feature-43-doxygen 2016-02-02 13:06:31 +01:00
kaltenbe 40656e0e49 some changes in logging for XFORMS and UL scheduling (activation in all subframes and retransmissions only via PHICH) 2016-02-01 17:43:31 +01:00
Florian Kaltenberger 8bbcfbe5cb changing LOG_E to LOG_W in rx_pucch_emul when UE is not found (this might happen during attach procedure but is ok since nothing will happen) 2016-02-01 14:18:00 +01:00
gauthier 8402a1a30e lte_eNB_measurements 2016-01-28 11:35:36 +01:00
Raymond Knopp 015187e578 AVX2 optimization activated for gamma computation in 16-bit turbo decoder (single-codeword) 2016-01-23 08:59:36 -08:00
aikaterini.trilyraki a384b91e91 pull from develop 2016-01-18 15:16:02 +01:00
Rohit Gupta 043e771ed7 resolve conficts due to merge from develop 2016-01-17 20:18:44 +01:00
Rohit Gupta 9ab924399c Merge branch 'develop' into feature-38-bladerf
Conflicts:
	cmake_targets/CMakeLists.txt
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2016-01-15 12:36:31 +01:00
Raymond Knopp ee1d0d56ad added noise-figure trace in stats. 2016-01-07 17:38:56 +01:00
Raymond Knopp 54a21b633d forgot to add lte_param_init.c 2016-01-07 10:57:10 +01:00
gauthier 574399fa43 some formatting changes in physcope for eNodeB. fixes for joint SR/ACK-NAK detection. 2016-01-06 16:33:04 +01:00