Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
OpenXG
OpenXG UE
Commits
1e7136f3
Commit
1e7136f3
authored
Feb 28, 2019
by
nepes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removal of logs
parent
d2514f24
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/pucch.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+7
-7
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-1
No files found.
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @
1e7136f3
...
@@ -1368,7 +1368,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
...
@@ -1368,7 +1368,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
LOG_D
(
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
,
"In pucch.c PUCCH 1a/b: ACK subframe %d : sigma2_dB %d, stat_max %d, pucch1_thres %d
\n
"
,
subframe
,
sigma2_dB
,
dB_fixed
(
stat_max
),
pucch1_thres
);
LOG_
D
(
PHY
,
"In pucch.c PUCCH 1a/b: ACK 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
);
...
@@ -1385,7 +1385,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
...
@@ -1385,7 +1385,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
,
"In pucch.c 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
,
"In pucch.c 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
);
#endif
#endif
*
payload
=
4
;
// DTX
*
payload
=
4
;
// DTX
...
...
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
1e7136f3
...
@@ -2007,7 +2007,7 @@ schedule_ue_spec_br(module_id_t module_idP,
...
@@ -2007,7 +2007,7 @@ schedule_ue_spec_br(module_id_t module_idP,
/* Simple scheduler for 1 repetition, 1 HARQ */
/* Simple scheduler for 1 repetition, 1 HARQ */
if
(
subframeP
==
5
)
{
// MPDCCH
if
(
subframeP
==
5
)
{
// MPDCCH
LOG_I
(
MAC
,
"MPDCCH round_DL = %d in frame %d subframe %d
\n
"
,
round_DL
,
frameP
,
subframeP
);
if
(
round_DL
<
8
)
LOG_D
(
MAC
,
"MPDCCH round_DL = %d in frame %d subframe %d
\n
"
,
round_DL
,
frameP
,
subframeP
);
if
(
round_DL
==
8
)
{
if
(
round_DL
==
8
)
{
rlc_status
.
bytes_in_buffer
=
0
;
rlc_status
.
bytes_in_buffer
=
0
;
...
@@ -2054,7 +2054,7 @@ schedule_ue_spec_br(module_id_t module_idP,
...
@@ -2054,7 +2054,7 @@ schedule_ue_spec_br(module_id_t module_idP,
sdu_lengths
[
0
]
=
0
;
sdu_lengths
[
0
]
=
0
;
if
(
rlc_status
.
bytes_in_buffer
>
0
)
{
// There is DCCH to transmit
if
(
rlc_status
.
bytes_in_buffer
>
0
)
{
// There is DCCH to transmit
LOG_
I
(
MAC
,
"[eNB %d] Frame %d, DL-DCCH->DLSCH CC_id %d, Requesting %d bytes from RLC (RRC message)
\n
"
,
LOG_
D
(
MAC
,
"[eNB %d] Frame %d, DL-DCCH->DLSCH CC_id %d, Requesting %d bytes from RLC (RRC message)
\n
"
,
module_idP
,
module_idP
,
frameP
,
frameP
,
CC_id
,
CC_id
,
...
@@ -2115,7 +2115,7 @@ schedule_ue_spec_br(module_id_t module_idP,
...
@@ -2115,7 +2115,7 @@ schedule_ue_spec_br(module_id_t module_idP,
sdu_lengths
[
num_sdus
]
=
0
;
sdu_lengths
[
num_sdus
]
=
0
;
if
(
rlc_status
.
bytes_in_buffer
>
0
)
{
if
(
rlc_status
.
bytes_in_buffer
>
0
)
{
LOG_
I
(
MAC
,
"[eNB %d], Frame %d, DCCH1->DLSCH, CC_id %d, Requesting %d bytes from RLC (RRC message)
\n
"
,
LOG_
D
(
MAC
,
"[eNB %d], Frame %d, DCCH1->DLSCH, CC_id %d, Requesting %d bytes from RLC (RRC message)
\n
"
,
module_idP
,
module_idP
,
frameP
,
frameP
,
CC_id
,
CC_id
,
...
@@ -2196,7 +2196,7 @@ schedule_ue_spec_br(module_id_t module_idP,
...
@@ -2196,7 +2196,7 @@ schedule_ue_spec_br(module_id_t module_idP,
rnti
);
rnti
);
}
}
LOG_
I
(
MAC
,
"[eNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting %d bytes from RLC (lcid %d total hdr len %d)
\n
"
,
LOG_
D
(
MAC
,
"[eNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting %d bytes from RLC (lcid %d total hdr len %d)
\n
"
,
module_idP
,
module_idP
,
frameP
,
frameP
,
TBS
-
header_len_dcch
-
sdu_length_total
-
header_len_dtch
,
TBS
-
header_len_dcch
-
sdu_length_total
-
header_len_dtch
,
...
@@ -2281,7 +2281,7 @@ schedule_ue_spec_br(module_id_t module_idP,
...
@@ -2281,7 +2281,7 @@ schedule_ue_spec_br(module_id_t module_idP,
TBS
=
get_TBS_DL
(
mcs
,
6
);
TBS
=
get_TBS_DL
(
mcs
,
6
);
}
}
LOG_
I
(
MAC
,
"[eNB %d] CC_id %d Generated DLSCH header (mcs %d, TBS %d, nb_rb %d)
\n
"
,
LOG_
D
(
MAC
,
"[eNB %d] CC_id %d Generated DLSCH header (mcs %d, TBS %d, nb_rb %d)
\n
"
,
module_idP
,
module_idP
,
CC_id
,
CC_id
,
mcs
,
mcs
,
...
@@ -2477,12 +2477,12 @@ schedule_ue_spec_br(module_id_t module_idP,
...
@@ -2477,12 +2477,12 @@ schedule_ue_spec_br(module_id_t module_idP,
UE_template
->
mcs
[
harq_pid
]
=
dl_config_pdu
->
mpdcch_pdu
.
mpdcch_pdu_rel13
.
mcs
;
UE_template
->
mcs
[
harq_pid
]
=
dl_config_pdu
->
mpdcch_pdu
.
mpdcch_pdu_rel13
.
mcs
;
}
}
}
else
if
((
subframeP
==
7
)
&&
(
round_DL
<
8
))
{
// DLSCH
}
else
if
((
subframeP
==
7
)
&&
(
round_DL
<
8
))
{
// DLSCH
LOG_
I
(
MAC
,
"DLSCH round_DL = %d in frame %d subframe %d
\n
"
,
round_DL
,
frameP
,
subframeP
);
LOG_
D
(
MAC
,
"DLSCH round_DL = %d in frame %d subframe %d
\n
"
,
round_DL
,
frameP
,
subframeP
);
int
absSF
=
(
frameP
*
10
)
+
subframeP
;
int
absSF
=
(
frameP
*
10
)
+
subframeP
;
/* Have to check that MPDCCH was generated */
/* Have to check that MPDCCH was generated */
LOG_
I
(
MAC
,
"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Generating DLSCH (ce_level %d RNTI %x)
\n
"
,
LOG_
D
(
MAC
,
"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Generating DLSCH (ce_level %d RNTI %x)
\n
"
,
module_idP
,
module_idP
,
CC_id
,
CC_id
,
frameP
,
frameP
,
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
1e7136f3
...
@@ -4074,7 +4074,7 @@ extract_harq(module_id_t mod_idP,
...
@@ -4074,7 +4074,7 @@ extract_harq(module_id_t mod_idP,
}
}
}
}
LOG_
I
(
PHY
,
"In extract_harq(): pdu[0] = %d for harq_pid = %d
\n
"
,
pdu
[
0
],
harq_pid
);
LOG_
D
(
MAC
,
"In extract_harq(): pdu[0] = %d for harq_pid = %d
\n
"
,
pdu
[
0
],
harq_pid
);
if
(
pdu
[
0
]
==
1
)
{
// ACK
if
(
pdu
[
0
]
==
1
)
{
// ACK
sched_ctl
->
round
[
CC_idP
][
harq_pid
]
=
8
;
// release HARQ process
sched_ctl
->
round
[
CC_idP
][
harq_pid
]
=
8
;
// release HARQ process
...
...
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