Commit Graph
38 Commits
Author SHA1 Message Date
Cedric Roux 20b6fee632 remove more warnings 2016-03-27 13:36:37 +02: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 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 2fe218e91a Moved CCE allocations from PHY to MAC and updated MAC interfaces for BCCH/RA/UE-SPEC scheduling. 2015-11-18 14:18:58 -08: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
knopp 550ef12a5e FK/RK, added power control for PUCCH
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7613 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-06-20 18:46:55 +00:00
Navid Nikaein 6535680c0a add doxygen for MAC and minor updates
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7596 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-06-19 08:29:10 +00:00
Navid Nikaein dc61a35beb add mac-phy interface to doxygen under openair2
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7589 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-06-17 21:59:15 +00:00
Rohit Gupta a49ed5c594 Modified *ONLY* comments in header files for integration with doxygen
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7569 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-06-16 13:49:02 +00:00
Lionel Gauthier fa5d2f5e22 Add subframe in some proc calls
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7480 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-05-28 13:08:53 +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
Navid Nikaein eb91417fc7 * applying patch 11 contributed from S. Held
* add protocol configuration to OCG XML file


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6629 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-02-27 10:35:37 +00:00
Navid Nikaein c76b846beb * fix few bugs in oaisim and UL scheduling
* update the CBA operation (non standard feature)
* update OTG 
* add a set of templates for different combination of packet sizes and inter-departure time
 


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6351 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-01-12 23:54:15 +00:00
Raymond Knopp b72ca3ee20 git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6348 818b1a75-f10b-46b9-bf7c-635c3b92a50f 2015-01-11 18:41:40 +00:00
Florian Kaltenberger c0950c555d updated config files for band 7 for exmimo2 and USRP
fixed bug in lte-softmodem for USRP and other minor updates
other small fixes
tested on EXMIMO and USRP



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5936 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-10-24 14:16:50 +00:00
Florian Kaltenberger 76dda4bfb7 bugfixes in mac_xface prototypes
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5933 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-10-23 14:28:21 +00:00
Florian Kaltenberger e4bd081b07 added N_TA_offset for TDD
added closed loop UE power control (TPC)
updated ulsch_scheduler not to schedule <3 PRBs (this does not work well with cqi_req)
ulsch_concecutive_error_conter now counts over all harq processes
added button to reset stats


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5854 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-10-09 08:07:33 +00:00
Navid Nikaein 2f0646f3c5 * add a ulsch scheduler and preprocessor
* check for false msg3 detection at the MAC layer, and indicate PHY tp cancel the RA proc 
* fix few compilation errors for Rel10


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5824 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-09-30 13:53:36 +00:00
Raymond Knopp 4593a2a3a0 git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5811 818b1a75-f10b-46b9-bf7c-635c3b92a50f 2014-09-28 19:21:03 +00:00
Navid Nikaein 036870ad0d fix the issue with the pre-ci tests
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5756 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-08-25 14:50:52 +00:00
Raymond Knopp cd18c09fc8 git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5740 818b1a75-f10b-46b9-bf7c-635c3b92a50f 2014-08-21 11:51:05 +00:00
ghaddab c23783c702 License corrected
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5714 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-08-14 07:26:42 +00:00
Navid Nikaein 2f2fde581d * Compile Rel10 with component carrier
* Add VCD timing for PDCP, RLC, and MAC
* Update MAC-PHY interface
* update eNB MAC DLSCH scheduler and preprocessor with component carrier
* Add test case for dlsim performance
  


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5708 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-08-12 20:27:30 +00:00
alexandr 5661cba016 * update the function prototypes and vars for RSRP and RSRQ
* change the trigger functions for handover



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5704 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-08-12 09:53:57 +00:00
Raymond Knopp 83c3acd0ae git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5699 818b1a75-f10b-46b9-bf7c-635c3b92a50f 2014-08-11 14:13:04 +00:00
Navid Nikaein 65c84039ad * Update license and header files
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5578 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-07-22 13:43:51 +00:00
Navid Nikaein 8b7143022b * manage control elements in CCCH PDU through rx_sdu function
* add event handler for remote (online) configuration and status monitoring
* update openair config generator (OCG) and scneario descriptor (OSD) with new features contributed by A. Gomes (one source)
* fix the issue with netlink when benchmarking oaisim preformance 
* pre-ci passed except for eMBMS  



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5299 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-05-02 08:38:08 +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
Lionel Gauthier 70920ffd27 abstraction mode is OK
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5092 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-02-26 16:23:44 +00:00
Cedric Roux 874e220e90 git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4689 818b1a75-f10b-46b9-bf7c-635c3b92a50f 2013-12-12 12:25:18 +00:00
Cedric Roux bb52f71432 - Force logs level to 7 in pre-ci
- Output logs from ping/oaisim in two distincts files
- Fix some compiler warnings
- Put assertions in some switch default cases
- Create a wrapper for macphy_exit to display FILE and LINE of the caller
- Enabled -Werror=implicit-function-declaration

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4682 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-12-11 23:26:33 +00:00
winckel 56d45ba31f Fixed warnings.
Moved some direct printf into logging system.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4491 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-11-22 07:30:06 +00:00
Navid Nikaein f18e400960 * merge/add handover procedure for the access stratum (enabled with the -H), status: experimental.
* fix a bug in BSR computation
* add a python script to launch meld if the diff3 in subvsersion/config file is set to the targets/SCRIPTS/svn-merge-meld.py
* pre-ci passed (100%) 


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4309 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-10-30 21:52:26 +00:00
Navid Nikaein 5861085339 * Add relay node types and its eNB/UE procedures
* update the L2 interface
* update eMBMS MAC/PHY to support more than one MBSFN sync area
* update OTG to support different multicast traffic for eMBMS
* pre-ci test passed (100%)
 


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4170 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-09-27 22:53:57 +00:00
Navid Nikaein a0083404b2 * change the mcs limit for DCI format 1A from 7 to 8 in dci_tools.c, supported by MAC
* activate the sencond MBSFNArea when eMBMS relaying is activated
* add wireshark interface for MCH PDUs (Not tested feature)
* pre-ci test passed


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4156 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-09-19 09:30:07 +00:00
Cedric Roux 23e9d2a227 - Fix some compiler warnings
[pre-ci tests passed for 32/64 bits platforms]

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4102 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-08-26 08:59:42 +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