Commit Graph
506 Commits
Author SHA1 Message Date
Raymond Knopp 90c66bb7b1 Merge remote-tracking branch 'origin/develop' into aw2s-n41
Conflicts:
	executables/nr-softmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-01-24 11:11:46 +01:00
Melissa Elkadi e7ef264226 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-21 06:02:40 -08:00
Melissa Elkadi 30c14c2f5a nFAPI bug fix. Not properly packing/unpacking PUCCH PDU 2021-12-21 05:51:25 -08:00
mjoang 43eb8e40ac enable running thread in parallel for RFSIM. 2021-12-17 14:09:00 -05:00
Melissa Elkadi 4f9c2bd869 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-29 14:33:23 -08:00
mjoang 31f12b62e0 fix the race condition in UE where PUSCH could not be sent when UE sends PUCCH and PUSCH at the same slot. 2021-11-29 10:15:02 -05:00
francescomani fa2ce6e680 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-11-26 11:34:22 +01:00
hardy 53692ff57a Merge remote-tracking branch 'origin/nfapi-carriage-returns' into integration_2021_wk47_b 2021-11-24 09:43:12 +01:00
Melissa Elkadi 94d146e80b Renaming queue.h in PHY_INTERFACE layer to queue_t.h
There are two queue.h files in this repository.
2021-11-23 08:05:58 -08:00
Melissa Elkadi c08b0c2b56 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-23 06:24:33 -08:00
hardy 79117d4c67 Merge remote-tracking branch 'origin/NR_ULSCH_decoding' into integration_2021_wk46_c 2021-11-19 09:28:01 +01:00
francescomani 2eac9f53c7 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-11-11 16:35:46 +01:00
Melissa Elkadi 046258f1ba Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-09 15:17:58 -08:00
mjoang ed84d40f72 add mutex to protect ul_config_pdu against race condition. 2021-11-03 14:30:42 -04:00
Melissa Elkadi 66144698c7 Reverting log and white space changes for MR 2021-10-28 08:51:09 -07:00
Melissa Elkadi 8a56d146cc Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs 2021-10-25 11:07:59 -07:00
francescomani 0033e5cf89 fixes for RA proceduere at OAI UE 2021-10-25 18:08:25 +02:00
Melissa bcca4aad81 Revert "tx_data_request len field is a uint16_t"
This reverts commit e630bf1c52
2021-10-19 21:08:14 +00:00
Melissa Elkadi 58eb8d2af4 Creating new queue for ul_ttis if dl_tti is late
Also, this commit changes the len argument in the
pusharray32 to match the actual field type (uint16_t).
There is also simple name change from sf -> slot.
The new queueing system is not a permanent solution.
It was simply a way for us to try to handle late
dl_tti_requests. If we queue every single ul_tti_req
that we get, the queue gets full very quickly becasue
we only remove ul_ttis from the queue when a uci has
been populated with a matching sfn/sf. Because of this,
we only queue ul_ttis if we have a uci_indication
prepared already. Rarely, a dl_tti_req will arrive at
the NRUE too late, and the NRUE does not have time
to create the uci_ind so we dont process the corresponding
ul_tti. A seprate queue was made to hold all other ul_ttis
the arrive in the NRUE (this queue will continuously
get full and then emptied) but will occasionally hold
a ul_tti that corresponds to a uci that hasnt
been populated yet.
2021-10-19 07:59:55 -07:00
Melissa Elkadi e630bf1c52 tx_data_request len field is a uint16_t
In the pusharray32, used exclusively by the
    tx_data_request, the len argument passed in
    is defined as a uint32_t. This update fixes
    the passed in argument to be defined as a
    uint16_t instead.
2021-10-18 18:50:12 -07:00
Michael Cook 6b5bfed9b8 open-nFAPI: Remove carriage returns
Remove the problematic carriage returns from three nfapi source
files.

Only whitespace changes in this commit.

```
dos2unix open-nFAPI/*/src/*.c
```
2021-10-03 06:49:13 -07:00
Melissa Elkadi a5d6ff5a75 We are now sending either SR or HARQ based on UL_TTI_REQ
This requires some updates to the nFAPI code as well.
We also have declared the def_dci_rel15 extern variable
consistently throughout the code.

