Commit Graph
93 Commits
Author SHA1 Message Date
laurent dfafa90037 big merge with develop 2020-04-14 18:02:45 +02:00
Robert Schmidt 5443c7a792 fill_nfapi_dlsch_config() takes index for filling 2020-04-06 13:56:31 +02:00
Robert Schmidt 9b4725ad0b Shortened UL-PP, remove CC and slicing 2020-04-06 13:56:31 +02:00
Robert Schmidt eeaa5a99d0 RLC: _req() accepts max TB size, _ind() not
Previously, the various rlc_*_ind() functions had a parameter to enable
the MAC to specify the max TB size that a subsequent call to the
corresponding rlc_*_req() (!) function would return. This patch removes
this parameter from the rlc_*_ind() functions and makes the parameter
working that is already in the rlc_*_req() functions.
2020-04-06 13:43:52 +02:00
Robert Schmidt 97a1bd105c store_dlsch_buffer() works per CC, checks only active LCs
store_dlsch_buffer() puts the RLC buffer status results in the
UE_TEMPLATE, which is per-CC. Since the DLSCH scheduler works per-CC,
too, we pass the right CC. However, this is not strictly necessary, as
we could do this once before every CC, and it might be updated.
2020-04-06 13:43:52 +02:00
Robert Schmidt 8ffe5b4920 Rename UE_list_t to UE_info_t, UE_list_t separate struct
UE_list_t is now used as a separate list. It can be e.g. used in the
scheduler to mark groups of users. The original UE_list_t is renamed to
UE_info_t to reflect that it is a container for information about UEs.
2020-04-01 10:47:02 +02:00
Robert Schmidt fd6618dc1c Simplify preprocessor, retain functionality
* Simplify store_dlsch_buffer()
* Simplify assign_rbs_required()
* Simplify dlsch_scheduler_pre_processor_partitioning()
* Simplify dlsch_scheduler_pre_processor_accounting() and dlsch_scheduler_pre_processor_accounting_allocate()
* Simplify allocation printing

The original functions used in the fairRR scheduler have been moved to
eNB_scheduler_fairRR
2020-04-01 08:49:26 +02:00
Robert Schmidt 4462e2d710 Remove unused/broken code in preprocessor
* Remove MIMO_mode_indicator: it is simply not used ATM
* Remove min_rb_unit as parameter: function auto-detects
* Remove commented code
* Remove slice sharing/multiplexing: it is broken
* Remove UE sorting, add UE with add_new_ue() in MAC
  - UE sorting is useless overhead on every iteration, instead it should
    be governed by a scheduling algorithm (e.g., RR or PF)
  - The MAC keeps a UE list and automatically adds a UE
  - UE_list empty, set head to -1
* Remove slice_positioning: the slicing functionality is broken
* Remove unused/untested code
2020-04-01 08:49:26 +02:00
Robert Schmidt 8d3fa4dc22 Simplify dlsch_scheduler_pre_processor_reset()
The original reset() function used in fairRR has been moved to
eNB_scheduler_fairRR.c
2020-04-01 08:49:26 +02:00
Robert Schmidt ff766786a8 Remove mbsfn_flag from schedule_ue_spec(), simplify pre_processor interface 2020-04-01 08:49:26 +02:00
laurent 3d15918c14 merge again with develop, compiles only 2020-02-22 14:19:18 +01:00
Raphael Defosseux e7aa071e1b Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr 2020-01-10 15:35:54 +01:00
yilmazt 1b1648d504 develop-nr up-to-date 2019-12-17 18:23:10 +01:00
Javier Morgade a61984a3fd Merge remote-tracking branch 'origin/develop' into oai_test_fed4fire_old 2019-12-14 09:54:10 +01:00
laurent 7672257b2f asn1 encoding memory overflow 2019-12-05 04:56:42 +01:00
laurent 80cd6940af modifications 2019-12-05 04:53:56 +01:00
Raphael Defosseux baf5f1ed93 Merge remote-tracking branch 'origin/develop' into develop-nr_cppcheck 2019-11-22 11:18:28 +01:00
masayuki.harada c8b638184c Fix scheduling PUSCH when CQI has not been received for a long time in fairRR scheduler. 2019-11-08 10:05:14 +01:00
masayuki.harada c4255f0dd4 Fix cqi_req clear timing, and schedule PUSCH when CQI has not been received for a long time in fairRR scheduler. 2019-11-08 10:05:02 +01:00
yilmazt cd098f3971 develop&-nr merge 2019-10-30 16:17:41 +01:00
laurent 0b7489b122 astyle only 2019-10-08 16:15:29 +02:00
laurent 445cf84e94 clean up wireshark traces 2019-10-08 16:04:10 +02:00
laurent b7908ec25d bug fixies 2019-10-08 14:27:39 +02:00
frtabu b9b4d05e41 remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value) 2019-09-23 19:46:44 +02:00
Javier Morgade dc14cdc665 *L2 procedures to enable mixed unicast/broadcast operation at ENB implemeted:
-MBMS scheduler developed (oneFrame allocations implemented at this time)
	-UE DSLCH schedulers updated: if an eMBMS session running UE DTCH, DCCH will be only scheduled at non MBSFN sufbframes
	-eMBMS L2 procedures implemented
	-Dedicated MBMS PDCP pipes src/sink enabled (only for TUN)
	-BUGFIX eMBMS MAC procedures (wrong indexing at few loops)
	-ENB FAPI updated to enable dynamic MBSFN configurations through M2AP (RRC<->MCE)

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:23:30 +02:00
Raphael Defosseux 729aab5798 Merge remote-tracking branch 'origin/nfapi_cleanup1' into develop_integration_2019_w30 2019-07-24 08:29:01 +02:00
Raphael Defosseux 4eee2460f9 Merge remote-tracking branch 'origin/bugfix-pucch-power-estimation' into develop_integration_2019_w30 2019-07-23 13:02:42 +02:00
Cedric Roux d1fdbfedbc fix power estimation
Some computation has been fixed in PUCCH reception.

