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
ZhouShuya
OpenXG-RAN
Commits
d74f2da9
Commit
d74f2da9
authored
6 years ago
by
nepes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes to configuration file for eMTC (pucch parameters)
parent
669724c1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/pucch.c
+1
-1
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
...JECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
+3
-3
No files found.
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @
d74f2da9
...
@@ -978,7 +978,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
...
@@ -978,7 +978,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
m
=
(
n1_pucch
<
thres
)
?
NRB2
:
(((
n1_pucch
-
thres
)
/
(
12
*
c
/
deltaPUCCH_Shift
))
+
NRB2
+
((
deltaPUCCH_Shift
*
Ncs1_div_deltaPUCCH_Shift
)
>>
3
)
+
rem
);
m
=
(
n1_pucch
<
thres
)
?
NRB2
:
(((
n1_pucch
-
thres
)
/
(
12
*
c
/
deltaPUCCH_Shift
))
+
NRB2
+
((
deltaPUCCH_Shift
*
Ncs1_div_deltaPUCCH_Shift
)
>>
3
)
+
rem
);
#ifdef DEBUG_PUCCH_RX
#ifdef DEBUG_PUCCH_RX
printf
(
"[eNB] PUCCH: m %d
\n
"
,
m
);
printf
(
"[eNB] PUCCH: m %d
, thres %d, NRB2 %d
\n
"
,
m
,
thres
,
NRB2
);
#endif
#endif
nsymb
=
N_UL_symb
<<
1
;
nsymb
=
N_UL_symb
<<
1
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
d74f2da9
...
@@ -789,7 +789,7 @@ void uci_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc)
...
@@ -789,7 +789,7 @@ void uci_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc)
,
uci
->
ue_type
,
uci
->
ue_type
#endif
#endif
);
);
//dump_ulsch(eNB,frame,subframe,0,0); exit(-1);
/* cancel SR detection if reception on n1_pucch0 is better than on SR PUCCH resource index, otherwise send it up to MAC */
/* cancel SR detection if reception on n1_pucch0 is better than on SR PUCCH resource index, otherwise send it up to MAC */
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
d74f2da9
...
@@ -1351,7 +1351,7 @@ check_Msg4_retransmission(module_id_t module_idP, int CC_idP,
...
@@ -1351,7 +1351,7 @@ check_Msg4_retransmission(module_id_t module_idP, int CC_idP,
}
// Msg4 frame/subframe
}
// Msg4 frame/subframe
}
// regular LTE case
}
// regular LTE case
}
else
{
}
else
{
LOG_
D
(
MAC
,
LOG_
I
(
MAC
,
"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d : Msg4 acknowledged
\n
"
,
"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d : Msg4 acknowledged
\n
"
,
module_idP
,
CC_idP
,
frameP
,
subframeP
);
module_idP
,
CC_idP
,
frameP
,
subframeP
);
ra
->
state
=
IDLE
;
ra
->
state
=
IDLE
;
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
View file @
d74f2da9
...
@@ -48,9 +48,9 @@ eNBs =
...
@@ -48,9 +48,9 @@ eNBs =
prach_zero_correlation
=
1
;
prach_zero_correlation
=
1
;
prach_freq_offset
=
1
;
prach_freq_offset
=
1
;
pucch_delta_shift
=
1
;
pucch_delta_shift
=
1
;
pucch_nRB_CQI
=
1
;
pucch_nRB_CQI
=
0
;
pucch_nCS_AN
=
0
;
pucch_nCS_AN
=
0
;
pucch_n1_AN
=
32
;
pucch_n1_AN
=
0
;
pdsch_referenceSignalPower
= -
27
;
pdsch_referenceSignalPower
= -
27
;
pdsch_p_b
=
0
;
pdsch_p_b
=
0
;
pusch_n_SB
=
1
;
pusch_n_SB
=
1
;
...
@@ -262,7 +262,7 @@ eNBs =
...
@@ -262,7 +262,7 @@ eNBs =
n1PUCCH_AN_InfoList_r13
=
n1PUCCH_AN_InfoList_r13
=
(
(
{
{
pucch_info_value
=
0
;
pucch_info_value
=
33
;
}
}
);
);
...
...
This diff is collapsed.
Click to expand it.
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