Commit Graph
57 Commits
Author SHA1 Message Date
Robert Schmidt 397d2f4815 Merge commit 'develop' into feature-127-protocol-split
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
Robert Schmidt c1e680dd89 FlexRAN: free memory of statistics reports 2018-11-07 10:58:09 +01:00
Robert Schmidt 836f6c6374 Include statistics flag only when values are written 2018-11-07 10:54:35 +01:00
Robert Schmidt 2fa8c29fd4 Put ue_config MAC and RRC parts in resp. CMs 2018-11-07 10:48:36 +01:00
Robert Schmidt 1fc631e2a4 RAN API RRC part: Change interface to RNTI, change flexran_get_aperiodic_cqi_rep_mode()
* the RAN API RRC part now takes rnti and does not look it up in the MAC every
  time again
* the function flexran_get_aperiodic_cqi_rep_mode() has been changed to return
  a proper protobuf variable, not OAI typedef
2018-11-07 10:48:36 +01:00
Robert Schmidt e0742be747 RAN API flexran_get_num_ues() belongs to MAC, change name 2018-11-07 10:48:36 +01:00
Robert Schmidt 3035781485 Move ue_lc_config message filling into MAC CM 2018-11-07 10:48:36 +01:00
Robert Schmidt b702b415a7 Split enb_config_reply->cell_conf message to PHY, MAC, RRC 2018-11-07 10:48:35 +01:00
Robert Schmidt 33d0ac4982 Simplify MAC FlexRAN agent interface 2018-11-07 10:40:17 +01:00
Robert Schmidt 08b122e3ff FlexRAN: update slice config array dimensions 2018-09-03 18:10:28 +02:00
Robert Schmidt cca5c1b71a FlexRAN: use correct identifiers for PDCP, RRC
* give the correct UE_id instead an index of the protobuf message (they can
  diverge from each other)
* in the PDCP part of the RAN API, the RAN API has to make the conversion UE_id
  (MAC) to UID (PDCP)
* a follow up commit could clean up the interfaces:
  - the MAC functions take the UE_id
  - the RRC functions take the RNTI
  - the PDCP functions take the UID
  this would mean the caller has to find those ID but would decrease
  computations since the RAN API functions do not have to do that themselves
2018-09-03 18:10:28 +02:00
Robert Schmidt 3b80c73f93 FlexRAN: Loop over UEs using UE_id, not index 2018-09-03 18:10:28 +02:00
Robert Schmidt 9399bed23a FlexRAN MAC: align allocated memory for lfds 2018-09-03 18:10:28 +02:00
Robert Schmidt ef0d86564c when sending config report, copy slice config to new mem 2018-09-03 18:10:28 +02:00
Robert Schmidt 7a0c00330b put intra-/inter slice sharing within slice config 2018-09-03 18:10:28 +02:00
Robert Schmidt e94b0bde51 FlexRAN fixes
* properly allocate memory for scheduler name/sorting
* free mem of sc_update, include todo for slice_config
* set has_x to one, add fct whether sorting update necessary
* set n_ul/n_dl to correct value after every loop iteration
* support for delete of multiple slices
* allocate memory for scheduler name in slice_config
* check that we really set the scheduler
2018-09-03 18:10:28 +02:00
Robert Schmidt 0c0e7b6ead simplify control flow 2018-09-03 18:10:28 +02:00
Robert Schmidt bd041a34aa use changed RAN API, set scheduler for new slice 2018-09-03 18:10:28 +02:00
Robert Schmidt 6e5a2f45ce FlexRAN: set deleted slice configuration to zero 2018-09-03 18:10:28 +02:00
Robert Schmidt 5ceba4a2a6 FlexRAN: lock sc_update with mutex
Prevent sc_update from being changed by an incoming slice reconfiguration
change while writing data to the scheduler
2018-09-03 18:10:28 +02:00
Robert Schmidt fcaf237182 FlexRAN: Handle slice configuration
Incoming slice configuration changes are buffered in an intermediate structure.
The MAC scheduler periodically polls the agent about changes. If there has been
a slice configuration change, apply it.
2018-09-03 18:10:28 +02:00
frtabu 24f8fcf346 Use common log mechanism in layer 3, mapping specific macros to common ones and extending common log utilities to support specific layer3 requirements 2018-08-24 17:43:14 +02:00
Raymond Knopp ea784f2b4b full IF4p5 simulation working 2018-04-29 09:35:23 -07:00
Raymond Knopp 861d06e855 UE directory splits, creation of UE-specific files, common UE/eNB files and extraction of UE/common components from eNodeB files. renaming of files to minimize common names across directories (i.e. defs.h, vars.h, extern.h) 2018-04-22 11:33:43 -07:00
Robert Schmidt 4924b18ebd FlexRAN: send RNTI in protobuf mac_stats_reply message 2018-03-02 17:36:43 +01:00
Robert Schmidt 7d8d1588c3 remove unnecessary function declaration
has been introduced in commit 365ca71a4a
2018-03-01 09:04:41 +01:00
Cedric Roux 365ca71a4a remove compilation warnings 2018-02-22 15:03:45 +01:00
Cedric Roux 8ca5fb4ef2 integration: cleanup
- remove spaces at the end of lines
- remove useless dead code
  use: git show -p <this commit> -w
  to see it clearly
