Raphael Defosseux
e7aa071e1b
Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr
2020-01-10 15:35:54 +01:00
Javier Morgade
a61984a3fd
Merge remote-tracking branch 'origin/develop' into oai_test_fed4fire_old
2019-12-14 09:54:10 +01:00
yilmazt
cd098f3971
develop&-nr merge
2019-10-30 16:17:41 +01:00
laurent
0b7489b122
astyle only
2019-10-08 16:15:29 +02:00
laurent
445cf84e94
clean up wireshark traces
2019-10-08 16:04:10 +02:00
laurent
b7908ec25d
bug fixies
2019-10-08 14:27:39 +02:00
frtabu
b9b4d05e41
remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value)
2019-09-23 19:46:44 +02:00
Javier Morgade
dc14cdc665
*L2 procedures to enable mixed unicast/broadcast operation at ENB implemeted:
...
-MBMS scheduler developed (oneFrame allocations implemented at this time)
-UE DSLCH schedulers updated: if an eMBMS session running UE DTCH, DCCH will be only scheduled at non MBSFN sufbframes
-eMBMS L2 procedures implemented
-Dedicated MBMS PDCP pipes src/sink enabled (only for TUN)
-BUGFIX eMBMS MAC procedures (wrong indexing at few loops)
-ENB FAPI updated to enable dynamic MBSFN configurations through M2AP (RRC<->MCE)
ACKNOWLEDGEMENT:
1. This commit was developed at Vicomtech (https://www.vicomtech.org ) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu )
Signed-off-by: Javier Morgade <javier.morgade@ieee.org >
2019-09-14 13:23:30 +02:00
yilmazt
4967e1b1ac
develop&-nr up-to-date as of 30.7.19
2019-07-30 22:01:48 +02:00
yilmazt
2b321fd1c7
Merging latest develop commits
2019-07-16 11:20:24 +02:00
Raphael Defosseux
729aab5798
Merge remote-tracking branch 'origin/nfapi_cleanup1' into develop_integration_2019_w30
2019-07-24 08:29:01 +02:00
Raphael Defosseux
4eee2460f9
Merge remote-tracking branch 'origin/bugfix-pucch-power-estimation' into develop_integration_2019_w30
2019-07-23 13:02:42 +02:00
Cedric Roux
d1fdbfedbc
fix power estimation
...
Some computation has been fixed in PUCCH reception.
SNR has been fixed, uses measurement instead of
a fixed value for the noise.
normalized_rx_power and target_rx_power have been removed,
replaced by snr and target_snr. All the files using those
variables have been updated.
2019-07-19 17:10:42 +02:00
Haruki NAOI
29d361ff42
Fix: Loadtester's UESIM dose not receive paging.
2019-07-16 19:25:41 +09:00
Haruki NAOI
25a1e76a0e
Fix: avoid pthread_mutex_lock abort.
...
This commit is workaround. This issue realy occures with the following log.
lte-softmodem: ../nptl/pthread_mutex_lock.c:81: _pthread_mutex_lock: Assertion `mutex->_data.__owner == 0' failed.
2019-07-16 19:23:29 +09:00
Haruki NAOI
b557f8960b
Fix: remove useless mutexlock.
2019-07-16 19:19:32 +09:00
Haruki NAOI
35385d84aa
Fix: uplane_inactivity_timer dose not count time correctly about TDD.(rm2174)
2019-07-16 19:13:47 +09:00
luaihui
94af4d0eca
Merge remote-tracking branch 'origin/OAI_develop' into oai_develop_nfapi
2019-07-09 12:45:45 +09:00
laurent
924e10f73a
fix rfsim ue initial sync and legacy OAI C struct syntax
2019-07-01 15:17:07 +02:00
yilmazt
420e6194d4
All 4 nr<e-(ue)softmodems are compiling
2019-06-16 19:46:11 +02:00
He Shanyun
72aa68137d
fix mcs while nfapi mode because it is not correct if setting mcs to 10
2019-05-28 13:54:23 +09:00
Louis Adrien Dufrene
5ae494e974
merge from develop
2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene
3406634b6b
This is version 1.0. To test. Cleanup of phy_procedures_lte_eNb.c eNB_scheduler_dlsch.c eNB_scheduler_ulsch.c pre_processor.c and asn1_msg.c
2019-04-10 08:48:37 +02:00
frtabu
30b7c973e0
merge nfapi_cleanup
2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene
81f04d2982
Apply diff between ssr (CDRX) branch and develop
2019-04-04 08:17:26 +02:00
Robert Schmidt
1f590efe2b
Merge branch 'develop' into feature-127-protocol-split
2019-03-19 14:49:07 +01:00
Raphael Defosseux
2fcd4fcec1
Fixing error in LTE-M MAC scheduling
2019-03-18 11:40:38 +01:00
nepes
1d2ee01b6c
removal of logs
2019-02-28 18:28:35 +01:00
OAI-admin
c22f10aa72
Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling
2019-02-26 12:44:59 +01:00
Robert Schmidt
544d80c40d
Merge branch 'develop' into feature-127-protocol-split
2019-02-25 18:06:35 +01:00
Louis Adrien Dufrene
cddba97c21
remove CDRX related stuff
2019-02-25 10:03:19 +01:00
Louis Adrien Dufrene
55460eafe1
some format for eMTC schedulers
2019-02-25 09:45:58 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
Louis Adrien Dufrene
db51a61c2e
Fix to remove cppcheck warnings
2019-02-19 07:56:32 +01:00
Louis Adrien Dufrene
c7bce0f8d7
Merge from develop
2019-02-13 09:01:51 +01:00
Stefan
1074a2cdc7
forme eNB_scheduler_dlsch
2019-01-23 16:22:55 +01:00
Stefan
485e83f9e6
modif scheduler_dlsch + primitives
2019-01-23 08:50:59 +01:00
Stefan
151873e987
pre_processor improvements
2019-01-18 17:04:57 +01:00
Cedric Roux
aea6b4b5a6
fix a lot of file mode
...
For whatever reason most of the files had their permission
changed from 644 to 755, which is not wanted.
2019-01-07 16:22:28 +01:00
Raymond Knopp
44a225c6b7
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
targets/RT/USER/lte-enb.c
2019-01-05 23:28:31 +01:00
Louis Adrien Dufrene
ed61d774f6
add test on ue_context
2018-11-21 17:03:52 +01:00
Raymond Knopp
7900864fe4
testing after integration of eMTC
2018-11-19 18:01:36 +01:00
Raymond Knopp
7474b69c29
added missing files. updates for testing in eMTC configuration after merge.
2018-11-19 09:26:03 +01:00
Raymond Knopp
6266d5c389
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
2018-11-19 00:43:49 +01:00
Louis Adrien Dufrene
700437f184
astyle applied
2018-11-16 08:49:28 +01:00
Louis Adrien Dufrene
9a080adec5
RRC inactivity timer: first commit to DRX_master
2018-11-13 14:20:16 +01:00
Louis Adrien Dufrene
961a70a04e
Fusion wasn't ok, needed some modifications
2018-11-13 11:20:14 +01:00
Louis Adrien Dufrene
a409614185
Merge develop done, conflicts resolved
2018-11-13 10:49:20 +01:00
Louis Adrien Dufrene
287010f82f
RRC timer: last format done. Timer reset in scheduling of DTCH (DL/UL). Commit to test.
2018-11-13 10:21:38 +01:00
Louis Adrien Dufrene
76e1636258
RRC timer reset in scheduler: format of some functions before first test
2018-11-12 17:38:19 +01:00