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
ccdf1aff
Commit
ccdf1aff
authored
Jul 20, 2018
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
86180447
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/pucch.c
+3
-3
openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c
+1
-1
No files found.
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @
ccdf1aff
...
@@ -1351,9 +1351,9 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
...
@@ -1351,9 +1351,9 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
}
// aa
}
// aa
LOG_
I
(
PHY
,
"PUCCH 1a/b: subframe %d : stat %d,%d (pos %d)
\n
"
,
subframe
,
stat_re
,
stat_im
,
LOG_
D
(
PHY
,
"PUCCH 1a/b: subframe %d : stat %d,%d (pos %d)
\n
"
,
subframe
,
stat_re
,
stat_im
,
(
subframe
<<
10
)
+
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
]));
(
subframe
<<
10
)
+
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
]));
LOG_
I
(
PHY
,
"PUCCH 1a/b: subframe %d : sigma2_dB %d, stat_max %d, pucch1_thres %d
\n
"
,
subframe
,
sigma2_dB
,
dB_fixed
(
stat_max
),
pucch1_thres
);
LOG_
D
(
PHY
,
"PUCCH 1a/b: subframe %d : sigma2_dB %d, stat_max %d, pucch1_thres %d
\n
"
,
subframe
,
sigma2_dB
,
dB_fixed
(
stat_max
),
pucch1_thres
);
eNB
->
pucch1ab_stats
[
UE_id
][(
subframe
<<
11
)
+
2
*
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
])]
=
(
stat_re
);
eNB
->
pucch1ab_stats
[
UE_id
][(
subframe
<<
11
)
+
2
*
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
])]
=
(
stat_re
);
eNB
->
pucch1ab_stats
[
UE_id
][(
subframe
<<
11
)
+
1
+
2
*
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
])]
=
(
stat_im
);
eNB
->
pucch1ab_stats
[
UE_id
][(
subframe
<<
11
)
+
1
+
2
*
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
])]
=
(
stat_im
);
...
@@ -1370,7 +1370,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
...
@@ -1370,7 +1370,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
#if defined(USRP_REC_PLAY)
#if defined(USRP_REC_PLAY)
LOG_D
(
PHY
,
"PUCCH 1a/b: NAK subframe %d : sigma2_dB %d, stat_max %d, pucch1_thres %d
\n
"
,
subframe
,
sigma2_dB
,
dB_fixed
(
stat_max
),
pucch1_thres
);
LOG_D
(
PHY
,
"PUCCH 1a/b: NAK subframe %d : sigma2_dB %d, stat_max %d, pucch1_thres %d
\n
"
,
subframe
,
sigma2_dB
,
dB_fixed
(
stat_max
),
pucch1_thres
);
#else
#else
LOG_
I
(
PHY
,
"PUCCH 1a/b: subframe %d : sigma2_dB %d, stat_max %d, pucch1_thres %d
\n
"
,
subframe
,
sigma2_dB
,
dB_fixed
(
stat_max
),
pucch1_thres
);
LOG_
D
(
PHY
,
"PUCCH 1a/b: subframe %d : sigma2_dB %d, stat_max %d, pucch1_thres %d
\n
"
,
subframe
,
sigma2_dB
,
dB_fixed
(
stat_max
),
pucch1_thres
);
#endif
#endif
*
payload
=
4
;
// DTX
*
payload
=
4
;
// DTX
((
int16_t
*
)
&
eNB
->
pucch1ab_stats
[
UE_id
][(
subframe
<<
10
)
+
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
])])[
0
]
=
(
int16_t
)(
stat_re
);
((
int16_t
*
)
&
eNB
->
pucch1ab_stats
[
UE_id
][(
subframe
<<
10
)
+
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
])])[
0
]
=
(
int16_t
)(
stat_re
);
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c
View file @
ccdf1aff
...
@@ -161,7 +161,7 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
...
@@ -161,7 +161,7 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
* (and to build PDCP Control PDU for PDCP status report)
* (and to build PDCP Control PDU for PDCP status report)
*/
*/
if
(
pdcp_mark_current_pdu_as_received
(
seq_num
,
pdcp_entity
)
==
TRUE
)
{
if
(
pdcp_mark_current_pdu_as_received
(
seq_num
,
pdcp_entity
)
==
TRUE
)
{
LOG_
I
(
PDCP
,
"Received sequence number successfuly marked
\n
"
);
LOG_
D
(
PDCP
,
"Received sequence number successfuly marked
\n
"
);
}
else
{
}
else
{
LOG_W
(
PDCP
,
"Cannot mark received sequence number on the bitmap!
\n
"
);
LOG_W
(
PDCP
,
"Cannot mark received sequence number on the bitmap!
\n
"
);
}
}
...
...
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