Commit Graph
7074 Commits
Author SHA1 Message Date
Melissa Elkadi 30065ef014 Removing hacks to gNB code for NSA mode 2021-09-22 07:27:13 -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 5ae3c8914a Only filtering tx_requests if RAR has been rx'd
But, we are not going to process the tx_request
unless we are waiting for the RAR OR if the RNTI
from the previous DCI matches.
2021-09-15 15:32:17 -07:00
Melissa Elkadi 54e231bfeb Filtering tx_requests based on prev DCI RNTI
In this commit, we create a new flag in the MAC
instance which is set to true if the recevied
DL DCI PDU's RNTI value matches the current UEs
RNTI value. If the RNTI value does not match,
then we should not process the recevied tx_request.
This check should only take place after the CFRA
procedure is complete.
2021-09-15 15:20:07 -07:00
Melissa Elkadi d2daf8e860 Change slot_ahead to process ack/nack after pdsch 2021-09-15 11:07:27 -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 77548d5bec Properly filtering DCIs in the NR UE 2021-09-14 12:53:39 -07:00
Melissa Elkadi dbc4b0e321 Updating merged code with harq_pid global
The harq_pid is set to inactive during the scheduling
of ACK/NACK, but this is happening before tx_req (PDSCH)
is recevied. We update the global harq_pid then use it
once we get the PDSCH PDU, then we set it to inactive.
Also, the global previously wasnt being set properly because
a memset was changing the def_dci_re15 struct. We now
memset after we update the harq_pid global.
2021-09-14 12:08:38 -07:00
Melissa Elkadi 1f4b552063 Revering nr_ue_get_rach() to complete CFRA 2021-09-14 12:05:24 -07:00
Melissa Elkadi 2ac8d4b680 Properly handling cellGroupConfig in NR UE 2021-09-14 09:10:47 -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
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
Mario Joa-Ng 82e6d04e56 fix bugs in GNB MAC nr_store_dlsch_buffer()
This commit is to handle multipe UE correctly.
Right now UE #1 and UE #2 can both ping google.
2021-09-09 16:10:20 -07:00
Melissa Elkadi a34856ba38 Filtering DCI PDUs by RNTI in NR UE 2021-09-09 14:47:58 -07:00
hardy 4889a3833b Merge remote-tracking branch 'origin/bugfix-nr-rlc-w36' into integration_2021_wk36 2021-09-09 15:56:40 +02:00
hardy a27cb7e2fb Merge remote-tracking branch 'origin/NR_SIB1_fix_pointa' into integration_2021_wk36 2021-09-09 15:56:00 +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
francescomani afdb5728ed fix for pointa computation in sib1 2021-09-08 14:21:28 +02:00
francescomani aa431f353f new attempt to fix cdm both for sa and mimo 2021-09-07 15:13:10 +02:00
Cedric Roux 36bae67eef nr-rlc: bugfix: copy correct part of PDUs in case of segmentation 2021-09-07 13:16:39 +02:00
Cedric Roux 58904eaab8 cleanup: replace "eNB" by "gNB" as it should be 2021-09-07 13:08:14 +02:00
Melissa Elkadi 3df849eca2 Code clean up 2021-09-03 13:04:15 -07:00
Melissa Elkadi 0b7ce4351d Adding error checking in processing CCCH msgs. 2021-09-03 12:37:07 -07:00
David Kim f8c9be3af9 Added function declaration to read config file.
config files were also updated.
2021-09-03 10:46:09 -07:00
Melissa Elkadi ca1805faaf IP ping traffic is working correctly
In this commit we have updated the NRUE
to properly get the RadioBearer info from
the gNB. Because NSA and SA mode both use
this information, we have updated the SA
function previously in place by changing
the name to allow both NSA and SA mode to
use. This commit also updated the NR/LTE UEs
configuration files to with the correct
proxy IP address.
2021-09-03 10:13:59 -07:00
Raphael Defosseux d9d4b91185 fix(NAS): remove compilation warning
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-09-03 13:07:56 +02:00
Melissa Elkadi 5c49b19788 Merge remote-tracking branch 'origin/episys/david/merge_develop_cfra_working_using_ue_config_for_IP_address' into episys/mel/merge_develop_cfra_working 2021-09-02 15:36:40 -07:00
Melissa Elkadi 2cb934ac2d Didnt mean to redefine variables in 1c11708501
This commit fixes commit 1c11708501 which
we are redefining data_buffer and size_to_write.
2021-09-02 15:34:32 -07:00
Melissa Elkadi 1c11708501 IP working. but HACK!! Changed SN size to 12
Also changed the code to only remove the first
byte of the PDU if it is 00.
2021-09-02 15:29:18 -07:00
hardy 5ae7e456ed Merge remote-tracking branch 'origin/nr-ue-fix-ip-route' into integration_2021_wk35 2021-09-02 23:13:14 +02:00
hardy 12b1cb8fde Merge remote-tracking branch 'origin/NR_UE_SA' into integration_2021_wk35 2021-09-02 23:11:40 +02:00
hardy 8795d92c31 Merge remote-tracking branch 'origin/NR_skip_mac_pdu_processing_when_nack' into integration_2021_wk35 2021-09-02 23:11:17 +02:00
David Kim 6342e67c33 Setting UE and nrUE IP address in config file.
1. Removed hard coded IP address in the code for UE and nrUE's remote address.
2. Read IP address from config file for UE and nrUE's remote address.
2021-09-02 13:33:42 -07:00
Melissa Elkadi b003f37490 Comment for removed first byte before write to TUN 2021-09-02 10:13:44 -07:00
francescomani 854f7a769c fixing missed initialization 2021-09-01 06:59:07 +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
David Kim d72d646c0d Adjusted code format to increase code readability. 2021-08-31 18:21:54 -07:00
David Kim ea63a9eeb0 Merge remote-tracking branch 'origin/episys/mel/merge_develop_cfra_working' into episys/mel/merge_develop_cfra_working_for_multiUE
Resolved merge conflict.
2021-08-31 17:45:26 -07:00
Melissa Elkadi bfa8c8355c Updated logic for getting IP data in scheduler
Also, the error checking for writing to the TUN
interface was incorrect so that was fixed as well.
2021-08-31 16:06:45 -07:00
Melissa Elkadi 1c248bcf49 Successfully writing to TUN if and removed usleep 2021-08-31 15:53:14 -07:00
francescomani bb48991242 Merge remote-tracking branch 'origin/develop' into NR_skip_mac_pdu_processing_when_nack 2021-08-31 18:32:09 +02:00
David Kim 86d605eea1 Fix to handle multiple UEs and typo bug.
1. Changed hard coded preamble index(63) to soft coded.
2. Active UE will not be considered in gNB scheduging RA.
3. Added condition to process dci indication to handle multiple UEs.
4. Bug fix in mutex_lock (unlock to lock). It should be lock rather than unlock.
5. nr_ue_scheduler update not to entering into getting IP traffic to be transmitted in noS1 mode.
6. log update in checking the number of rx_ind or crc
2021-08-30 11:01:32 -07: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
francescomani e93545bc08 formatting 2021-08-27 12:58:53 +02:00
francescomani d0c1bc4340 skip dlsch mac pdu processing when crc fails 2021-08-27 12:42:25 +02:00
Melissa Elkadi 512e76dee8 Error checking and meas sending wait for EPC only 2021-08-26 17:37:51 -07:00