Robert Schmidt
12ac8b180d
prevent warnings: init Protocol__FlexHeader to NULL
2018-02-13 14:29:15 +01:00
Robert Schmidt
c33e184dde
bugfix: selectively inform FlexRAN RTController of UE state change
2018-02-13 14:25:50 +01:00
Robert Schmidt
a68d70a13d
bugfix: prevent segfault in pre_processor.c
2018-02-13 14:23:54 +01:00
Navid Nikaein
5865c141d0
Improve UL/DL MCS assignment
2018-02-13 11:45:16 +01:00
Robert Schmidt
135b06ae66
bugfix: only send eNB stats to controller if agent enabled
2018-02-12 15:21:02 +01:00
Robert Schmidt
219b5bc92f
make FlexRAN Agent activation configurable
2018-02-12 15:11:19 +01:00
Robert Schmidt
adec4e39df
remove all conditional FlexRAN-related compilation directives
2018-02-12 14:38:44 +01:00
Robert Schmidt
3768723c62
remove unnecessary comments
2018-02-12 13:50:48 +01:00
Robert Schmidt
ceece5694d
rename flexran_slice_member() -> ue_slice_membership()
2018-02-12 13:50:48 +01:00
Robert Schmidt
8108d59a0b
no regression, fixes compilation warnings&errors
2018-02-12 13:50:48 +01:00
Robert Schmidt
cf0a5ca920
fix RAN API due to merge + repair functions
2018-02-12 13:50:48 +01:00
Robert Schmidt
a78aaa451c
fix slicing capability in ulsch scheduler
2018-02-12 13:50:45 +01:00
Robert Schmidt
8877b18a9a
fix eNB_ulsch_dlsch_scheduler() broken by merge 2c8443121d
2018-02-09 19:05:36 +01:00
Robert Schmidt
e8e58e2594
Merge branch 'develop' into feature-merge-merge-f68
2018-02-09 17:10:41 +01:00
Robert Schmidt
c518ed89e2
bugfix after merge
2018-02-08 19:12:20 +01:00
Robert Schmidt
a21bc513bb
Merge branch 'develop' into feature-merge-f68
2018-02-08 18:05:28 +01:00
Cedric Roux
7ce1621622
Merge remote-tracking branch 'origin/fix-sib3-2018-w06' into develop_integration_2018_w06
2018-02-08 11:04:27 +01:00
Cedric Roux
f3e7a72e55
Merge remote-tracking branch 'origin/fix-cqi-update-2018-w06' into develop_integration_2018_w06
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-02-08 11:03:50 +01:00
Cedric Roux
724970e2ef
Merge remote-tracking branch 'origin/fix-ul-buffer-info-2018-w06' into develop_integration_2018_w06
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2018-02-08 10:59:19 +01:00
Cedric Roux
f6345f048e
Merge remote-tracking branch 'origin/fix-rrc-rel10-compilation-2018-w06' into develop_integration_2018_w06
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-02-07 15:12:08 +01:00
Cedric Roux
1fce1bbf82
bugfix: fix SIB3 encoding
...
The unused bits are the lower bits, so we need to shift.
Not sure that the value 1 is what we want though.
2018-02-07 14:51:50 +01:00
Cedric Roux
c0bcd78673
bugfix: don't take into account report CQI in case of NACK or DTX
...
The problem that may happen is that when the UE does not transmit
on PUCCH (for whatever reason) we may get no signal at all, and
thus compute a very low CQI. Later on we may ask the UE to transmit
louder which may lead to saturation and more problems.
The solution is simple: don't care about CQI in case of DTX
(and NACK also, as done for PUSCH).
Only FDD case done.
For TDD it seems that:
- nfapi structures are not correct. See nfapi_harq_indication_tdd_rel13_t
in nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h, all the cases
(bundling, multiplex, ...) use nfapi_harq_indication_tdd_harq_data_t
- the function extract_harq does not handle TDD
2018-02-07 12:31:26 +01:00
Cedric Roux
9b7364a3ca
minor: fix AssertFatal
2018-02-07 12:30:00 +01:00
Cedric Roux
eccb96c4c2
bugfix: fix UL over scheduling
...
There is too much UL scheduling because the buffer status is
overestimated.
This commit tries to make things simpler.
2018-02-06 14:37:03 +01:00
Cedric Roux
a21c0b809f
bugfix: fix RRC Release 10 compilation
...
The following compilation did not work anymore:
./build_oai --eNB -w USRP -r Rel10 -c
(Rel8 still does not work.)
2018-02-05 17:21:40 +01:00
Raymond Knopp
01f06bcf09
compilation success
2018-02-03 08:11:48 -08:00
Raymond Knopp
4af41d2a26
more correction of indentation
2018-02-03 07:53:33 -08:00
Raymond Knopp
2c8443121d
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into mac-indentation-fix
...
Conflicts:
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-02-03 06:23:55 -08:00
Robert Schmidt
fcddbc2b44
RAN API: add functions using UE_Capability
...
- flexran_get_half_duplex()
- flexran_get_intra_sf_hopping()
- flexran_get_type2_sb_1()
- flexran_get_ue_category()
- flexran_get_res_alloc_type1()
2018-01-31 16:49:24 +01:00
Robert Schmidt
6eeb257717
add UE_Capability to type eNB_RRC_UE_t and read it when received
2018-01-31 16:49:24 +01:00
Robert Schmidt
dd7d2ef63b
Navid: revise RRC
2018-01-31 16:49:24 +01:00
Robert Schmidt
e669f83dc1
Navid: revise RAN API
2018-01-31 16:49:24 +01:00
Robert Schmidt
6dcac9234c
Navid: revise FlexRAN
2018-01-31 16:49:24 +01:00
shahab SHARIAT BAGHERI
2c8dd796e8
Scheduler must send FlexRAN stats updates
2018-01-31 16:49:24 +01:00
Robert Schmidt
d5b8310fb9
add some logging for RRM command parsing
2018-01-31 16:49:24 +01:00
Robert Schmidt
3f043c7d73
FlexRAN: implement possibilty to await a configuration
...
Through configuration, the lte-softmodem can be halted to await a
reconfiguration from the lte-softmodem. A mutex and condition variable are used
to implement this.
Furthermore, the dependance of lte-softmodem.c on FlexRAN has been reduced to
one include and the flexran_agent_start() call.
2018-01-31 16:49:24 +01:00
Robert Schmidt
811ada2429
soft-restart (i.e. only layers PHY-RRC) the lte-softmodem
2018-01-31 16:49:24 +01:00
Robert Schmidt
1576b7bd08
bugfix: max_rbs_allowed_slice is array over CC, not LCID
2018-01-31 16:49:24 +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
56d4d0ebef
Bugfix: avoid cyclic header dependency, use FlexRAN variables instead
2018-01-31 16:48:36 +01:00
Robert Schmidt
6a6729bdac
fix various compilaton errors due to merge
2018-01-31 16:48:29 +01:00
Robert Schmidt
dfece3ff58
correct scheduler typedefs
2018-01-31 16:42:01 +01:00
Robert Schmidt
9b4d3bbae7
move scheduler function pointer typedef to proto.h
2018-01-31 16:42:01 +01:00
Robert Schmidt
a03877e7f7
delete unnecessary code
2018-01-31 16:42:01 +01:00
Robert Schmidt
7dfac059b0
Review Navid: UL Scheduler: make slice aware
2018-01-31 16:42:01 +01:00
Robert Schmidt
024904db90
repair enb_app.c after merge, delete unnecessary code
2018-01-31 16:42:01 +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
b45a340b63
RAN API: no set_RC_vars(), check use RC directly, give error messages
2018-01-31 16:42:01 +01:00