Commit Graph
131 Commits
Author SHA1 Message Date
Robert Schmidt 0b91791f67 Use (std) bool instead of custom bool types
OAI is riddled with boolean_t, FALSE, TRUE, etc. This makes no sense, as
there is a standard bool type, and could lead to nasty bugs if a
definition of a bool is non-standard (0 == false, true == !false). This
commit removes all non-standard bools in the whole project.
2022-06-27 10:07:48 +02:00
Robert Schmidt 5bdaeb5718 Stop scheduling DL on UL failure or out of sync 2022-02-08 14:45:05 +01:00
Robert Schmidt 388cfafea8 Stop scheduling in UL after ul_failure_timer 2022-02-08 14:45:05 +01:00
Robert Schmidt eca14f6ec9 Schedule UL 5 RBs at MCS 10 on inactivity 2022-02-08 14:45:00 +01:00
Laurent THOMAS 473105a7ba remove false detection of SEGV in CI 2021-12-30 21:51:25 +01:00
Robert Schmidt 6c823168fe Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d 2021-12-24 10:13:27 +01:00
Melissa Elkadi 9b16c1d860 Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:

 - mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
 - rrc_data_req vs. nr_rrc_data_req
 - mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
 - rrc_data_req_ue vs. rrc_data_req_nr_ue
 - rrc_data_req vs. nr_rrc_data_req

The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.

Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.

Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Laurent OpenCells a03ee3548f merge latest develop 2021-07-26 15:03:47 +02:00
Melissa Elkadi 8b2b78e477 Fixed remote_addr.sin_port
For some reason the htons invocation got deleted which broke
the VNF P7 interface.

Also fixed some build issues, not sure how these got onto the
develop branch to begin with.
2021-02-26 15:57:35 -08:00
Raymond Knopp a30eabbe21 OTA testing 4G, configuration parameters for fairRR scheduler and common parameters for both fairRR and default 2021-02-11 13:43:25 +01:00
Raymond Knopp 37ef411c2e traces for fairRR scheduler 2021-02-10 14:14:29 +01:00
Raymond Knopp addd891a2f testing on outdoor network 2021-02-06 14:55:13 +01:00
Raymond Knopp 6ae26ee6dc minor changes after merge 2021-02-02 20:45:46 +01:00
Raymond Knopp 4e9afb30b0 Merge remote-tracking branch 'origin/develop' into oairu 2021-02-02 12:09:56 +01:00
Raymond Knopp 3cb6892987 CU/DU tested with phoenix + B38 RRU (CU and DU via lo) 2021-02-02 11:15:13 +01:00
Raymond Knopp a7ac979a57 stats adjustment 2021-01-14 23:32:52 +01:00
Raymond Knopp c3a9d018a8 PDCP statistics logs, ulsim updates after recent changes 2021-01-14 14:19:25 +01:00
Raymond Knopp 09a63cb998 logging and unitary compilations 2021-01-05 22:46:41 +01:00
Raymond Knopp 7cbf24d36c updates for tracing 2021-01-03 12:28:24 +01:00
Raymond Knopp 7185b95591 debugging with AW2S RRU. Added statistics for ULSCH/UCI in PHY and MAC. 2020-12-24 16:10:03 +01:00
zhenghuangkun 88699deb81 Merge branch fujitsu_lte_contribution into lte_uplink_improvement 2020-11-30 18:56:26 +09:00
masayuki.harada b54c32b70d Change UL DCI aggregation level by DL cqi.
(cherry picked from commit 175c59ae3aedf612777cd1c8c88b6d6f254b9334)
2020-11-30 10:45:34 +09:00
masayuki.harada cb927c7f9a Add statistics logs.
(cherry picked from commit cf8f14edf4a261e1df72579423786d39ba6d97f9)
2020-11-27 17:06:11 +09:00
Haruki NAOI deeded689d Fix: guard multiple UL scheduling for same UE.
(cherry picked from commit 57caca9ba87fda3f73aa30d86f4af01a6062224c)
2020-11-27 15:24:26 +09:00
masayuki.harada 9ad810bab4 Fix ul_cqi and tpc filtering.
(cherry picked from commit 120ea0950e1f52c1c5dd1d0dd4f7080e66d7ee93)
2020-11-27 12:37:09 +09:00
zhenghuangkun df5e22efee Modify CQI timer to 64 subframe 2020-11-27 11:09:56 +09:00
zhenghuangkun d00297aeb9 Modify UL timer and CQI timer to 64 subframe 2020-11-27 11:04:20 +09:00
Kuroiwa Kenichi 80f83843f0 Initialize scheduled_ul_bytes
(cherry picked from commit 4a18e26f8c1dfb80a5af2fac4104b06b648a598c)
2020-11-27 10:55:16 +09:00
Kuroiwa Kenichi 934cc715f8 Initialize scheduled_ul_bytes
(cherry picked from commit b0d6c5150db520bd7840d1604c3f82a0b59bc218)
2020-11-27 10:22:48 +09:00
Haruki NAOI 179775b72c Temporary: change tpc filter.
(cherry picked from commit d82fc4805ef9032c9bfd9705fef702a6e130f7b2)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
2020-11-27 10:08:27 +09:00
Haruki NAOI 52dfba49cd Fix: smooth ULSCH AMC and TPC control.
(cherry picked from commit 56720c68864f6b04409deb00676e59a41c8f050b)
2020-11-27 10:07:56 +09:00
Haruki NAOI b573fd4dbd Fix: The remaining UL buffer size is incorrectly calculated and UL scheduling does not occur. (scheduled_ul_bytes is not subtracted correctly when receiving NACK rarely.)
(cherry picked from commit 2fb4823b57320c4c4e4d800ae9bb0570f18ad353)
2020-11-27 09:44:39 +09:00
masayuki.harada 05eb88f068 Fix scheduled_ul_bytes size remain when no crc report has come from L1.
(cherry picked from commit ce10221c2761fb3058ccb77b73ba87f97d5e2cd2)
2020-11-27 09:41:56 +09:00
Haruki NAOI ffdc67daa4 Add: PUSCH AMC using average BLER.
(cherry picked from commit 1ab0a979fdbcc933ae249838841dc7f61c0e5aba)
2020-11-26 18:44:44 +09:00
Haruki NAOI 55207a5062 Fix: add SNR filter for ULSCH AMC. 2020-11-26 18:28:56 +09:00
Haruki NAOI 66f99a9020 Fix: ULSCH AMC by instantaneous SINR value. 2020-11-26 18:21:13 +09:00
masayuki.harada 04d6de7d58 add variables TPC command interval and forgetting filter of UL SNR. 2020-11-26 18:04:14 +09:00
Thomas Schlichter 3514caddc2 minor warning fixes 2020-08-06 09:06:37 +02:00
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