In this commit, the gNB is still crashing. However, it seems
that the NSA UE is sending the proper responses back, but there
some sort of incorrect management of the def_dci_pdu_rel15
variable. If we memset this array to 0, we can see incorrect
0 assignments to elements of the UCI indications. Hopefully
fixing this issue will result in less gNB crashes.
2021-10-01 14:52:32 -07:00
Melissa Elkadi a30f6791f7 Incorrectly removed timeout variable in PNF
Also, putting memset back to help us locate a
bug in the handling of the def_dci_pdu_rel15
2021-09-30 15:57:10 -07:00
Melissa Elkadi 11ab8b55f0 Removing unused variables to get rid of warnings. 2021-09-30 06:29:35 -07:00
Melissa Elkadi 82af1cbc80 Correctly packing UCI indications
Also, removing memset for def_dci_pdu_rel15 because
it is setting the DL_BWP_ID = 0 before we have used
it.
2021-09-29 12:25:40 -07:00
Melissa Elkadi cf0430a5bc Correctly packing UCI indications.
Also, removing memset for def_dci_pdu_rel15 because
it is setting the DL_BWP_ID = 0 before we have used
it.
2021-09-29 12:15:58 -07: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 4b8f62b011 Added slot_ind queue and handling slot_inds in VNF 2021-09-23 21:54:22 +00:00
francescomani b10d32d8b8 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-08-27 16:02:58 +02:00
Melissa Elkadi 2c5f0af081 CFRA procedure is working! But gNB still crashes
How? Well, we had to properly allocate the
ul_config_req. We also had to update the
ue_get_rach function. There were several
places where the functionality would check
for a particular mode (ra, sa, phy_test, etc).
In some of these places we had to add NSA mode.
In the VNF, they start the scheduler after 3 sec,
this is sort of a hack, might want to revisit.
This commit also includes removal of printfs.
2021-08-18 16:09:37 -07:00
David Kim 933dcd2894 Updated vnf codes to fix merge errors.
1. Prototype of nr indication functions were updated.
2. nr_rx_indication name changed to nr_rx_data_indication
3. Added other logs and assert conditions that were gone away from merge.
4. pnf files were not touched.
5. To be sync with original nfapi branch, the following file was checkout from eurocom-nfapi_nr_arch_mod
   nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h
2021-08-17 10:03:06 -07:00
Melissa Elkadi 2a979f4e2f Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop 2021-08-13 10:27:30 -07:00
Rahul Gottipati 540d2e2977 Rebase to latest develop 2021-08-12 15:20:16 +05:30
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
Mahesh 49fc03a65e Cleanup and some minor bugfixes 2021-08-11 13:16:32 +05:30
Mahesh 37e7db80a3 documentation typo, build error, pack/unpack bug fix 2021-08-10 14:22:50 +05:30
Rahul Gottipati 09e32b2839 Code cleanup and documentation update 2021-08-09 19:41:22 +05:30
Rahul Gottipati 78f3bca19a CSI-RS handling in nFAPI 2021-08-09 16:36:27 +05:30
Raphael Defosseux 5f9e0a235d Merge remote-tracking branch 'origin/code-cleanup-20210716' into integration_2021_w32 2021-08-09 10:07:45 +02:00
Rahul Gottipati 74c5816c72 VNF clock dependency removed 2021-08-05 17:30:12 +05:30
Melissa Elkadi 745241bd63 Merge branch 'episys/nsa_epc_gnb_updates' into episys/david/multiUE_with_crnti_checking
Also, lots of debugging logs added
2021-08-04 16:24:27 -07:00
Rahul Gottipati 4ec3434128 Rebase to latest develop 2021-08-04 14:57:52 +05:30
Gokul Srinivasan 85b8f78d71 process ID overflow bugfix 2021-08-03 17:57:11 +05:30
Laurent OpenCells d649434be9 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716 2021-07-29 22:29:52 +02:00
David Kim 38e5415f34 Fixing "Unexpected ULSCH HARQ PID" issue.
1. If VNF is slower than PNF, next scheduling will be done after resync.
2. If VNF is unstable in slot progress, next scheduling will be done in next stable status.
3. SFN/SLOT indications are queued in nrUE.
4. get_queue is used instead of unquque for FIFO operation.
2021-07-27 21:02:01 -07:00
spclab ac4ae0e0fd Hardcodings removed fully, system runs but unstable 2021-07-27 15:10:54 +05:30
francescomani 5c70aa96c4 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-26 07:39:57 +02:00
Laurent Thomas b3f3a1db57 try another gcc option for ubuntu 16, one fix in fapi p7 2021-07-23 16:38:01 +02:00
Laurent OpenCells f62b7e1f9e nfapi work around (missing malloc) 2021-07-22 15:32:09 +02:00