Emad
ddd3e97f14
srb_id must be between [1,3]
2018-02-12 16:07:22 +01:00
Robert Schmidt
4bf4ad8e98
change build scripts: always compile FlexRAN
2018-02-12 15:30:30 +01:00
Cedric Roux
6210eb056f
bugfix: fix ue_ip.ko compilation
...
Not sure that the use of __KERNEL__ is the correct solution.
To be checked at some point.
After this commit, the following works:
./build_oai --UE -c
2018-02-12 15:26:45 +01:00
Robert Schmidt
54e803e71a
Sample configuration FlexRAN: Agent is disabled
2018-02-12 15:21:44 +01:00
Robert Schmidt
135b06ae66
bugfix: only send eNB stats to controller if agent enabled
2018-02-12 15:21:02 +01:00
Emad
1056604b25
I tried to change rx and tx attenuation by the config file, but they are not changed. The bug is because att_rx and att_tx do not put in RC.rru when local_rf is "yes" in config file. We need to put att_rx and att_rx for both local_rf = "yes" and "no". Also RF config which send to RF device must be fill by this parameters.
2018-02-12 15:12:22 +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
Wu Jing
c641f334bb
fix total usable RBs when pucch rb=6
2018-02-12 18:38:26 +09:00
jftt_wangshanshan
19a2b37c75
Fix bug in Adaptive Retransmission for ULSCH. Fix Qm,mcs,TBS setting.
2018-02-12 16:52:48 +08:00
jftt_wangshanshan
5a461002a1
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
2018-02-12 14:01:46 +08:00
jftt_wangshanshan
bba24dc2fa
Remove comments
2018-02-11 20:33:07 +08:00
jftt_wangshanshan
2974c20c69
Move tdd config case 1 to top
2018-02-11 19:55:52 +08:00
Xu Bo
dcdda7ba35
set UL schedule period to 5Frame for TDD config1
2018-02-11 18:10:11 +09:00
jftt_wangshanshan
4898d609e6
Fix a bug in HI_DCI0_req clear
2018-02-11 16:42:12 +08:00
Raymond Knopp
4070f0bfdf
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
...
Conflicts:
openair2/LAYER2/MAC/config.c
2018-02-09 22:47:29 -08:00
Raymond Knopp
b073445f99
removed NFAPI libraries from oaisim target. added #define to allow ue_ip.ko to compile. This should be revisited, there's a problem in CMakelists.txt, no flags.cmake generate for all 3 kernel modules.
2018-02-09 19:15:30 +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
d746ff6127
update comments in restart_L1L2()
2018-02-09 16:29:59 +01:00
Robert Schmidt
1eabadb137
remove unnecessary code from lte-enb.c
2018-02-09 15:47:59 +01:00
Robert Schmidt
386fd21c93
free_eNB_{d,u}lsch(): remove log, complete function dlsch
2018-02-09 15:31:59 +01:00
naoi
0684f6dda1
Fix: All UEs are detached when rf_tx_thread_busy occurs.
2018-02-09 23:27:30 +09:00
Cedric Roux
6868329384
Merge remote-tracking branch 'origin/develop_integration_2018_w06' into develop
...
Summary of changes:
- fix MAC indentation
- bug fixes:
- fix uplink over-scheduling
- fix CQI updating (it was done even when it shouldn't)
- fix rrc rel10 compilation
- some minor bug fixes related to ASN.1
2018-02-09 11:20:28 +01:00
Cedric Roux
26073a353b
Merge remote-tracking branch 'origin/fix-enb-name-2018-w06' into develop_integration_2018_w06
2018-02-09 11:04:56 +01:00
Robert Schmidt
bb6fd31de6
free all memory for lte_ul_ref* structures
2018-02-09 10:59:59 +01:00
Robert Schmidt
6cff88b9c8
free memory on teardown after all RU/eNB threads have been released
2018-02-09 10:56:14 +01:00
Cedric Roux
11fe5f97c7
bugfix: fix eNB name in configuration files
...
'_' is not a valid character.
S1AP specs say:
ENBname ::= PrintableString (SIZE (1..150,...))
And X.680 (08/2015) 41.4 table 10 lists the valid characters for
PrintableString. '_' is not there. We replace by '-' which is there.
Connection of eNB to ppenair-cn has not been tested. There is no reason
why it would fail.
2018-02-09 10:49:50 +01:00
Robert Schmidt
c518ed89e2
bugfix after merge
2018-02-08 19:12:20 +01:00
Robert Schmidt
1a1ad6ed8f
remove non-existing files from build description file
2018-02-08 19:11:57 +01:00
Robert Schmidt
c8ae5b7c09
decrease warning
2018-02-08 18:55:23 +01:00
Robert Schmidt
a21bc513bb
Merge branch 'develop' into feature-merge-f68
2018-02-08 18:05:28 +01:00
jftt_wangshanshan
1bc258a729
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
2018-02-08 18:09:53 +08:00
jftt_wangshanshan
593ebc4732
Fix bug in subframe2harq_pid. Remove if tdd condition while calling this method since there is already if-else in the method.
2018-02-08 18:08:38 +08: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
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
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
8e3ecf3399
Merge remote-tracking branch 'origin/fix-s1ap-2018-w06' into develop_integration_2018_w06
2018-02-07 15:03:56 +01:00
Cedric Roux
d23b02af56
Merge remote-tracking branch 'origin/mac-indentation-fix' into develop_integration_2018_w06
2018-02-07 15:03:38 +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