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
wangjie
OpenXG-RAN
Commits
c493371f
Commit
c493371f
authored
Sep 10, 2020
by
heshanyun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix build error of ocp enb
parent
9e13adc7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
20 deletions
+0
-20
executables/main-fs6.c
executables/main-fs6.c
+0
-20
No files found.
executables/main-fs6.c
View file @
c493371f
...
@@ -769,11 +769,7 @@ void rcvFs6DL(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, int frame, i
...
@@ -769,11 +769,7 @@ void rcvFs6DL(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, int frame, i
int
curUE
=
hDLUE
(
bufPtr
)
->
UE_id
;
int
curUE
=
hDLUE
(
bufPtr
)
->
UE_id
;
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
curUE
][
0
];
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
curUE
][
0
];
LTE_DL_eNB_HARQ_t
*
dlsch_harq
=
dlsch0
->
harq_processes
[
hDLUE
(
bufPtr
)
->
harq_pid
];
LTE_DL_eNB_HARQ_t
*
dlsch_harq
=
dlsch0
->
harq_processes
[
hDLUE
(
bufPtr
)
->
harq_pid
];
#ifdef PHY_TX_THREAD
dlsch0
->
active
[
subframe
]
=
1
;
dlsch0
->
active
[
subframe
]
=
1
;
#else
dlsch0
->
active
=
1
;
#endif
dlsch0
->
harq_ids
[
frame
%
2
][
subframe
]
=
hDLUE
(
bufPtr
)
->
harq_pid
;
dlsch0
->
harq_ids
[
frame
%
2
][
subframe
]
=
hDLUE
(
bufPtr
)
->
harq_pid
;
dlsch0
->
rnti
=
hDLUE
(
bufPtr
)
->
rnti
;
dlsch0
->
rnti
=
hDLUE
(
bufPtr
)
->
rnti
;
dlsch0
->
sqrt_rho_a
=
hDLUE
(
bufPtr
)
->
sqrt_rho_a
;
dlsch0
->
sqrt_rho_a
=
hDLUE
(
bufPtr
)
->
sqrt_rho_a
;
...
@@ -894,11 +890,7 @@ void phy_procedures_eNB_TX_fromsplit(uint8_t *bufferZone, int nbBlocks, PHY_VARS
...
@@ -894,11 +890,7 @@ void phy_procedures_eNB_TX_fromsplit(uint8_t *bufferZone, int nbBlocks, PHY_VARS
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
UE_id
][
0
];
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
UE_id
][
0
];
if
(
dlsch0
&&
dlsch0
->
rnti
>
0
)
{
if
(
dlsch0
&&
dlsch0
->
rnti
>
0
)
{
#ifdef PHY_TX_THREAD
dlsch0
->
active
[
subframe
]
=
0
;
dlsch0
->
active
[
subframe
]
=
0
;
#else
dlsch0
->
active
=
0
;
#endif
}
}
}
}
...
@@ -955,11 +947,7 @@ void phy_procedures_eNB_TX_fromsplit(uint8_t *bufferZone, int nbBlocks, PHY_VARS
...
@@ -955,11 +947,7 @@ void phy_procedures_eNB_TX_fromsplit(uint8_t *bufferZone, int nbBlocks, PHY_VARS
LTE_eNB_DLSCH_t
*
dlsch1
=
eNB
->
dlsch
[
UE_id
][
1
];
LTE_eNB_DLSCH_t
*
dlsch1
=
eNB
->
dlsch
[
UE_id
][
1
];
if
((
dlsch0
)
&&
(
dlsch0
->
rnti
>
0
)
&&
if
((
dlsch0
)
&&
(
dlsch0
->
rnti
>
0
)
&&
#ifdef PHY_TX_THREAD
(
dlsch0
->
active
[
subframe
]
==
1
)
(
dlsch0
->
active
[
subframe
]
==
1
)
#else
(
dlsch0
->
active
==
1
)
#endif
)
{
)
{
uint64_t
sum
=
0
;
uint64_t
sum
=
0
;
...
@@ -1267,11 +1255,7 @@ void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rx
...
@@ -1267,11 +1255,7 @@ void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rx
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
UE_id
][
0
];
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
UE_id
][
0
];
if
((
dlsch0
)
&&
(
dlsch0
->
rnti
>
0
)
&&
if
((
dlsch0
)
&&
(
dlsch0
->
rnti
>
0
)
&&
#ifdef PHY_TX_THREAD
(
dlsch0
->
active
[
subframe
]
==
1
)
(
dlsch0
->
active
[
subframe
]
==
1
)
#else
(
dlsch0
->
active
==
1
)
#endif
)
{
)
{
// get harq_pid
// get harq_pid
int
harq_pid
=
dlsch0
->
harq_ids
[
frame
%
2
][
subframe
];
int
harq_pid
=
dlsch0
->
harq_ids
[
frame
%
2
][
subframe
];
...
@@ -1319,11 +1303,7 @@ void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rx
...
@@ -1319,11 +1303,7 @@ void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rx
}
}
}
}
}
else
if
((
dlsch0
)
&&
(
dlsch0
->
rnti
>
0
)
&&
}
else
if
((
dlsch0
)
&&
(
dlsch0
->
rnti
>
0
)
&&
#ifdef PHY_TX_THREAD
(
dlsch0
->
active
[
subframe
]
==
0
)
(
dlsch0
->
active
[
subframe
]
==
0
)
#else
(
dlsch0
->
active
==
0
)
#endif
)
{
)
{
// clear subframe TX flag since UE is not scheduled for PDSCH in this subframe (so that we don't look for PUCCH later)
// clear subframe TX flag since UE is not scheduled for PDSCH in this subframe (so that we don't look for PUCCH later)
//dlsch0->subframe_tx[subframe]=0;
//dlsch0->subframe_tx[subframe]=0;
...
...
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