Melissa
9b1b629843
Merge branch 'develop' into 'episys-merge-nsa'
...
# Conflicts:
# executables/nr-uesoftmodem.c
2021-09-28 20:06:11 +00:00
Melissa Elkadi
ca0bf39d36
Code clean up part 3.
...
I have removed more irrelevant comments and
updated a few logs.
2021-09-24 07:44:36 -07:00
Melissa Elkadi
82ba5a3531
Code clean up part one.
...
This commit includes about 1/3 of the code clean up
in preparation for the merge to the OAI develop
branch. Several of the changes are white space changes,
removing of logs, comment removals, and updating any
changed code for our use-case to be clear for NSA mode.
2021-09-23 12:53:38 -07:00
Melissa
61e242199a
Merge branch 'episys/david/sync_between_dl_tti_req_and_tx_data_req' into 'episys/mel/merge_develop_cfra_working_9_14_21'
...
Episys/david/sync between dl tti req and tx data req
See merge request aburger/openairinterface5g!60
2021-09-21 22:38:30 +00:00
Deokseong "David" Kim
6a7fe60266
Episys/david/sync between dl tti req and tx data req
2021-09-21 22:38:29 +00:00
Melissa Elkadi
c4e27cf8b4
Properly assigning the rx_ind.pdu pointer
...
Also, the ul_slot was not properly wrapping.
It was increased to a value greater than the
largest slot value.
2021-09-21 15:16:36 -07:00
Melissa Elkadi
88e1b55f02
Filling UCI after DCI because info is available
...
Previously, we thought that filling the UCI ind
after we got the pdsch payload would stop the
harq_pid from going inactive, but this was not
the case. The harq_pid is getting set to inactive
too early because of the sf_slot ahead value. The
fix for this will come in the next commit.
2021-09-15 10:03:21 -07:00
Melissa Elkadi
c8ca564212
Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working_9_14_21
2021-09-14 08:36:54 -07:00
Melissa Elkadi
6a8e4e2883
Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working
2021-09-14 07:34:58 -07:00
francescomani
beb0c4d8bb
implementation of if_freq option at OAI UE
2021-09-13 19:05:32 +02:00
Melissa Elkadi
3abc7f93e7
Preparing UCIs after we have recevied PDSCH PDU
...
In this commit, we introduced a new global to save
the harq_pid from the PDCCH that comes down in the
DCI message so that we can use the harq_pid in the
PDSCH. Now, the UCI ind will be filled after we
have recevied the PDSCH in the tx_request.
2021-09-10 14:34:48 -07:00
hardy
157a975bab
Merge remote-tracking branch 'origin/minor-t-tracer-w36' into integration_2021_wk36
2021-09-09 15:56:20 +02:00
hardy
ddf2d0027d
Merge remote-tracking branch 'origin/fix-physim-run-script-on-cluster' into integration_2021_wk36
2021-09-09 15:55:22 +02:00
Cedric Roux
5ac4ae361a
minor: T tracer: be more verbose for DLSCH DCI
2021-09-07 13:33:45 +02:00
hardy
12b1cb8fde
Merge remote-tracking branch 'origin/NR_UE_SA' into integration_2021_wk35
2021-09-02 23:11:40 +02:00
francescomani
af87ccffa9
Merge remote-tracking branch 'origin/develop' into fix-physim-run-script-on-cluster
2021-09-01 06:57:35 +02:00
francescomani
2f5af6008b
Merge remote-tracking branch 'origin/develop' into NR_msg4_retransmission
2021-08-30 18:06:06 +02:00
francescomani
6a2352f843
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-30 17:55:38 +02:00
hardy
fcbf8706d9
Merge remote-tracking branch 'origin/NR_msg3_retransmission' into integration_2021_wk34
2021-08-26 14:33:59 +02:00
hardy
b798755347
Merge remote-tracking branch 'origin/prb_based_dl_channel_estimation' into integration_2021_wk34
2021-08-26 14:33:33 +02:00
Deokseong "David" Kim
43d8ed216e
Update on scheduler to relax AssertFatal.
2021-08-25 22:52:58 +00:00
francescomani
b356a8166b
Merge remote-tracking branch 'origin/develop' into NR_msg3_retransmission
2021-08-25 16:02:31 +02:00
francescomani
e3c4a9806f
Merge remote-tracking branch 'origin/develop' into NR_msg4_retransmission
2021-08-25 15:43:54 +02:00
francescomani
b6ef23a395
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-25 15:01:40 +02:00
francescomani
e86a48bc1f
fixes
2021-08-23 14:41:08 +02:00
francescomani
01de60f95c
initialization of harq ndi
2021-08-23 12:14:17 +02:00
francescomani
3a07b6bf1b
rewriting downlink harq process function
2021-08-23 11:55:20 +02:00
francescomani
7ab05b666d
reset dci at ue after processing
2021-08-22 18:06:45 +02:00
francescomani
965945f9e7
bugfix in dlsch scramblingid
2021-08-22 14:55:17 +02:00
Sakthivel Velumani
38d1782f9b
minor fixes (review comments)
2021-08-19 13:40:12 +05:30
francescomani
834af3d5c6
Merge remote-tracking branch 'origin/fix-513-duplicate-complex-structure' into integration_2021_w33
2021-08-19 08:33:00 +02:00
Laurent THOMAS
c310d246bb
merge develop
2021-08-18 11:20:39 +02:00
Sakthivel Velumani
7f5009d7cc
fixed SA issues
2021-08-17 17:59:41 +05:30
francescomani
275b82eab2
fix for contention resolution timer at NR UE
2021-08-16 17:21:18 +02:00
Sakthivel Velumani
a87dca8691
Merge branch 'develop' into prb_based_dl_channel_estimation
2021-08-16 18:59:29 +05:30
francescomani
356e6cadd8
Merge remote-tracking branch 'origin/develop' into NR_msg3_retransmission
2021-08-16 12:36:29 +02:00
francescomani
02d86a889c
additional fix for dci_pdu format
2021-08-16 11:53:58 +02:00
francescomani
f2fc22df81
fix for dci_pdu format
2021-08-16 10:18:04 +02:00
francescomani
13980b5ebb
msg3 retransmission at UE
2021-08-15 16:23:25 +02:00
Sakthivel Velumani
5b37846524
Fixed build error & warnings
2021-08-14 10:59:25 +05:30
Sakthivel Velumani
255a5acbfa
Made FD interpolation by default
...
PRB based averaging can activated from command line options
2021-08-14 09:05:49 +05:30
Melissa Elkadi
2a979f4e2f
Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop
2021-08-13 10:27:30 -07:00
francescomani
8fbc5a7146
fix sib1 detection in sa after merge
2021-08-13 16:19:36 +02:00
francescomani
e083bd4330
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-13 15:09:52 +02:00
Raphael Defosseux
4cba1a2b6c
Merge remote-tracking branch 'origin/nr_ue_mac_pdu_fixes' into integration_2021_w33
2021-08-13 14:28:43 +02:00
Rahul Gottipati
540d2e2977
Rebase to latest develop
2021-08-12 15:20:16 +05:30
Thomas Schlichter
b5fb1dc05f
Merge remote-tracking branch 'origin/develop' into nr_ue_mac_pdu_fixes
2021-08-12 11:35:27 +02:00
francescomani
99afe22855
Merge remote-tracking branch 'origin/develop' into fix-physim-run-script-on-cluster
2021-08-12 08:37:18 +02:00
Melissa Elkadi
9b16c1d860
Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
...
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:
- mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
- rrc_data_req vs. nr_rrc_data_req
- mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
- rrc_data_req_ue vs. rrc_data_req_nr_ue
- rrc_data_req vs. nr_rrc_data_req
The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.
Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.
Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Mahesh
8030549342
phy-sim build error fix
2021-08-11 16:15:49 +05:30