Commit Graph
15873 Commits
Author SHA1 Message Date
Melissa Elkadi f61d5b74b1 Removing free of unallocated memory 2021-06-28 15:02:04 -07:00
Melissa 01127c6ce7 Merge branch 'episys/sync-nfapi-with-muep-more' into 'episys/x2_trigger_nsa'
Sync more NFAPI changes from multi-ue-proxy.git

See merge request aburger/openairinterface5g!45
2021-06-28 14:53:37 -07:00
Michael Cook 9ac2d7724d Merge remote-tracking branch 'origin/episys/x2_trigger_nsa' into episys/sync-nfapi-with-muep-more 2021-06-28 17:44:21 -04:00
Melissa 13c1379958 Merge branch 'episys/sync-nfapi-with-muep' into 'episys/x2_trigger_nsa'
Sync nfapi_p[57].c with multi-ue-proxy.git

See merge request aburger/openairinterface5g!44
2021-06-28 14:43:39 -07:00
Michael Cook cf4758a742 Merge remote-tracking branch 'origin/episys/x2_trigger_nsa' into episys/sync-nfapi-with-muep-more 2021-06-28 17:40:00 -04:00
Michael Cook 4fb933cbdf Copy review feedback from multi-ue-proxy.git 2021-06-28 17:39:16 -04:00
Melissa Elkadi 9b96dd2a5f Unqueue based on sfn_slot
Also, added functionality to fill tx_req in NR UE
when a DCI is received after the slot indication.
2021-06-28 12:39:28 -07:00
Michael Cook e54896591b Sync more NFAPI changes from multi-ue-proxy.git
Most notably, nfapi_rx_indication_pdu_t.data type is changed from
`uint8_t*` to `uint8_t[]`.  Also, renamed from `data` to
`rx_ind_data` to make it easier to find.
2021-06-26 10:20:48 -07:00
Michael Cook 9a0926bdee Sync nfapi_p[57].c with multi-ue-proxy.git
These are all superficial, low-risk changes
2021-06-26 09:08:54 -07:00
Melissa Elkadi 46488432e6 This commit includes the iisc pnf_p7 slot tick fix
It also includes the queuing development. The idea
is that the 5G Userplane messages will be filled
and configured the same as previous commit, but
the uplink messages will be queued and then sent to
the gNB during the correct slot. Still WIP.
2021-06-25 14:49:02 -07:00
Melissa Elkadi 912cba163d Enabled VNF timing adjustments.
Also ported in new gNB ulsch scheduler code from
Eurecom/develop branch.
2021-06-24 15:33:22 -07:00
Melissa 3da3b20c86 Merge branch 'episys/use-Werror' into 'episys/x2_trigger_nsa'
Enable -Werror compiler option

See merge request aburger/openairinterface5g!43
2021-06-21 14:11:53 -07:00
Michael Cook 96efbb2cab Add -Werror compiler option
Fix some warnings, too.
2021-06-21 14:11:53 -07:00
Melissa Elkadi 3605fed468 Already filling rx_ind so removing stub functions 2021-06-21 14:05:54 -07:00
Melissa Elkadi e3bf4940fd WIP: Not working or building.
Starting to complete the final fill of
dl_indication and an rx_indication
2021-06-18 15:06:59 -07:00
Melissa Elkadi c7875ce24c Properly filling the dci_format
This commit properly is filing the dci_format but the
rx_ind and dl_ind has not been updated in the NR UE
prior to sending to gNB. The chnages in this commit
to properly fill the dci_format include:
- filling the dci canidates every slot indiction
- checking for a dl_tti/ul_tti containing a dci
- when dci payload is received we use the filled
  dci canidates to update the dci_format

Also, a bug in LTE UE is found where we are indexing
passed the end of ue_sdu array. We added a check for this.
Furthermore, in the nr_ue_scheduler we were utilizing
tx_req but the memory wasnt properly initialized.
2021-06-18 13:33:20 -07:00
Melissa 9cce04efd6 Merge branch 'episys/x2_trigger_nsa_for_multi_ues' into 'episys/x2_trigger_nsa'
Adjusted UDP port ids for multiple UE connection with proxy