2018-02-22 15:03:09 +01:00
shahab SHARIAT BAGHERI 9a9c867a75 additional Mac stats and Improvements 2018-02-20 15:09:24 +01:00
Robert Schmidt 12ac8b180d prevent warnings: init Protocol__FlexHeader to NULL 2018-02-13 14:29:15 +01:00
Robert Schmidt cf0a5ca920 fix RAN API due to merge + repair functions 2018-02-12 13:50:48 +01:00
Robert Schmidt 6179d9d748 Navid: fix access to non-existent harq_pid_* variables via RC read 2018-01-31 16:49:01 +01:00
Robert Schmidt 356d406cff Navid: remove FlexRAN Agent MAC xface function callbacks for scheduling 2018-01-31 16:48:37 +01:00
Robert Schmidt 3740afecc7 consider changed RAN API 2018-01-31 16:48:36 +01:00
Robert Schmidt a6098dbf09 delete unnecessary FlexRAN source files
all the FlexRAN scheduling code is now also handled by the general OAI
scheduling code
2018-01-31 16:42:01 +01:00
Robert Schmidt 78dd80b086 Merge branch 'feature-68-enb-agent' into feature-merge-f68
Try to merge feature-68-enb-agent into develop
develop should be fast-forwarded later to this branch to complete the merge
This code does not compile yet. Among other things:
- the scheduler structure needs to be reworked for FlexRAN
- the config is structured differently. The files enb_config.{c,h} from develop
  have been copied in here, the files with merge annotations are in
  enb_config.{c,h}.before_merge
- the restart needs to be restructured, since the PHY vars data structure lives
  in RC now
2018-01-24 11:47:28 +01:00
Navid Nikaein dc9cada6c2 Add PDCP stats and update agent and RAN APIs 2017-12-08 18:05:42 +01:00
Cedric Roux 1b1f941e3c upgrade license to version 1.1 2017-10-23 12:22:13 +02:00
shahab SHARIAT BAGHERI 4d3689a56c warning reducing 2017-08-09 13:42:50 +02:00
shahab SHARIATBAGHERI 1ecdcba33a uplink VSF 2017-06-08 18:36:25 +02:00
shahab SHARIATBAGHERI 5de045b802 Uplink slices 2017-05-18 15:25:10 +02:00
shahab SHARIATBAGHERI fdac4d178b uplink harq api 2017-04-22 12:43:04 +02:00
shahab SHARIATBAGHERI 5ce9858d63 uplink scheduling 2017-04-21 13:22:20 +02:00
shahab SHARIATBAGHERI 169f33464e Uplink Agent Mac function 2017-04-18 18:13:42 +02:00
Xenofon Foukas e3df5d3de5 Fixed warnings and bugs 2017-04-11 11:46:34 +00:00
Xenofon Foukas 14fb9e2ba2 Changed default scheduler to local 2017-04-11 08:58:20 +00:00
shahab SHARIATBAGHERI 77c4d3742f Wanring Preventing remote-sch 2017-04-07 11:28:51 +02:00
shahab SHARIATBAGHERI 714ad4d774 Warning Decreasing 2017-04-05 16:48:21 +02:00
shahab SHARIATBAGHERI 4cfa87b6b3 downlink throughput enhancement 2017-04-05 10:38:36 +02:00
Xenofon Foukas 8250ecd794 Added info required for stability and fairness of remote scheduler 2017-02-05 19:54:14 +02:00