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
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
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
Cedric Roux
f55cbe475c
bugfix: fix initialUEMessage criticality
...
S1AP specs say:
initialUEMessage S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE InitialUEMessage
PROCEDURE CODE id-initialUEMessage
CRITICALITY ignore
}
So let's use "ignore", not "reject".
The online decoder http://asn1-playground.oss.com/ did
not decode a message encoded by the eNB because of this.
Only the S1AP messages captured while doing a simple connection
of one UE have been tested with the online decoder.
So, not all the S1AP messages have been checked, maybe some
instances of this problem are still there.
It does not seem to harm the actual UE<->eNB<->EPC communication
(because we don't check the integrity of messages or because
asn1c does not do it), so it's not a big deal.
2018-02-05 16:50:52 +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
Cedric Roux
be8d32d55f
Merge remote-tracking branch 'origin/develop_integration_2018_w05' into develop
...
Summary of changes:
- noS1 fixes
- various bugs fixed
2018-02-02 11:43:54 +01:00
Cedric Roux
ea0d778176
Merge remote-tracking branch 'origin/develop-nos1-fixes' into develop_integration_2018_w05
2018-02-02 10:18:31 +01:00
Raymond Knopp
200be2b1ee
Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes
2018-01-28 13:14:51 +01:00
Raymond Knopp
0d05de6382
minor changes after merge with develop for noS1 simulation
2018-01-28 13:13:59 +01:00
Raymond Knopp
2d610d95c8
Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes
2018-01-25 15:55:24 +01:00
Raymond Knopp
fe1912a193
correcting issues after merge with develop
2018-01-25 06:54:01 -08:00
Raymond Knopp
8b052dadd5
Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_common.c
targets/SIMU/USER/oaisim_functions.c
2018-01-25 00:00:24 -08:00
Raymond Knopp
ceb4edf7e6
minor changes
2018-01-25 08:53:40 +01:00
Raymond Knopp
f8b0cd5bd4
Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair2/RRC/LITE/rrc_UE.c
2018-01-24 23:36:39 -08:00
Cedric Roux
cd8e8458cf
Merge remote-tracking branch 'origin/develop_integration_2018_w04' into develop
...
Summary of changes:
- heavy code cleanup (#ifdef removal)
- bugfixes
2018-01-23 09:30:04 +01:00
Cedric Roux
ecd4aebbe0
Merge remote-tracking branch 'origin/issue-285-connect-disconnect-multiple-time' into develop_integration_2018_w04
2018-01-22 18:44:32 +01:00
Cedric Roux
97ebc165cc
Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/SCHED/defs.h
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/RRC/LITE/rrc_eNB.c
2018-01-22 17:47:01 +01:00
Cedric Roux
b5513cadf1
hotfix: fix nfapi for correct compilation on ubuntu 17.10
2018-01-22 16:00:21 +01:00
Cedric Roux
4b5b556493
bugfix: fix issue 285 - connect/disconnect multiple time
...
As reported by Emad Alizade:
According to "Issue255 256 257 paging reesta release" that has been
merged in develop version, we have a question: In rrc_eNB_free_UE()
function only all ulsch related memory of user has been cleaned, but
I think not only ulsch memory but also dlsch memory must be cleaned.
I tested the latest develop version and with repetition UE attach-detach
procedures we find that the dlsch memory has not been cleaned and after
repeat this sequence (45 times) assertion with cause UE_id!=-1 (no free
or exiting dlsch_context, dci_tools.c: fill_dci_and_dlsch() ) occurred
and no UE will be attached to system.
The fixes in this commit are from Emad Alizade.
2018-01-22 15:32:41 +01:00
Raymond Knopp
b350f8557e
fixes for broken automatic indentation in MAC #1
2018-01-21 16:58:21 -08:00
Raymond Knopp
20c7af9a96
forgot to add a file
2018-01-21 22:21:30 +01:00
Rohit Gupta
046589e76d
fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.
...
tested with simulator.
2018-01-21 22:15:45 +01:00
Cedric Roux
91dd7ed4b6
Merge remote-tracking branch 'origin/develop_integration_2018_w03' into develop
...
Summary of changes:
- Implementation of paging (see issue #255 in gitlab)
- Implementation of RRC RE-ESTABLISHMENT (see issue #256 in gitlab)
- Implementation of RRC CONNECTION RELEASE (see issue #257 in gitlab)
Some modifications with timers have been done.
Expect (and report) problems, thanks.
What has been tested:
- monolithic eNB 5 and 10MHz with one commercial UE. UDP and TCP
traffic, uplink and downlink, with iperf (with a third party
EPC, not openair-cn). TCP downlink traffic is not stable.
Reason yet unknown. Will be fixed later.
2018-01-19 16:32:18 +01:00
Cedric Roux
3a867ac767
integration fix: add T trace
2018-01-19 15:51:38 +01:00
Raymond Knopp
dd3dce8fcf
small changes after merge with develop
2018-01-19 00:35:11 -08:00
Cedric Roux
282f6a5077
Merge branch 'issue255_256_257_paging_reesta_release' into develop_integration_2018_w03
...
Conflicts:
targets/RT/USER/lte-softmodem.c
2018-01-17 11:49:44 +01:00
bruno mongazon
9c93307ab4
Fix #582 , merge from develop
2018-01-16 14:31:23 +01:00
Raymond Knopp
d32cdd1f33
Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes
...
Conflicts:
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/LAYER2/MAC/config.c
2018-01-16 03:55:37 -08:00
Raymond Knopp
5dc0d7ccea
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
...
Conflicts:
openair2/LAYER2/MAC/config.c
2018-01-16 03:46:24 -08:00
bruno mongazon
d100398658
Fix #582 , double check all removed flags in cmake template files
2018-01-16 12:45:06 +01:00
bruno mongazon
8d2f0931a7
Fix #582 , NB_ANTENNAS_TXRX removed
2018-01-16 12:35:56 +01:00
bruno mongazon
88d0b68c7b
Fix #582 , MIH_C_MEDIEVAL_EXTENSIONS removed
2018-01-16 12:24:58 +01:00
bruno mongazon
28497cae6f
Fix #582 , SPECTRA removed
2018-01-16 12:15:21 +01:00
bruno mongazon
339905d191
Fix #582 , OPENAIR1, NO_OPENAIR1 removed
2018-01-16 12:11:33 +01:00
bruno mongazon
da7a4a19cd
Fix #582 , HARD_RT removed
2018-01-16 11:39:16 +01:00
bruno mongazon
ea3aff84e9
Fix #582 , PUCCH removed
2018-01-16 11:33:45 +01:00
bruno mongazon
7943ea92d1
Fix #582 , RANDOM_BF removed
2018-01-16 11:27:34 +01:00
bruno mongazon
f4d19c0d63
Fix #582 , PERFECT_CE removed
2018-01-16 11:22:45 +01:00
bruno mongazon
f44064a221
Fix #582 , NEW_FFT removed
2018-01-16 11:16:49 +01:00
bruno mongazon
2157727f5f
Fix #582 , PC_TARGET removed
2018-01-16 11:10:05 +01:00
bruno mongazon
dac7888f27
Fix #582 , PC_DSP removed
2018-01-16 10:52:41 +01:00
bruno mongazon
f7653f90b0
Fix #582 , PBS_SIM removed
2018-01-16 10:44:59 +01:00
bruno mongazon
71a6b5d0f0
Fix #582 , ENABLE_FXP removed
2018-01-16 10:35:53 +01:00
bruno mongazon
bbaf588352
Fix #582 , DISABLE_USE_NAS removed
2018-01-16 10:26:42 +01:00
bruno mongazon
d62fe071cb
Fix #582 , ENABLE_PGM_TRANSPORT removed, RRH related removed
2018-01-16 10:15:35 +01:00