See merge request aburger/openairinterface5g!41
2021-06-16 16:06:39 -07:00
Deokseong "David" Kim 591e0e1f36 Adjusted UDP port ids for multiple UE connection with proxy 2021-06-16 16:06:38 -07:00
Melissa Elkadi 777bcc6c37 Saving DCI format to mac instance to fill in stub 2021-06-16 14:52:47 -07:00
Melissa Elkadi 17222c91e0 Added assert fatals for ul_config and TLVs
Also started handling ul_dci that is received in NR UE.
We now receive dci format 01, 10, and 11 at the NR UE.
The dl_info being filled in NRUE was not memset to 0, that
has been added. Additionally, we will need to get the dci_format
based on the length in the dl_config structs and map it.
For the moment the dci_format values are hard coded.
2021-06-15 15:55:59 -07:00
Melissa Elkadi c3710ecfc4 Handling channel information if rx'd in slot_ind 2021-06-15 07:03:48 -07:00
Melissa Elkadi 52dafe61c7 Fixed a bug in rx and crc filling in the NR UE
Also, there is not a field for dci_format in
nFAPI so there is a way it is detected by the NR UE.
For now, we have hardcoded the value in the stub when
we receive the DCI. Lastly, updated the nr_harq_handling
in the gNB.
2021-06-14 16:29:42 -07:00
Melissa Elkadi 2b698b77e4 CFRA procedure success commit pt. 2
This commit includes the changes made to gNB.
All of these changes were cherry picked from
the Eurecom/develop branch to ensure the
CFRA procedure is working. Without these changes
there were several seg. faults.
2021-06-11 12:39:01 -07:00
Melissa Elkadi e8cfcbe607 CFRA Procedure success commit pt. 1
This commit contains the changes to the OAI code in
the NR UE and in nFAPI.
- Filling crc_ind for msg3
- Updating pack/unpack of CRC_ind
- Creating phy abstraction CRC_ind handling in VNF
- Removal of old comments
- Only sending on RACH in phy_stub
- Calling nr_msg3_transmitted in scheduler for NSA mode
2021-06-11 12:35:40 -07:00
Melissa Elkadi 04ab6dbad5 Added an RX_IND handle in the gNB/VNF
Also updated the NR nFAPI for properly packing
and unpacking the ra_indication. Lastly, added
the functionality for calling the callback RX_ind
functions in the VNF. The RX_IND PDU is recevied
as NULL in the gNB so need to investigate how to
properly pack and unpack the *pdu in the RX_ind.
2021-06-10 15:39:18 -07:00
Melissa Elkadi b91251d1e0 Changed nsa_send_standalone_msg() and sending RX
The send_standlone_msg will now be able to send
any type of uplink message and we fill the RX
indication in the stub_schedule_response and
are trying to send to gNB. Need to update the NR nfapi.
2021-06-10 12:44:34 -07:00
Melissa Elkadi 0752dd20d1 Filling rx_ind with tx_req information 2021-06-10 10:24:21 -07:00
Melissa Elkadi d5a7a1a352 Filling RACH ind with prach_pdu
Also added logs for handling Msg3 and
initialized ul_config->num_pdus at every
received slot ind instead of every time
we call get_ul_config()
2021-06-09 14:57:43 -07:00
Melissa Elkadi 4f0c8fbf86 Split process RAR function into 3 functions 2021-06-09 08:02:22 -07:00
Melissa Elkadi 88c614eefc RAR successful here. This commit includes:
- Hardcoding the freq_index when filling RACH
- Not handling DCI unless dci_rel_15 global is allocated
- Verifies ra_rnti matches in prach pdu and RACH
- Updates handling of DCI and RX from dl and tx reqs
2021-06-08 12:31:52 -07:00
Melissa Elkadi 082afd0c05 Updated log in gNB 2021-06-07 15:11:15 -07:00
Melissa Elkadi d434439596 Using ul_config->prach_pdu in get_rach()
Also, changed freq_index hardcode to 0.
Logging ra_rnti in gNB and NR UE
2021-06-07 14:15:40 -07:00
Melissa Elkadi 2dc4addf11 Added logs for understanding mac->ra_rnti.
Need to figure out where to set ra_rnti in the NRUE.
2021-06-04 14:10:30 -07:00
Melissa Elkadi 6d93b6a663 Removed change to gNB scheduler
Changed NFAPI_mode check in the gNB scheduler
to ensure that the frame is correctly updated for
msg3. Also added comments in NR UE for handling
the RAR and implementing the dci/rx_ind handover
for the RAR procedure.
2021-06-04 10:02:17 -07:00
Melissa Elkadi 0dfffed0d2 Added processing RAR function. Still WIP. 2021-06-03 14:33:43 -07:00
Melissa Elkadi 4f5f1a27da Checking dl_tti and ul_tti for RAR and Msg3 2021-06-03 13:09:34 -07:00
Melissa Elkadi 5ba3d16fbc gNB scheduler was not updating Msg3 future frame
The fix added in this commit may not be correct and
should be reviewed by Eurecom. For now we set the
future frame based on the PRACH recevied frame + 1.
Also fixed the copying of RACH ind into UL_INFO global.
RAR is being passed to NR UE.
2021-06-03 12:24:13 -07:00
Melissa Elkadi 6299d4515e Creating UL_ind RACH handle function in VNF
Also fixed a few bugs in nr-nFAPI:
- Push16->push8 fix in packing of RACH
- Allocating memory for pdu_list and preamble_list in unpack
- Properly indexing through both lists during unpack
- Created new nr_rach handling function
2021-06-02 16:33:12 -07:00
Melissa Elkadi f768b90f59 Fixing how we set slot_tx in the NR UE.
Also fixed unpacking ul_tti_inds.
2021-06-02 10:02:03 -07:00
Melissa Elkadi 2949d3008e Updating gNB configuration for EMANE 2021-06-01 15:57:41 -07:00
Melissa Elkadi 7a7b668e16 The pRACH is now only generated for slot 19.
Several other changes in this commit include:
- Setting the number of PDUS in the ul_config
  to be zero when we will it (inside of the
  get_ul_config() function.)
