jftt_wangshanshan
9ba0355000
add switch tdd config to Msg4 timing setting
2018-02-08 18:04:23 +08: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
jftt_wangshanshan
89b261efe5
Fix bug in schedule_ulsch
2018-02-08 16:28:13 +08:00
Wu Jing
8fffe90dbe
fix hundreds_of_ues issue(n1_PUCCH_AN DAI) for TDD cofnig1
2018-02-08 02:24:54 +00:00
Nikos Makris
fc43139e6a
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
Compile with ./build_oai --eNB -w USRP --pdcp-split
2018-02-07 19:31:51 +02: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
naoi
0efa1185f3
fix: UE dosen't respond to pdcch order(contention based)
2018-02-07 20:40:06 +09: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
jftt_wangshanshan
e8300aa944
Don't use assert since the comment above said it's perfectly possible to have this NULL here.
2018-02-06 16:50:27 +08:00
Xu Bo
5c76360c2d
Fix special subframe only use 2 symbols to transmit pdcch
2018-02-06 11:01:05 +09: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
Xu Bo
f9f20c7300
allocate_CCEs only called on dl subframes
2018-02-05 20:17:53 +09:00
Xu Bo
4387070cda
fix merge bug
2018-02-05 17:25:57 +09:00
jftt_wangshanshan
9c820805fa
TDD config1 initial merge
2018-02-05 15:43:20 +08: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
Raymond Knopp
1a082041b8
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
...
Conflicts:
openair2/LAYER2/MAC/config.c
2018-02-03 06:03:04 -08:00
Xu Bo
10d7599d08
fix merge error
2018-02-03 17:52:03 +09:00
Wu Jing
069ce49e9c
Merge remote-tracking branch 'other/issue289_tdd_config1' into sp3_master
2018-02-03 17:50:53 +09:00
Nikos Makris
bc0f49cea0
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
OAISIM NoS1 broken, needs fixing (no linking of libraries for the UE code)
2018-02-02 20:21:34 +02:00
Younes
785a435fe0
bugfix in configuring ru from file, at_rx was set to att_tx
2018-02-02 10:53:22 +01:00
naoi
3ea62dbdee
modify log.
2018-02-01 21:26:05 +09:00
Wu Jing
ba8a111ea1
merge the latest develop branch into issue289
2018-02-01 19:25:29 +09:00
Xu Bo
d42ddeac56
fix CRNTI process
2018-02-01 01:57:54 +00: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