Raphael Defosseux
7aa35e874b
Removing obsolete LTE_RRC_VERSION
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-01-10 15:38:13 +01:00
Raphael Defosseux
e7aa071e1b
Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr
2020-01-10 15:35:54 +01:00
yilmazt
e5a9f02af6
develop-nr merge
2019-10-07 12:04:58 +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
Mohamed Gamal
16c8762c2b
PUSCH Repetition confoiguration and combining
...
Functionalities Added:
- Modify RAR message to use number of repetitions configuration added in last commit
- Configure msg3 with number of repetitions
- DCI configuration for repetitions
- Repeat MAC UL config each SF for the number of repetitions
- PHY combining of repeated SF
Signed-off-by: Mohamed Gamal <mohammed.abdelkhalek.ext@orange.com >
2019-07-28 17:04:20 +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
Haruki NAOI
8976f988ed
Fix: change default uplane_inactivity_timer value.
2019-07-22 11:13:05 +09: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
luaihui
94af4d0eca
Merge remote-tracking branch 'origin/OAI_develop' into oai_develop_nfapi
2019-07-09 12:45:45 +09:00
Wu Jing
4239dacd02
Merge branch 'OAI_develop' into oai_develop_nfapi
2019-07-02 22:23:35 +09:00
laurent
924e10f73a
fix rfsim ue initial sync and legacy OAI C struct syntax
2019-07-01 15:17:07 +02:00
Wu Jing
91ffcd1fce
fix issue that rru cannot release ue if doing attach/detach in nfapi mode
2019-06-14 14:08:29 +09:00
Javier Morgade
786895dcd9
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-17 18:11:55 +02:00
Louis Adrien Dufrene
5ae494e974
merge from develop
2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene
4c931888e6
Add dci0_ongoing_timer. Commit to build and test.
2019-04-15 08:54:00 +02:00
Javier Morgade
f1fa1e1f53
FeMBMS UE RRC<->MAC Procedures SI-MBMS and SIB1-MBMS(sib13, LTE_NonMBSFN_Subframe)
2019-04-11 22:04:40 +02:00
Louis Adrien Dufrene
46b0a9fb38
Remove bypass_cdrx variable and add cdrx_waiting_ack. The CDRX is now activated at RRC COnnection Reconfiguration Complete reception. To Test
2019-04-11 07:36:05 +02:00
Louis Adrien Dufrene
8359b9684e
Cleanup of mac.h and mac_proto.h
2019-04-05 08:28:23 +02:00
Louis Adrien Dufrene
81f04d2982
Apply diff between ssr (CDRX) branch and develop
2019-04-04 08:17:26 +02:00
Cedric Roux
26118ed860
bugfix: fix cqi_req usage in UL scheduler
...
For retransmission, let's use cqi_req used for the 1st transmission.
Maybe incorrect, should check the specs. (In the worst case, we
simply won't decode this transmission at all. No big deal.)
2019-03-30 15:18:18 +01:00
Javier Morgade
65e485642e
NFAPI bindings for FeMBMS-CAS
2019-02-28 10:44:44 +01:00
Javier Morgade
39fe25a44d
FeMBMS RRC->MAC config request protypes
2019-02-27 11:01:47 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
Javier Morgade
46a8c83b6c
UE procedures for FeMBMS SIB1-MBMS (SystemInformationBlockType1-MBMS message)
...
-- asn1 dissectors ETSI TS 136 331 V14.2.2 (2017-05)
-- schedule_SI_MBMS
-- ue_decode_si_mbms
2019-02-14 15:35:00 +01:00
Louis Adrien Dufrene
ce87a9dc09
Merge from develop
2019-02-13 08:41:13 +01:00
Louis Adrien Dufrene
a2ef8b7b50
Some formatting + RAPROC fix (to test)
2019-01-11 17:25:13 +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
Raymond Knopp
fb5201ba97
initialization of dfts for RU. moved init_dfts out from lte_init_top into lte_init_RU() and lte_init_ue_signal()
2018-11-26 21:02:41 +01:00
Raymond Knopp
7900864fe4
testing after integration of eMTC
2018-11-19 18:01:36 +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
Robert Schmidt
397d2f4815
Merge commit 'develop' into feature-127-protocol-split
...
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
Raymond Knopp
b27ed63fa9
lte-softmodem compiles, many memory faults during configuration ...
2018-11-03 22:51:24 +01:00
Bi-Ruei, Chiu
f58ad3c39f
Add prefix LTE_ to LTE-RRC generated data types by ASN1C_PREFIX=LTE_
...
1. Modify all expressions using original LTE-RRC data types for new generated ones
2. Does not change any program logic
2018-10-17 15:46:12 +08:00
Raymond Knopp
a6d3efb9a4
minor changes for testing
2018-09-20 00:12:46 +02:00
Bing-Kai Hong
9f098a3461
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-09-10 15:33:03 +02:00
Raymond Knopp
c56eb9eda7
addition of configuration (DU) for F1AP and filling of F1AP_SET_REQ parameters
2018-09-04 07:40:04 +02:00
Robert Schmidt
328a464e37
remove update_sched slice param variables
...
- whether a scheduler callback has to be changed is now handled by the agent
2018-09-03 18:10:28 +02:00
Robert Schmidt
21f6609472
FlexRAN: move slice param verification to agent
...
- until now, on every iteration, the scheduler checked for changed parameter
(and verified some)
- this functionality moves to the FlexRAN Agent, which verifies all parameters
* individually, e.g. Max MCS <= 28 for DL
* group-based, e.g. the sum of slice percentages is <= 100
- slice configuration changes are only applied if all verifications pass
- it is assumed in the scheduler, that configuration passed from outside is
correct and can be used "as-is"
fix accounting setting
2018-09-03 18:10:28 +02:00
Robert Schmidt
8039cd40f5
share the allocation array rballoc_sub between slices
2018-09-03 18:10:28 +02:00
Robert Schmidt
8f2d79709e
MAC: change all slice_id_t to slice index variables
2018-09-03 18:10:28 +02:00
Robert Schmidt
87b8b6e86b
Increase the number of possible slices to 10
2018-09-03 18:10:28 +02:00
Robert Schmidt
568bf8ae35
bugfix: deactive slice_counter
...
slice_counter had a wrong condition, not scheduling in DLSCH if the number of
slices is greater than one
2018-09-03 18:10:28 +02:00
Robert Schmidt
048c4d29a2
add slice association in UE_list, test against it in slice_membership()
2018-09-03 18:10:28 +02:00
Robert Schmidt
58c2a00626
MAC: slicing conf struct in RC
...
- introduce structure in RC for slicing conf (UL/DL)
- move global variables regarding slice configuration into RC
- change ue_slice_membership(): consider UL/DL
- remove the unnecessary header files
- set default parameters: one slice
2018-09-03 18:10:28 +02:00
Niccolò Iardella
e6168667d3
Add first_rb_offset
2018-09-03 18:10:28 +02:00
Niccolò Iardella
9efd5d6f27
Inter/intra-slice sharing are now optional
2018-09-03 18:10:28 +02:00
Navid Nikaein
5634aa92a1
Keep the LCID priority in MAC layer to sort the UE accordingly
2018-09-03 18:10:28 +02:00
Niccolò Iardella
56405aeef0
Implement interslice_multiplexing, add new constants
2018-09-03 18:10:28 +02:00