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
02f3298a
Commit
02f3298a
authored
Mar 10, 2017
by
Rohit Gupta
Committed by
Calisson
Mar 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
several fixes to previous commit. First tests in FDD with USRP and UE ok.
parent
7f24927c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
18 deletions
+31
-18
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_init.c
+2
-1
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+20
-8
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
...PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
+8
-8
No files found.
openair1/PHY/INIT/lte_init.c
View file @
02f3298a
...
...
@@ -484,6 +484,7 @@ void phy_config_dedicated_eNB_step2(PHY_VARS_eNB *eNB)
if
(
physicalConfigDedicated
->
soundingRS_UL_ConfigDedicated
)
{
if
(
physicalConfigDedicated
->
soundingRS_UL_ConfigDedicated
->
present
==
SoundingRS_UL_ConfigDedicated_PR_setup
)
{
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
srsConfigDedicatedSetup
=
1
;
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
duration
=
physicalConfigDedicated
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
duration
;
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
cyclicShift
=
physicalConfigDedicated
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
cyclicShift
;
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
freqDomainPosition
=
physicalConfigDedicated
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
freqDomainPosition
;
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
02f3298a
...
...
@@ -822,9 +822,11 @@ void generate_eNB_ulsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC
LTE_DL_FRAME_PARMS
*
fp
=&
eNB
->
frame_parms
;
int
frame
=
proc
->
frame_tx
;
int
subframe
=
proc
->
subframe_tx
;
uint16_t
srsPeriodicity
;
uint16_t
srsOffset
;
uint16_t
srsPeriodicity
=
0
;
uint16_t
srsOffset
=
0
;
uint16_t
srsConfigIndex
=
0
;
uint16_t
do_srs
=
0
;
uint16_t
is_srs_pos
=
0
;
LOG_D
(
PHY
,
"[eNB %"
PRIu8
"][PUSCH %"
PRIu8
"] Frame %d subframe %d UL Frame %"
PRIu32
", UL Subframe %"
PRIu8
", Generated ULSCH (format0) DCI (rnti %"
PRIx16
", dci %"
PRIx8
"), aggregation %d
\n
"
,
...
...
@@ -840,12 +842,19 @@ void generate_eNB_ulsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC
dci_alloc
->
dci_pdu
[
0
],
1
<<
dci_alloc
->
L
);
if
(
is_srs_occasion_common
(
fp
,
frame
,
subframe
))
{
compute_srs_pos
(
fp
->
frame_type
,
eNB
->
physicalConfigDedicated
[
UE_id
]
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
srs_ConfigIndex
,
&
srsPeriodicity
,
&
srsOffset
);
if
((((
10
*
frame
+
subframe
)
%
srsPeriodicity
)
==
srsOffset
))
is_srs_pos
=
is_srs_occasion_common
(
fp
,
pdcch_alloc2ul_frame
(
fp
,
frame
,
subframe
),
pdcch_alloc2ul_subframe
(
fp
,
subframe
));
if
(
is_srs_pos
&&
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
srsConfigDedicatedSetup
)
{
srsConfigIndex
=
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
srs_ConfigIndex
;
compute_srs_pos
(
fp
->
frame_type
,
srsConfigIndex
,
&
srsPeriodicity
,
&
srsOffset
);
if
((((
10
*
pdcch_alloc2ul_frame
(
fp
,
frame
,
subframe
)
+
pdcch_alloc2ul_subframe
(
fp
,
subframe
))
%
srsPeriodicity
)
==
srsOffset
))
{
do_srs
=
1
;
}
}
LOG_D
(
PHY
,
"frame %d (%d), subframe %d (%d), UE_id %d: is_srs_pos %d, do_SRS %d, index %d, period %d, offset %d
\n
"
,
frame
,
pdcch_alloc2ul_frame
(
fp
,
frame
,
subframe
),
subframe
,
pdcch_alloc2ul_subframe
(
fp
,
subframe
),
UE_id
,
is_srs_pos
,
do_srs
,
srsConfigIndex
,
srsPeriodicity
,
srsOffset
);
generate_eNB_ulsch_params_from_dci
(
eNB
,
proc
,
&
dci_alloc
->
dci_pdu
[
0
],
...
...
@@ -2093,6 +2102,7 @@ void pucch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,int UE_id,int harq
uint16_t
srsPeriodicity
;
uint16_t
srsOffset
;
uint16_t
do_srs
=
0
;
uint16_t
is_srs_pos
=
0
;
if
((
eNB
->
dlsch
[
UE_id
][
0
])
&&
(
eNB
->
dlsch
[
UE_id
][
0
]
->
rnti
>
0
)
&&
...
...
@@ -2104,11 +2114,13 @@ void pucch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,int UE_id,int harq
// check if there is SRS and we have to use shortened format
// TODO: check for exceptions in transmission of SRS together with ACK/NACK
if
(
is_srs_occasion_common
(
fp
,
frame
,
subframe
))
{
compute_srs_pos
(
fp
->
frame_type
,
eNB
->
physicalConfigDedicated
[
UE_id
]
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
srs_ConfigIndex
,
&
srsPeriodicity
,
&
srsOffset
);
if
((((
10
*
frame
+
subframe
)
%
srsPeriodicity
)
==
srsOffset
))
is_srs_pos
=
is_srs_occasion_common
(
fp
,
pdcch_alloc2ul_frame
(
fp
,
frame
,
subframe
),
pdcch_alloc2ul_subframe
(
fp
,
subframe
));
if
(
is_srs_pos
&&
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
srsConfigDedicatedSetup
)
{
compute_srs_pos
(
fp
->
frame_type
,
eNB
->
soundingrs_ul_config_dedicated
[
UE_id
].
srs_ConfigIndex
,
&
srsPeriodicity
,
&
srsOffset
);
if
((((
10
*
pdcch_alloc2ul_frame
(
fp
,
frame
,
subframe
)
+
pdcch_alloc2ul_subframe
(
fp
,
subframe
))
%
srsPeriodicity
)
==
srsOffset
))
{
do_srs
=
1
;
}
}
// Now ACK/NAK
// First check subframe_tx flag for earlier subframes
...
...
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @
02f3298a
...
...
@@ -1593,7 +1593,7 @@ do_RRCConnectionSetup(
SoundingRS_UL_ConfigDedicated__setup__srs_HoppingBandwidth_hbw0
;
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
freqDomainPosition
=
0
;
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
duration
=
1
;
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
srs_ConfigIndex
=
45
;
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
srs_ConfigIndex
=
19
;
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
transmissionComb
=
0
;
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
->
choice
.
setup
.
cyclicShift
=
SoundingRS_UL_ConfigDedicated__setup__cyclicShift_cs0
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
View file @
02f3298a
...
...
@@ -17,7 +17,7 @@ eNBs =
mobile_country_code
=
"208"
;
mobile_network_code
=
"9
4
"
;
mobile_network_code
=
"9
2
"
;
//////////
Physical
parameters
:
...
...
@@ -62,10 +62,10 @@ eNBs =
pusch_nDMRS1
=
1
;
phich_duration
=
"NORMAL"
;
phich_resource
=
"ONESIXTH"
;
srs_enable
=
"EN
B
ABLE"
;
srs_enable
=
"ENABLE"
;
srs_BandwidthConfig
=
2
;
srs_SubframeConfig
=
3
;
srs_ackNackST
=
"
FALS
E"
;
srs_ackNackST
=
"
DISABL
E"
;
srs_MaxUpPts
=
"DISABLE"
;
pusch_p0_Nominal
= -
90
;
...
...
@@ -137,7 +137,7 @@ eNBs =
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"192.168.12.
70
"
;
mme_ip_address
= ( {
ipv4
=
"192.168.12.
26
"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
preference
=
"ipv4"
;
...
...
@@ -147,10 +147,10 @@ eNBs =
NETWORK_INTERFACES
:
{
ENB_INTERFACE_NAME_FOR_S1_MME
=
"eth
1
"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"192.168.12.
147
/24"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"eth
1
"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"192.168.12.
147
/24"
;
ENB_INTERFACE_NAME_FOR_S1_MME
=
"eth
6
"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"192.168.12.
82
/24"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"eth
6
"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"192.168.12.
82
/24"
;
ENB_PORT_FOR_S1U
=
2152
;
# Spec 2152
};
...
...
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