- We reset the nprach flag to 0 for each slot.
- We return out of the prach scheduler if
  mac->ul_config == NULL
- Added error checking for array indexing
- Created a dummy scheduler response function.
- Allocated ul_config_req initially
2021-06-01 12:09:15 -07:00
Melissa Elkadi 7db52420bf Created new fill_rach function in the NR UE
Also calling the new L1_nsa_prach_procedures()
function after using the nr_ue_scheduler. Added
some error checking in the nr_ue_scheduler. Added
some error checking in the process_nsa_msg in both
the NR and LTE UE
2021-05-28 15:30:56 -07:00
Melissa Elkadi 4fb87f9d08 Filling rach_ind and sending to proxy
Seems to be working at the moment but
may need to add more info in the rach_ind.
Also, need to verify gNB is getting the
rach_ind and starting RA procedure.
2021-05-27 15:46:00 -07:00
Melissa Elkadi 7a15a21980 Fix copy/paste error 2021-05-27 15:27:43 -07:00
Melissa Elkadi 96be5588b4 Ready to fill rach indication.
Had to hack the code to schedule the prach.
Need to verify this is ok because ul_config = NULL.
Also had to change logic for calling fill_schedule_response.
2021-05-27 12:53:27 -07:00
Melissa Elkadi b32e3f735f This commit breaks in RACH procedure
However, we are not properly calling the
nr_ue_get_rach() function. The RA is being
properly initialized. In the nr_ue_get_rach()
the pRACH is not scheduled. Tried to add in
the scheduling of this, but it crashes here.
The other changes include revering the
nr_ue_get_rach() changes from previous commit.
Also, changed a few log levels and reverted
a previous change in the NR UE RRC layer that
was incorrect.
2021-05-26 14:36:29 -07:00
Melissa Elkadi eecd5935ee Not working pRACH but starting it 2021-05-25 15:56:08 -07:00
Melissa Elkadi f3c2a2a659 Changed LOG_As and logic in NR_Cap filling 2021-05-25 15:50:54 -07:00
Melissa Elkadi 005c2e0121 Creating seprate proxy config files 2021-05-25 11:57:33 -07:00
Melissa Elkadi 67cbf77a2b Removing a log 2021-05-24 18:58:17 -07:00