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
lizhongxiao
OpenXG UE
Commits
ae21bf69
Commit
ae21bf69
authored
Jul 20, 2020
by
Javier Morgade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fembms: L1 prototypes and params added
parent
c8dbeb65
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
4 deletions
+20
-4
executables/split_headers.h
executables/split_headers.h
+1
-1
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_init.c
+1
-0
openair1/PHY/INIT/lte_init_ue.c
openair1/PHY/INIT/lte_init_ue.c
+3
-3
openair1/PHY/INIT/lte_parms.c
openair1/PHY/INIT/lte_parms.c
+15
-0
No files found.
executables/split_headers.h
View file @
ae21bf69
...
@@ -279,7 +279,7 @@ int init_rf(RU_t *ru);
...
@@ -279,7 +279,7 @@ int init_rf(RU_t *ru);
void
rx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
void
rx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
void
tx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
void
tx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
void
common_signal_procedures
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
);
void
common_signal_procedures
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
);
void
pmch_procedures
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
);
void
pmch_procedures
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
int
fembms_flag
);
bool
dlsch_procedures
(
PHY_VARS_eNB
*
eNB
,
bool
dlsch_procedures
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
L1_rxtx_proc_t
*
proc
,
int
harq_pid
,
int
harq_pid
,
...
...
openair1/PHY/INIT/lte_init.c
View file @
ae21bf69
...
@@ -275,6 +275,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
...
@@ -275,6 +275,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
fp
->
soundingrs_ul_config_common
.
srs_MaxUpPts
=
cfg
->
srs_config
.
max_up_pts
.
value
;
fp
->
soundingrs_ul_config_common
.
srs_MaxUpPts
=
cfg
->
srs_config
.
max_up_pts
.
value
;
fp
->
num_MBSFN_config
=
0
;
fp
->
num_MBSFN_config
=
0
;
fp
->
NonMBSFN_config_flag
=
cfg
->
fembms_config
.
non_mbsfn_config_flag
.
value
;
fp
->
NonMBSFN_config_flag
=
cfg
->
fembms_config
.
non_mbsfn_config_flag
.
value
;
fp
->
FeMBMS_active
=
fp
->
NonMBSFN_config_flag
;
fp
->
NonMBSFN_config
.
non_mbsfn_SubframeConfig
=
cfg
->
fembms_config
.
non_mbsfn_subframeconfig
.
value
;
fp
->
NonMBSFN_config
.
non_mbsfn_SubframeConfig
=
cfg
->
fembms_config
.
non_mbsfn_subframeconfig
.
value
;
fp
->
NonMBSFN_config
.
radioframeAllocationPeriod
=
cfg
->
fembms_config
.
radioframe_allocation_period
.
value
;
fp
->
NonMBSFN_config
.
radioframeAllocationPeriod
=
cfg
->
fembms_config
.
radioframe_allocation_period
.
value
;
fp
->
NonMBSFN_config
.
radioframeAllocationOffset
=
cfg
->
fembms_config
.
radioframe_allocation_offset
.
value
;
fp
->
NonMBSFN_config
.
radioframeAllocationOffset
=
cfg
->
fembms_config
.
radioframe_allocation_offset
.
value
;
...
...
openair1/PHY/INIT/lte_init_ue.c
View file @
ae21bf69
...
@@ -137,7 +137,7 @@ void phy_config_sib2_ue(module_id_t Mod_id,int CC_id,
...
@@ -137,7 +137,7 @@ void phy_config_sib2_ue(module_id_t Mod_id,int CC_id,
if
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
present
==
LTE_MBSFN_SubframeConfig__subframeAllocation_PR_oneFrame
)
{
if
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
present
==
LTE_MBSFN_SubframeConfig__subframeAllocation_PR_oneFrame
)
{
fp
->
MBSFN_config
[
i
].
fourFrames_flag
=
0
;
fp
->
MBSFN_config
[
i
].
fourFrames_flag
=
0
;
fp
->
MBSFN_config
[
i
].
mbsfn_SubframeConfig
=
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
0
];
// 6-bit subframe configuration
fp
->
MBSFN_config
[
i
].
mbsfn_SubframeConfig
=
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
0
];
// 6-bit subframe configuration
LOG_I
(
PHY
,
"[CONFIG] LTE_MBSFN_SubframeConfig[%d] pattern is %d
\n
"
,
i
,
LOG_I
(
PHY
,
"[CONFIG] LTE_MBSFN_SubframeConfig[%d]
oneFrame
pattern is %d
\n
"
,
i
,
fp
->
MBSFN_config
[
i
].
mbsfn_SubframeConfig
);
fp
->
MBSFN_config
[
i
].
mbsfn_SubframeConfig
);
}
else
if
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
present
==
LTE_MBSFN_SubframeConfig__subframeAllocation_PR_fourFrames
)
{
// 24-bit subframe configuration
}
else
if
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
present
==
LTE_MBSFN_SubframeConfig__subframeAllocation_PR_fourFrames
)
{
// 24-bit subframe configuration
fp
->
MBSFN_config
[
i
].
fourFrames_flag
=
1
;
fp
->
MBSFN_config
[
i
].
fourFrames_flag
=
1
;
...
@@ -145,7 +145,7 @@ void phy_config_sib2_ue(module_id_t Mod_id,int CC_id,
...
@@ -145,7 +145,7 @@ void phy_config_sib2_ue(module_id_t Mod_id,int CC_id,
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
2
]
|
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
2
]
|
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
1
]
<<
8
)
|
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
1
]
<<
8
)
|
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
0
]
<<
16
);
(
mbsfn_SubframeConfigList
->
list
.
array
[
i
]
->
subframeAllocation
.
choice
.
oneFrame
.
buf
[
0
]
<<
16
);
LOG_I
(
PHY
,
"[CONFIG] LTE_MBSFN_SubframeConfig[%d] pattern is %x
\n
"
,
i
,
LOG_I
(
PHY
,
"[CONFIG] LTE_MBSFN_SubframeConfig[%d]
fourFrame
pattern is %x
\n
"
,
i
,
fp
->
MBSFN_config
[
i
].
mbsfn_SubframeConfig
);
fp
->
MBSFN_config
[
i
].
mbsfn_SubframeConfig
);
}
}
}
}
...
@@ -212,7 +212,7 @@ void phy_config_sib1_fembms_ue(module_id_t Mod_id,int CC_id,
...
@@ -212,7 +212,7 @@ void phy_config_sib1_fembms_ue(module_id_t Mod_id,int CC_id,
LTE_DL_FRAME_PARMS
*
fp
=
&
ue
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
fp
=
&
ue
->
frame_parms
;
if
(
nonMBSFN_SubframeConfig
!=
NULL
)
{
if
(
nonMBSFN_SubframeConfig
!=
NULL
)
{
fp
->
NonMBSFN_config_flag
=
0
;
fp
->
NonMBSFN_config_flag
=
1
;
fp
->
NonMBSFN_config
.
radioframeAllocationPeriod
=
nonMBSFN_SubframeConfig
->
radioFrameAllocationPeriod_r14
;
fp
->
NonMBSFN_config
.
radioframeAllocationPeriod
=
nonMBSFN_SubframeConfig
->
radioFrameAllocationPeriod_r14
;
fp
->
NonMBSFN_config
.
radioframeAllocationOffset
=
nonMBSFN_SubframeConfig
->
radioFrameAllocationOffset_r14
;
fp
->
NonMBSFN_config
.
radioframeAllocationOffset
=
nonMBSFN_SubframeConfig
->
radioFrameAllocationOffset_r14
;
fp
->
NonMBSFN_config
.
non_mbsfn_SubframeConfig
=
(
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
0
]
<<
1
|
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
0
]
>>
7
);
fp
->
NonMBSFN_config
.
non_mbsfn_SubframeConfig
=
(
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
0
]
<<
1
|
nonMBSFN_SubframeConfig
->
subframeAllocation_r14
.
buf
[
0
]
>>
7
);
...
...
openair1/PHY/INIT/lte_parms.c
View file @
ae21bf69
...
@@ -93,6 +93,11 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,
...
@@ -93,6 +93,11 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,
frame_parms
->
N_RBGS
=
4
;
frame_parms
->
N_RBGS
=
4
;
frame_parms
->
N_RBG
=
25
;
frame_parms
->
N_RBG
=
25
;
frame_parms
->
ofdm_symbol_size_khz_1dot25
=
2
*
2
*
6144
*
osf
;
frame_parms
->
first_carrier_offset_khz_1dot25
=
frame_parms
->
ofdm_symbol_size_khz_1dot25
-
1800
*
2
*
2
;
frame_parms
->
nb_prefix_samples_khz_1dot25
>>=
(
2
-
log2_osf
);
frame_parms
->
nb_prefix_samples0_khz_1dot25
>>=
(
2
-
log2_osf
);
break
;
break
;
case
75
:
case
75
:
...
@@ -104,6 +109,12 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,
...
@@ -104,6 +109,12 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,
frame_parms
->
nb_prefix_samples0
=
(
frame_parms
->
nb_prefix_samples0
*
3
)
>>
2
;
frame_parms
->
nb_prefix_samples0
=
(
frame_parms
->
nb_prefix_samples0
*
3
)
>>
2
;
frame_parms
->
N_RBGS
=
4
;
frame_parms
->
N_RBGS
=
4
;
frame_parms
->
N_RBG
=
25
;
frame_parms
->
N_RBG
=
25
;
frame_parms
->
ofdm_symbol_size_khz_1dot25
=
2
*
6144
*
osf
;
frame_parms
->
first_carrier_offset_khz_1dot25
=
frame_parms
->
ofdm_symbol_size_khz_1dot25
-
1800
*
2
;
frame_parms
->
nb_prefix_samples_khz_1dot25
>>=
(
2
-
log2_osf
);
frame_parms
->
nb_prefix_samples0_khz_1dot25
>>=
(
2
-
log2_osf
);
break
;
break
;
case
50
:
case
50
:
...
@@ -115,6 +126,10 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,
...
@@ -115,6 +126,10 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,
frame_parms
->
nb_prefix_samples0
>>=
(
1
-
log2_osf
);
frame_parms
->
nb_prefix_samples0
>>=
(
1
-
log2_osf
);
frame_parms
->
N_RBGS
=
3
;
frame_parms
->
N_RBGS
=
3
;
frame_parms
->
N_RBG
=
17
;
frame_parms
->
N_RBG
=
17
;
frame_parms
->
ofdm_symbol_size_khz_1dot25
=
2
*
6144
*
osf
;
frame_parms
->
first_carrier_offset_khz_1dot25
=
frame_parms
->
ofdm_symbol_size_khz_1dot25
-
1800
*
2
;
frame_parms
->
nb_prefix_samples_khz_1dot25
>>=
(
2
-
log2_osf
);
frame_parms
->
nb_prefix_samples0_khz_1dot25
>>=
(
2
-
log2_osf
);
break
;
break
;
case
25
:
case
25
:
...
...
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