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
7f2459ed
Commit
7f2459ed
authored
Jun 29, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing for TDD (configuration 1)
parent
5a808cb1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c
openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c
+8
-8
No files found.
openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c
View file @
7f2459ed
...
@@ -96,9 +96,9 @@ void generate_pucch1x(int32_t **txdataF,
...
@@ -96,9 +96,9 @@ void generate_pucch1x(int32_t **txdataF,
Nprime_div_deltaPUCCH_Shift
=
(
n1_pucch
<
thres
)
?
Ncs1_div_deltaPUCCH_Shift
:
(
12
/
deltaPUCCH_Shift
);
Nprime_div_deltaPUCCH_Shift
=
(
n1_pucch
<
thres
)
?
Ncs1_div_deltaPUCCH_Shift
:
(
12
/
deltaPUCCH_Shift
);
Nprime
=
Nprime_div_deltaPUCCH_Shift
*
deltaPUCCH_Shift
;
Nprime
=
Nprime_div_deltaPUCCH_Shift
*
deltaPUCCH_Shift
;
//
#ifdef DEBUG_PUCCH_TX
#ifdef DEBUG_PUCCH_TX
printf
(
"[PHY] PUCCH: cNcs1/deltaPUCCH_Shift %d, Nprime %d, n1_pucch %d
\n
"
,
thres
,
Nprime
,
n1_pucch
);
printf
(
"[PHY] PUCCH: cNcs1/deltaPUCCH_Shift %d, Nprime %d, n1_pucch %d
\n
"
,
thres
,
Nprime
,
n1_pucch
);
//
#endif
#endif
LOG_I
(
PHY
,
"[PHY] PUCCH: n1_pucch %d, thres %d Ncs1_div_deltaPUCCH_Shift %d (12/deltaPUCCH_Shift) %d Nprime_div_deltaPUCCH_Shift %d
\n
"
,
LOG_I
(
PHY
,
"[PHY] PUCCH: n1_pucch %d, thres %d Ncs1_div_deltaPUCCH_Shift %d (12/deltaPUCCH_Shift) %d Nprime_div_deltaPUCCH_Shift %d
\n
"
,
n1_pucch
,
thres
,
Ncs1_div_deltaPUCCH_Shift
,
(
int
)(
12
/
deltaPUCCH_Shift
),
Nprime_div_deltaPUCCH_Shift
);
n1_pucch
,
thres
,
Ncs1_div_deltaPUCCH_Shift
,
(
int
)(
12
/
deltaPUCCH_Shift
),
Nprime_div_deltaPUCCH_Shift
);
...
@@ -117,15 +117,15 @@ void generate_pucch1x(int32_t **txdataF,
...
@@ -117,15 +117,15 @@ void generate_pucch1x(int32_t **txdataF,
else
{
else
{
d
=
(
frame_parms
->
Ncp
==
0
)
?
2
:
0
;
d
=
(
frame_parms
->
Ncp
==
0
)
?
2
:
0
;
h
=
(
nprime0
+
d
)
%
(
c
*
Nprime_div_deltaPUCCH_Shift
);
h
=
(
nprime0
+
d
)
%
(
c
*
Nprime_div_deltaPUCCH_Shift
);
//
#ifdef DEBUG_PUCCH_TX
#ifdef DEBUG_PUCCH_TX
printf
(
"[PHY] PUCCH: h %d, d %d
\n
"
,
h
,
d
);
printf
(
"[PHY] PUCCH: h %d, d %d
\n
"
,
h
,
d
);
//
#endif
#endif
nprime1
=
(
h
/
c
)
+
(
h
%
c
)
*
Nprime_div_deltaPUCCH_Shift
;
nprime1
=
(
h
/
c
)
+
(
h
%
c
)
*
Nprime_div_deltaPUCCH_Shift
;
}
}
//
#ifdef DEBUG_PUCCH_TX
#ifdef DEBUG_PUCCH_TX
printf
(
"[PHY] PUCCH: nprime0 %d nprime1 %d, %s, payload (%d,%d)
\n
"
,
nprime0
,
nprime1
,
pucch_format_string
[
fmt
],
payload
[
0
],
payload
[
1
]);
printf
(
"[PHY] PUCCH: nprime0 %d nprime1 %d, %s, payload (%d,%d)
\n
"
,
nprime0
,
nprime1
,
pucch_format_string
[
fmt
],
payload
[
0
],
payload
[
1
]);
//
#endif
#endif
n_oc0
=
nprime0
/
Nprime_div_deltaPUCCH_Shift
;
n_oc0
=
nprime0
/
Nprime_div_deltaPUCCH_Shift
;
...
@@ -137,9 +137,9 @@ void generate_pucch1x(int32_t **txdataF,
...
@@ -137,9 +137,9 @@ void generate_pucch1x(int32_t **txdataF,
if
(
frame_parms
->
Ncp
==
1
)
// extended CP
if
(
frame_parms
->
Ncp
==
1
)
// extended CP
n_oc1
<<=
1
;
n_oc1
<<=
1
;
//
#ifdef DEBUG_PUCCH_TX
#ifdef DEBUG_PUCCH_TX
printf
(
"[PHY] PUCCH: noc0 %d noc1 %d
\n
"
,
n_oc0
,
n_oc1
);
printf
(
"[PHY] PUCCH: noc0 %d noc1 %d
\n
"
,
n_oc0
,
n_oc1
);
//
#endif
#endif
nprime
=
nprime0
;
nprime
=
nprime0
;
n_oc
=
n_oc0
;
n_oc
=
n_oc0
;
...
...
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