maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,397 Commits 5 Branches 0 Tags
2f2f21d2aafbd8a01d4ec08c19c7667dab96acea
Commit Graph
356 Commits
Author SHA1 Message Date
Louis Adrien Dufrene 5ae494e974 merge from develop 2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene 36cd05bcba Bug fix: dci0_ongoing timer ok, now impossible to set ul_SR when dci0 is ongoing. 2019-04-16 08:22:54 +02:00
Louis Adrien Dufrene d7cddc2825 Bug fix of drx_config == PrNothing is now handled. Bug fix for dci0_ongoing not working. To investigate 2019-04-15 10:57:39 +02:00
Cedric Roux 9ea7073c68 Merge remote-tracking branch 'origin/fixes-mac-scheduler-2019-w13' into develop_integration_2019_w15 
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
 2019-04-15 10:50:38 +02:00
Louis Adrien Dufrene 4c931888e6 Add dci0_ongoing_timer. Commit to build and test. 2019-04-15 08:54:00 +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
Cedric Roux a5a1690394 bugfixes for UL scheduling 
- size of PUCCH has been fixed to:
    - 2 RBs for N_RB_UL = 25 (1 RB at top of resource grid, 1 RB at bottom)
    - 4 RBs for N_RB_UL = 50
    - 6 RBs for N_RB_UL = 100
  this is arbitrary and will need some rework at some point.
  This may be also wrong. PUCCH size actually depends on DL traffic
  (if the ack/nack is not done in PUSCH) and scheduling request
  configurations.
- add sched_frame %= 1024 at one needed place
- reserve RBs for retransmission
  this was not done so new transmissions were scheduled in the same
  RBs. Since the code works with the notion of 'first_rb' only, it
  was decided to skip all RBs lower than those retransmitted. This
  works but is not correct (imagine we have to retransmit RB 23, then
  all RBs < 23 will not be used for new transmission). The work to
  fix this properly is complex, a lot has to change, so let's do it
  this simple way for now.
- sort_ue_ul was not correct
  - add the function maxround_ul to use the correct 'round' (the one
    from DL was used, which is totally wrong)
  - be sure to use the correct frame/subframe to get the correct HARQ pid
 2019-03-30 15:19:27 +01: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
Cedric Roux 9565544e3f bugfix: test free RBs and CCE allocation feasible only for new transmissions 2019-03-30 15:18:18 +01:00
Cedric Roux 04c24ff698 minor cleanup 2019-03-30 15:13:37 +01:00
Cedric Roux daee800e3e bugfix: keep frame in [0..1023] 2019-03-30 15:13:37 +01:00
Cedric Roux 35a38fbee8 bugfix: fix T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION parameters 2019-03-30 15:13:37 +01:00
Robert Schmidt 1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +01:00
Raphael Defosseux cd5e140eb7 Fixes for FDD attachment 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2019-03-13 12:07:17 +01:00
OAI-admin c22f10aa72 Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling 2019-02-26 12:44:59 +01:00
nepes a4b57f3150 loggin reduction for LTE-M. 2019-02-26 01:43:56 +01:00
nepes 282985eb2b RRC bugfix 2019-02-25 21:52:47 +01:00
Louis Adrien Dufrene 22656b65ce fix RA_id again for add_new_ue() 2019-02-25 15:59:07 +01:00
Louis Adrien Dufrene 87f415d2dd Fix wrong RA_id index in rx_sdu for add_new_ue 2019-02-25 11:21:53 +01:00
Louis Adrien Dufrene a4259b9071 Fix build error 2019-02-25 10:34:30 +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
Raphael Defosseux ee3b650904 Compilation fix 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2019-02-15 10:40:06 +01:00
Raphael Defosseux 4cdae9d93d Merge remote-tracking branch 'origin/x2' into develop_integration_2019_w07_v2 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2019-02-15 09:54:44 +01:00
Cedric Roux 1c6b9f0eda Merge remote-tracking branch 'origin/develop' into x2 
Conflicts:
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_defs.h
 2019-02-13 15:20:45 +01:00
Louis Adrien Dufrene ce87a9dc09 Merge from develop 2019-02-13 08:41:13 +01:00
Raymond Knopp b2748da3c9 removal of warnings and excessive logging 2019-01-20 13:18:49 +01:00
Cedric Roux 246abce5d1 Merge remote-tracking branch 'origin/develop' into x2 
Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_defs.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/RRC/LTE/rrc_proto.h
	openair3/GTPV1-U/gtpv1u_eNB.c
	openair3/S1AP/s1ap_eNB_handlers.c
 2019-01-18 10:35:39 +01:00
Louis Adrien Dufrene f034b6933f unused variable added in the commented bloc, remove build warnings 2019-01-16 11:54:50 +01:00
Louis Adrien Dufrene 0aff104545 Debug removed and first fix added for false RA caused by UL scheduling on PRACH resources 2019-01-16 08:58:53 +01:00
Louis Adrien Dufrene fb1ccbaf6b prach taken into account in ulsch scheduler + resolve UE_id = -1 in rx_sdu (to test before push) 2019-01-14 16:43:04 +01:00
Louis Adrien Dufrene 28902bcd57 add some debug 2019-01-14 11:59:15 +01:00
Louis Adrien Dufrene a748262e0a remove some debug before merge develop 2019-01-11 17:40:01 +01:00
Louis Adrien Dufrene a2ef8b7b50 Some formatting + RAPROC fix (to test) 2019-01-11 17:25:13 +01:00
Louis Adrien Dufrene 6614916bc4 debug for test 2019-01-11 11:25:01 +01:00
Louis Adrien Dufrene f99d40c10e add debug in eNB_scheduler_ulsch.c 2019-01-11 10:14:56 +01:00
Louis Adrien Dufrene 8bc548a22c no modifications before pull 2019-01-11 08:48:06 +01:00
Louis Adrien Dufrene 8165233723 More formatting 2019-01-10 16:29:56 +01:00
Louis Adrien Dufrene 9805b053de formatting eNB_scheduler_ulsch.c 2019-01-10 09:51:06 +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 32eafc1332 Some format before testing locally 2018-12-20 15:20:10 +01:00
Louis Adrien Dufrene 57a5a26e5c some format in eNB_scheduler_ulsch.c + break removed in schedule_ulsch() 2018-12-20 11:39:10 +01:00
Louis Adrien Dufrene 076d4e1280 LA: some format + cc = &mac->common_channels[CC_id]; added in schedule_ulsch 2018-12-20 07:38:20 +01:00
Konstantinos Alexandris ea105c39b1 X2AP MOBILITY PROCEDURES (X2AP HANDOVER REQUEST/REQUEST ACK) 
S1AP PATH SWITCH REQUEST/REQUEST ACK/FAILURE
RRC MEASUREMENT REPORT
MINOR CHANGES IN MAC LAYER
 2018-12-18 13:45:03 +01:00
Louis Adrien Dufrene ed61d774f6 add test on ue_context 2018-11-21 17:03:52 +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