Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG-RAN
Commits
70aa9221
Commit
70aa9221
authored
Jan 10, 2023
by
wf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
../../../openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
parent
3331654e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-6
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
70aa9221
...
@@ -77,13 +77,8 @@ fifo_dump_emos_UE emos_dump_UE;
...
@@ -77,13 +77,8 @@ fifo_dump_emos_UE emos_dump_UE;
#include "intertask_interface.h"
#include "intertask_interface.h"
#include "T.h"
#include "T.h"
<<<<<<<
HEAD
#if defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
=======
char
nr_mode_string
[
NUM_UE_MODE
][
20
]
=
{
"NOT SYNCHED"
,
"PRACH"
,
"RAR"
,
"RA_WAIT_CR"
,
"PUSCH"
,
"RESYNCH"
};
#if defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706) || defined(OAI_OXGRF)
#if defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706) || defined(OAI_OXGRF)
>>>>>>>
d3d2964e65
...
add
OXGRF
support
extern
uint64_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint64_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment