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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
da500691
Commit
da500691
authored
Mar 12, 2017
by
Raymond Knopp
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conflict resolution after merge with develop
parent
63e7c171
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
687 additions
and
1161 deletions
+687
-1161
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+0
-9
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+687
-1152
No files found.
targets/RT/USER/lte-enb.c
View file @
da500691
...
@@ -1046,10 +1046,6 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
...
@@ -1046,10 +1046,6 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
exit_fun
(
"Exiting"
);
exit_fun
(
"Exiting"
);
}
}
}
else
{
}
else
{
<<<<<<<
HEAD
// proc->first_rx = 0;
=======
>>>>>>>
origin
/
develop
proc
->
first_rx
--
;
proc
->
first_rx
--
;
*
frame
=
proc
->
frame_rx
;
*
frame
=
proc
->
frame_rx
;
*
subframe
=
proc
->
subframe_rx
;
*
subframe
=
proc
->
subframe_rx
;
...
@@ -1725,14 +1721,9 @@ void init_eNB_proc(int inst) {
...
@@ -1725,14 +1721,9 @@ void init_eNB_proc(int inst) {
proc
->
instance_cnt_FH
=
-
1
;
proc
->
instance_cnt_FH
=
-
1
;
proc
->
instance_cnt_asynch_rxtx
=
-
1
;
proc
->
instance_cnt_asynch_rxtx
=
-
1
;
proc
->
CC_id
=
CC_id
;
proc
->
CC_id
=
CC_id
;
<<<<<<<
HEAD
proc
->
first_rx
=
100
;
proc
->
first_rx
=
100
;
=======
proc
->
instance_cnt_synch
=
-
1
;
proc
->
instance_cnt_synch
=
-
1
;
proc
->
first_rx
=
1
;
>>>>>>>
origin
/
develop
proc
->
first_tx
=
1
;
proc
->
first_tx
=
1
;
proc
->
frame_offset
=
0
;
proc
->
frame_offset
=
0
;
...
...
targets/RT/USER/lte-ue.c
View file @
da500691
This diff is collapsed.
Click to expand it.
FANG WANG
@wf
mentioned in commit
b4e48d88
·
Jul 05, 2022
mentioned in commit
b4e48d88
mentioned in commit b4e48d88298e04f14b6c11fc0224cf1327224240
Toggle commit list
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