SNR has been fixed, uses measurement instead of
a fixed value for the noise.

normalized_rx_power and target_rx_power have been removed,
replaced by snr and target_snr. All the files using those
variables have been updated.
2019-07-19 17:10:42 +02:00
Haruki NAOI 53d5547e67 fix compilation error. 2019-07-17 10:34:23 +09:00
Haruki NAOI e41da445ef Fix: CCE allocation problem when containing DCI_format_0. 2019-07-17 09:10:53 +09:00
Wu Jing 3492f60407 Fix: dlsch RBG allocation issue. 2019-07-16 19:45:33 +09:00
Haruki NAOI 25a1e76a0e Fix: avoid pthread_mutex_lock abort.
This commit is workaround. This issue realy occures with the following log.
lte-softmodem: ../nptl/pthread_mutex_lock.c:81: _pthread_mutex_lock: Assertion `mutex->_data.__owner == 0' failed.
2019-07-16 19:23:29 +09:00
Haruki NAOI b557f8960b Fix: remove useless mutexlock. 2019-07-16 19:19:32 +09:00
Haruki NAOI 35385d84aa Fix: uplane_inactivity_timer dose not count time correctly about TDD.(rm2174) 2019-07-16 19:13:47 +09:00
Haruki NAOI 762eef6599 Fix: avoid RLC segmentation reception of RRCConnectionSetupComplete. 2019-07-16 19:07:43 +09:00
luaihui 94af4d0eca Merge remote-tracking branch 'origin/OAI_develop' into oai_develop_nfapi 2019-07-09 12:45:45 +09:00
Wu Jing 4239dacd02 Merge branch 'OAI_develop' into oai_develop_nfapi 2019-07-02 22:23:35 +09:00
laurent 924e10f73a fix rfsim ue initial sync and legacy OAI C struct syntax 2019-07-01 15:17:07 +02:00
Dong Anyuan c65e3d2eea Fix Coverity Scan CID 300371 (Overrunning array rb_table of 34 bytes at byte offset 255 using index rb_table_index (which evaluates to 255).) 2019-06-20 11:03:41 +09:00
Wu Jing d5d1c19588 add the tag in bch and dl in fairRR 2019-06-08 13:31:15 +09:00
He Shanyun c227a34da1 fix tbs calculation error in ul scheduler 2019-05-28 16:21:03 +09:00
He Shanyun 3cc917ab38 set cqi request on the correct subframe 2019-05-28 14:25:51 +09:00
He Shanyun 72aa68137d fix mcs while nfapi mode because it is not correct if setting mcs to 10 2019-05-28 13:54:23 +09:00
Wu Jing 6b1ab26cea fix issue that RRCConnectionSetupComplete does not come in nFAPI mode and fairRRSCD 2019-05-28 12:17:29 +09:00
Cedric Roux 9ea7073c68 Merge remote-tracking branch 'origin/fixes-mac-scheduler-2019-w13' into develop_integration_2019_w15
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2019-04-15 10:50:38 +02:00
frtabu 30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
Cedric Roux 35a38fbee8 bugfix: fix T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION parameters 2019-03-30 15:13:37 +01:00
Robert Schmidt 1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +01:00
Robert Schmidt 544d80c40d Merge branch 'develop' into feature-127-protocol-split 2019-02-25 18:06:35 +01:00
nepes 669724c100 Merge branch 'eMTC-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into eMTC-testing 2019-02-25 13:30:14 +01:00