Skip to content

O
OpenXG-RAN
Commit 868e40e1 authored by Mahesh's avatar Mahesh
Browse files
Options

Resolved errors due to merge

parent 185fcbf7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
nfapi/nrNFAPI.md
View file @ 868e40e1
...@@ -14,12 +14,12 @@ sudo ./build_oai --gNB --UE ...@@ -14,12 +14,12 @@ sudo ./build_oai --gNB --UE
### VNF command ### VNF command
``` ```
sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf --vnf --noS1 --phy-test sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf --nfapi 2 --noS1 --phy-test
``` ```
### PNF command ### PNF command
``` ```
sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf --pnf --rfsim --phy-test --rfsimulator.serveraddr server sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf --nfapi 1 --rfsim --phy-test --rfsimulator.serveraddr server
``` ```
### UE command ### UE command
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @ 868e40e1
...@@ -361,14 +361,8 @@ gNB_dlsch_ulsch_scheduler(module_id_t module_idP, ...@@ -361,14 +361,8 @@ gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
nr_rlc_tick(frame, slot >> *scc->ssbSubcarrierSpacing); nr_rlc_tick(frame, slot >> *scc->ssbSubcarrierSpacing);
nr_rrc_trigger(&ctxt, 0 /*CC_id*/, frame, slot >> *scc->ssbSubcarrierSpacing); nr_rrc_trigger(&ctxt, 0 /*CC_id*/, frame, slot >> *scc->ssbSubcarrierSpacing);
} }
<<<<<<< HEAD
const uint64_t dlsch_in_slot_bitmap = (1 << 1) | (1 << 2);
//const uint64_t dlsch_in_slot_bitmap = (1 << 2);
=======
const uint64_t dlsch_in_slot_bitmap = (1 << 1) | (1 << 3); const uint64_t dlsch_in_slot_bitmap = (1 << 1) | (1 << 3);
>>>>>>> develop
const uint64_t ulsch_in_slot_bitmap = (1 << 8); const uint64_t ulsch_in_slot_bitmap = (1 << 8);
memset(RC.nrmac[module_idP]->cce_list[bwp_id][0],0,MAX_NUM_CCE*sizeof(int)); // coreset0 memset(RC.nrmac[module_idP]->cce_list[bwp_id][0],0,MAX_NUM_CCE*sizeof(int)); // coreset0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment