Commit Graph
21 Commits
Author SHA1 Message Date
Raymond Knopp 1f274a7b04 Merge remote-tracking branch 'origin' into enhancement-10-harmony
Merge in develop too.
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/3gpplte_sse.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
	openair1/SCHED/phy_mac_stub.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/RT/USER/lte-softmodem.c
2016-06-21 23:36:23 -07:00
Cedric Roux 310b027acd Merge remote-tracking branch 'main/develop' into T
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-softmodem.c
2016-06-10 11:49:59 +02:00
Raymond Knopp e198a7423f updated unitary simulations and corrected bugs in threading and scheduling of L1 procedures. 2016-05-27 10:21:23 -07:00
Cedric Roux 3e38cd2651 add frame parameter to rx_pucch for the T logger 2016-05-11 16:35:27 +02:00
Raymond Knopp ce454d646f unitary simulations after ./build_oai -s 2016-04-02 18:24:33 +02:00
aikaterini.trilyraki a384b91e91 pull from develop 2016-01-18 15:16:02 +01:00
Raymond Knopp 93bf163071 commit prior to merge with develop 2015-12-29 20:29:26 +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
ABEILLE 33860c1604 merged in changes from abeille (modifications on final svn version) 2015-10-19 19:29:04 +02:00
Florian Kaltenberger 5c30151d28 fixes issue 40 2015-10-13 23:29:07 +02:00
gauthier c7518ecf42 SVN to GIT migration (removed EPC software, updated mailing list address in all files)
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7885 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-10-06 16:24:54 +00:00
kaltenbe 3cff713ee8 fix for pucchsim (from cedric)
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7808 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-09-08 13:05:31 +00:00
Raymond Knopp cd92d1eb58 git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7391 818b1a75-f10b-46b9-bf7c-635c3b92a50f 2015-05-08 20:09:26 +00:00
Raymond Knopp d6cdcb915b removed PHY/TOOLS/fft.c and all uses of this FFT implementation. All are replaced by the faster versions in PHY/TOOLS/lte_dfts.c
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7390 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-05-08 19:33:10 +00:00
Lionel Gauthier 059a0a3fdc astyle --recursive --indent=spaces=2 --style=kr --indent-col1-comments --break-blocks --convert-tabs --max-code-length=200
This is done for better merging branch/LG_PRE_RELEASE_0.3 into trunk (same process is applied on this branch)

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7073 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-04-09 09:29:12 +00:00
Florian Kaltenberger a9cc4323e7 removing directories openair1/ARCH and openair1/LAUNCH_SRIPTS and all references to it
(the only variable that was used is number_of_cards, which is now in openair1/PHY/[vars,extern].h)


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6096 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-11-25 08:31:06 +00:00
ghaddab 56c3197b09 License Corrected
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5713 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-08-13 16:22:56 +00:00
ghaddab da8a799137 License updated
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5711 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-08-13 13:25:17 +00:00
Raymond Knopp 7b0d904dcb git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5645 818b1a75-f10b-46b9-bf7c-635c3b92a50f 2014-08-04 16:18:26 +00:00
Lionel Gauthier c60dc45b2b Changed uX, uX_t sX, sX_t to uinX_t
Cleaned some PDCP/driver code

types parameters and vars

Please see openair2/COMMON/platform_types.h for simple coding rules.

please declare prototypes of functions in .h and include .h files in where the function is used and where it is implemented.



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5096 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-02-28 13:03:10 +00:00
Cedric Roux 56c66c09aa - Fix: avoid infinite loop on mulitcast read thread if no data to read
Pre-ci test passed

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4000 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-06-25 09:05:02 +00:00