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
Rohit Gupta
eb690c8919
merge develop + resolve conflicts
2016-02-10 19:24:13 +01:00
Aikaterini
d209fe5dd8
merge develop into branch
2016-02-03 19:27:05 +01:00
Rohit Gupta
a5f21b0488
Merge branch 'develop' into feature-43-doxygen
2016-02-02 13:06: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
Florian Kaltenberger
eb03e01faf
dlsim compilation issue fixed
2016-01-21 20:58:29 +01: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
Rohit Gupta
2224225ae8
Merge branch 'develop' into enhancement-57-UHD-interfacing
2016-01-13 16:42:28 +01:00
Florian Kaltenberger
9dfa3c9449
small fix for mbmssim (a previous commit enabled XFORMS by default, which was not up to date in mbmssim)
2016-01-12 13:46:57 +01:00
Florian Kaltenberger
f0982d3147
small performance improvements for perfect channel estimation in dlsim
2016-01-08 15:44:52 +01:00
Florian Kaltenberger
6011553117
fixing issue 71 (bug in freq_channel)
2016-01-08 12:02:42 +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
gauthier
e44146b708
handling of timing advance is improved. MAC retrieves timing advance from phy once prior to DL scheduling and clears the statistic in PHY. A timer for controlling the timing advance periodicity was introduced.
2016-01-06 11:37:26 +01:00
Rohit Gupta
8e1b5d26d4
doxygen support for USRP PHY Interface
2015-12-31 09:06:10 +01:00
Raymond Knopp
7f53f84c00
Tested modifications for 23.04 Ms/s 100 PRB transmission/reception (Downlink). This will reduce I/Q acquisition times for 20 MHz channels. new option in dlsim (-E) for testing 1536-point DFT instead of 2048 for this lower sampling rate. Added normalization to idft1536. Should also be added to dft1536 later.
2015-12-29 20:34:47 +01:00
Raymond Knopp
7f2dd71e68
Merge remote-tracking branch 'origin' into enhancement-57-UHD-interfacing
2015-12-29 20:29:47 +01:00
Raymond Knopp
93bf163071
commit prior to merge with develop
2015-12-29 20:29:26 +01:00
Raymond Knopp
1ff2c0d3f4
Merge branch 'develop' into feature-38-bladerf
...
Conflicts:
targets/RT/USER/lte-softmodem.c
2015-12-27 11:42:41 +01:00
Raymond Knopp
596b0fd1c5
Merge branch 'develop', remote-tracking branch 'origin' into feature-38-bladerf
2015-12-25 09:57:51 +01:00
Cedric Roux
3d0a6e4032
fix a bug in dot_product. The return was done before _mm_empty()
2015-12-22 13:28:05 +01:00
gauthier
cf8645d8cd
Limitation of non SI DLSCH allocations in subframe 0/5 to PRBS not around DC (avoid puncturing from PBCH). Placement of SI around DC instead of randomized allocations. Placement of RA allocations at PRB 0-3. Tested DL throughput on 5 MHz to 16 Mbit/s in TM1.
2015-12-21 19:05:28 +01:00
gauthier
a59cabd1dd
Merge branch 'develop' into bugfix-48-L1L2signaling
...
Conflicts:
openair1/SCHED/phy_procedures_lte_eNb.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
2015-12-21 18:45:27 +01:00
Florian Kaltenberger
9dd329d842
Merge branch 'hotfix-58-bfly3bug' into 'develop'
...
Applied patch to lte_dfts.c (inline function cmacc for x86) to correct bug in ibfly3
See merge request !7
2015-12-17 14:52:31 +01:00
gauthier
b0a54d8c7e
fix of PUCCH statistic tracking with signal scope
2015-12-17 09:44:38 +01:00
gauthier
f5a7184185
Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/proto.h
2015-12-16 17:26:12 +01:00
gauthier
ede2152862
Merge branch 'develop' into bugfix-48-L1L2signaling
...
Conflicts:
targets/ARCH/COMMON/common_lib.c
targets/RT/USER/lte-softmodem.c
2015-12-16 11:12:28 +01:00
Rohit Gupta
40f242094f
modified due to compilation error
2015-12-14 16:38:10 +01:00
Cedric Roux
7290d1bc89
Merge branch 'develop' into bugfix-56-UE_category3_throughput
2015-12-07 12:08:20 +01:00
Rohit Gupta
ef498d78b1
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2015-12-06 23:12:26 +01:00
Raymond Knopp
cb0eabe7df
updated unitary simulations for new CCE interfaces. Cleaned up warnings in dlsim/pdcchsim/ulsim.
2015-12-05 02:28:21 -08:00
Cedric Roux
a31432e37e
some cleanup
2015-12-04 09:15:08 +01:00
Cedric Roux
f630fc5863
Merge branch 'develop' into bugfix-56-UE_category3_throughput
2015-12-02 08:38:10 +01:00
Florian Kaltenberger
9eeff7210d
Merge branch 'bugfix-40-channel_bandwidth' into develop
2015-11-30 17:00:09 +01:00
Raymond Knopp
1fc396f57d
Merge after bad rebase
...
Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling
Conflicts:
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
openair1/SCHED/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.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/proto.h
openair2/PHY_INTERFACE/defs.h
2015-11-29 01:06:14 -08:00
Raymond Knopp
f48d10ba3e
Added DLSCH scheduling for subframes 0 and 5. Changes in MAC scheduling data structure to keep track of VRB allocations from SI,RA when scheduling regular DLSCH
2015-11-29 00:37:04 -08:00
Raymond Knopp
f7c67795ff
CCE Allocation in MAC, rebase from develop. Frame number limitation to 1024 for non-real time targets (caused bad bug in oaisim).
2015-11-25 13:49:40 -08:00
Raymond Knopp
b10937db82
Moved CCE allocations from PHY to MAC and updated MAC interfaces for BCCH/RA/UE-SPEC scheduling.
2015-11-24 14:35:20 -08:00
Raymond Knopp
e3030b0f9f
corrected HARQ ACK/NAK handling for TDD, in openair1/SCHED/phy_procedures_lte_common.c.
2015-11-24 14:35:20 -08:00
ABEILLE
4f35207900
merged in changes from abeille (modifications on final svn version)
2015-11-24 14:35:20 -08:00
Raymond Knopp
ccef9862fa
nCCE changes prior to rebase
2015-11-24 14:34:32 -08:00
Cedric Roux
bae7f1ed2c
Merge branch 'develop' into bugfix-56-UE_category3_throughput
2015-11-23 16:56:06 +01:00
Florian Kaltenberger
3d21f622f7
Merge branch 'develop' into bugfix-40-channel_bandwidth
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/proto.h
2015-11-23 11:58:44 +01:00
Cedric Roux
f14a401f27
Manage free downlink HARQ processes with a circular list.
...
The oldest PID (the PID that was used the longest
TTI ago) is at the head and is the next one that
will be used.
No test is done to check that when a process is
allocated it is at least N TTIs old, but some quick
thinking strongly leads to the 'conclusion' that N
won't be smaller than 8, which seems to be what
cat3 UEs require to function properly in the downlink
direction (from the eNodeB to the UE).
2015-11-23 11:57:03 +01:00
Rohit Gupta
4b7dda33c2
Merge branch 'feature-34-test_framework' into develop
2015-11-23 11:18:53 +01:00