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
Michael Black
OpenXG UE
Commits
2c52c675
Commit
2c52c675
authored
Aug 28, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lte-softmodem-nos1 / lte-uesoftmodem-nos1 functional
parent
27635066
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
6 deletions
+11
-6
openair1/SCHED/phy_procedures_lte_common.c
openair1/SCHED/phy_procedures_lte_common.c
+1
-0
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+2
-1
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+4
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+1
-1
targets/RT/USER/rfsim.c
targets/RT/USER/rfsim.c
+3
-3
No files found.
openair1/SCHED/phy_procedures_lte_common.c
View file @
2c52c675
...
...
@@ -820,6 +820,7 @@ lte_subframe_t subframe_select(LTE_DL_FRAME_PARMS *frame_parms,unsigned char sub
break
;
default:
AssertFatal
(
1
==
0
,
"subframe %d Unsupported TDD configuration %d
\n
"
,
subframe
,
frame_parms
->
tdd_config
);
return
(
255
);
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
2c52c675
...
...
@@ -664,9 +664,10 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP,
schedule_mib
(
module_idP
,
frameP
,
subframeP
);
}
/*
if((subframeP == 0) && (frameP & 7) == 0){
schedule_nr_mib(module_idP, frameP, subframeP);
}
}*/
if
(
phy_test
==
0
){
// This schedules SI for legacy LTE and eMTC starting in subframeP
...
...
targets/RT/USER/lte-ru.c
View file @
2c52c675
...
...
@@ -2454,7 +2454,10 @@ void configure_rru(int idx,
ru
->
frame_parms
->
tdd_config
=
config
->
tdd_config
[
0
];
ru
->
frame_parms
->
tdd_config_S
=
config
->
tdd_config_S
[
0
];
}
else
ru
->
frame_parms
->
frame_type
=
FDD
;
else
{
ru
->
frame_parms
->
frame_type
=
FDD
;
ru
->
frame_parms
->
tdd_config
=
1
;
}
ru
->
att_tx
=
config
->
att_tx
[
0
];
ru
->
att_rx
=
config
->
att_rx
[
0
];
ru
->
frame_parms
->
N_RB_DL
=
config
->
N_RB_DL
[
0
];
...
...
targets/RT/USER/lte-ue.c
View file @
2c52c675
...
...
@@ -259,7 +259,7 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correcti
// needed for memcopy below. these are not used in the RU, but needed for UE
RC
.
ru
[
0
]
->
frame_parms
->
nb_antennas_rx
=
fp0
->
nb_antennas_rx
;
RC
.
ru
[
0
]
->
frame_parms
->
nb_antennas_tx
=
fp0
->
nb_antennas_tx
;
PHY_vars_UE_g
[
inst
][
0
]
=
init_ue_vars
(
&
RC
.
ru
[
0
]
->
frame_parms
,
inst
,
0
);
PHY_vars_UE_g
[
inst
][
0
]
=
init_ue_vars
(
RC
.
ru
[
0
]
->
frame_parms
,
inst
,
0
);
}
// turn off timing control loop in UE
PHY_vars_UE_g
[
inst
][
0
]
->
no_timing_correction
=
timing_correction
;
...
...
targets/RT/USER/rfsim.c
View file @
2c52c675
...
...
@@ -189,7 +189,7 @@ int ru_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void **
subframe
=
(
sim
.
last_ru_rx_timestamp
[
ru_id
][
CC_id
]
/
RC
.
ru
[
ru_id
]
->
frame_parms
->
samples_per_tti
)
%
10
;
if
(
subframe_select
(
&
RC
.
ru
[
ru_id
]
->
frame_parms
,
subframe
)
!=
SF_DL
||
RC
.
ru
[
ru_id
]
->
frame_parms
->
frame_type
==
FDD
)
{
if
(
subframe_select
(
RC
.
ru
[
ru_id
]
->
frame_parms
,
subframe
)
!=
SF_DL
||
RC
.
ru
[
ru_id
]
->
frame_parms
->
frame_type
==
FDD
)
{
LOG_D
(
SIM
,
"RU_trx_read generating UL subframe %d (Ts %llu, current TS %llu)
\n
"
,
subframe
,(
unsigned
long
long
)
*
ptimestamp
,
(
unsigned
long
long
)
sim
.
current_ru_rx_timestamp
[
ru_id
][
CC_id
]);
...
...
@@ -508,8 +508,8 @@ void *rfsim_top(void *n_frames) {
pthread_mutex_lock
(
&
sim
.
subframe_mutex
);
int
subframe_ru_mask_local
=
(
subframe_select
(
&
RC
.
ru
[
0
]
->
frame_parms
,(
sf
+
4
)
%
10
)
!=
SF_UL
)
?
sim
.
subframe_ru_mask
:
((
1
<<
RC
.
nb_RU
)
-
1
);
int
subframe_UE_mask_local
=
(
RC
.
ru
[
0
]
->
frame_parms
->
frame_type
==
FDD
||
subframe_select
(
&
RC
.
ru
[
0
]
->
frame_parms
,(
sf
+
4
)
%
10
)
!=
SF_DL
)
?
sim
.
subframe_UE_mask
:
((
1
<<
NB_UE_INST
)
-
1
);
int
subframe_ru_mask_local
=
(
subframe_select
(
RC
.
ru
[
0
]
->
frame_parms
,(
sf
+
4
)
%
10
)
!=
SF_UL
)
?
sim
.
subframe_ru_mask
:
((
1
<<
RC
.
nb_RU
)
-
1
);
int
subframe_UE_mask_local
=
(
RC
.
ru
[
0
]
->
frame_parms
->
frame_type
==
FDD
||
subframe_select
(
RC
.
ru
[
0
]
->
frame_parms
,(
sf
+
4
)
%
10
)
!=
SF_DL
)
?
sim
.
subframe_UE_mask
:
((
1
<<
NB_UE_INST
)
-
1
);
pthread_mutex_unlock
(
&
sim
.
subframe_mutex
);
LOG_D
(
SIM
,
"Frame %d, Subframe %d, NB_RU %d, NB_UE %d: Checking masks %x,%x
\n
"
,
frame
,
sf
,
RC
.
nb_RU
,
NB_UE_INST
,
subframe_ru_mask_local
,
subframe_UE_mask_local
);
if
((
subframe_ru_mask_local
==
((
1
<<
RC
.
nb_RU
)
-
1
))
&&
...
...
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