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
zzha zzha
OpenXG-RAN
Commits
023b6ebc
Commit
023b6ebc
authored
Jan 19, 2019
by
haswell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing LTE-M configuration
parent
cae1ed0b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
18 deletions
+19
-18
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+15
-15
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+1
-0
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
+3
-3
No files found.
openair1/SCHED/fapi_l1.c
View file @
023b6ebc
...
...
@@ -180,24 +180,24 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_pro
dlsch1
=
eNB
->
dlsch
[
UE_id
][
1
];
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
if
((
rel13
->
pdsch_payload_type
<
2
)
&&
(
rel13
->
ue_type
>
0
))
dlsch0
->
harq_ids
[
frame
%
2
][
subframe
]
=
0
;
if
((
rel13
->
pdsch_payload_type
<
2
)
&&
(
rel13
->
ue_type
>
0
))
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
proc
->
subframe_tx
]
=
0
;
#endif
harq_pid
=
dlsch0
->
harq_ids
[
frame
%
2
][
subframe
];
harq_pid
=
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
proc
->
subframe_tx
];
AssertFatal
((
harq_pid
>=
0
)
&&
(
harq_pid
<
8
),
"harq_pid %d not in 0...7 frame:%d subframe:%d subframe(TX):%d rnti:%x UE_id:%d dlsch0[harq_ids:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d]
\n
"
,
harq_pid
,
frame
,
subframe
,
proc
->
subframe_tx
,
rel8
->
rnti
,
UE_id
,
dlsch0
->
harq_ids
[
frame
%
2
][
0
],
dlsch0
->
harq_ids
[
frame
%
2
][
1
],
dlsch0
->
harq_ids
[
frame
%
2
][
2
],
dlsch0
->
harq_ids
[
frame
%
2
][
3
],
dlsch0
->
harq_ids
[
frame
%
2
][
4
],
dlsch0
->
harq_ids
[
frame
%
2
][
5
],
dlsch0
->
harq_ids
[
frame
%
2
][
6
],
dlsch0
->
harq_ids
[
frame
%
2
][
7
],
dlsch0
->
harq_ids
[
frame
%
2
][
8
],
dlsch0
->
harq_ids
[
frame
%
2
][
9
]
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
0
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
1
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
2
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
3
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
4
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
5
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
6
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
7
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
8
],
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
9
]
);
dlsch0_harq
=
dlsch0
->
harq_processes
[
harq_pid
];
dlsch1_harq
=
dlsch1
->
harq_processes
[
harq_pid
];
...
...
@@ -223,7 +223,7 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_pro
computeRhoB_eNB
(
rel8
->
pa
,
eNB
->
frame_parms
.
pdsch_config_common
.
p_b
,
eNB
->
frame_parms
.
nb_antenna_ports_eNB
,
dlsch1
,
dlsch1_harq
->
dl_power_off
);
}
dlsch0_harq
->
pdsch_start
=
eNB
->
pdcch_vars
[
subframe
&
1
].
num_pdcch_symbols
;
dlsch0_harq
->
pdsch_start
=
eNB
->
pdcch_vars
[
proc
->
subframe_tx
&
1
].
num_pdcch_symbols
;
if
(
dlsch0_harq
->
round
==
0
)
{
//get pointer to SDU if this a new SDU
if
(
sdu
==
NULL
)
{
...
...
@@ -265,7 +265,7 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_pro
dlsch0_harq
=
dlsch0
->
harq_processes
[
0
];
dlsch0_harq
->
pdu
=
sdu
;
if
(
proc
->
frame_tx
<
200
)
LOG_
D
(
PHY
,
"NFAPI: frame %d, subframe %d: Programming SI-BR (%d) => %d
\n
"
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
rel13
->
pdsch_payload_type
,
UE_id
);
if
(
proc
->
frame_tx
<
200
)
LOG_
I
(
PHY
,
"NFAPI: frame %d, subframe %d (TX %d.%d): Programming SI-BR (%d) => %d
\n
"
,
frame
,
subframe
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
rel13
->
pdsch_payload_type
,
UE_id
);
dlsch0
->
rnti
=
0xFFFF
;
dlsch0
->
Kmimo
=
1
;
...
...
@@ -274,7 +274,7 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_pro
dlsch0
->
i0
=
rel13
->
initial_transmission_sf_io
;
dlsch0_harq
->
pdsch_start
=
rel10
->
pdsch_start
;
dlsch0
->
harq_ids
[
frame
%
2
][
proc
->
subframe_t
x
]
=
0
;
dlsch0
->
harq_ids
[
proc
->
frame_tx
%
2
][
proc
->
subframe_r
x
]
=
0
;
dlsch0_harq
->
frame
=
proc
->
frame_tx
;
dlsch0_harq
->
subframe
=
proc
->
subframe_tx
;
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
023b6ebc
...
...
@@ -443,6 +443,7 @@ clear_nfapi_information(eNB_MAC_INST * eNB, int CC_idP,
DL_req
[
CC_idP
].
dl_config_request_body
.
number_pdu
=
0
;
DL_req
[
CC_idP
].
dl_config_request_body
.
number_pdsch_rnti
=
0
;
DL_req
[
CC_idP
].
dl_config_request_body
.
transmission_power_pcfich
=
6000
;
DL_req
[
CC_idP
].
sfn_sf
=
subframeP
+
(
frameP
<<
4
);
HI_DCI0_req
->
hi_dci0_request_body
.
sfnsf
=
subframeP
+
(
frameP
<<
4
);
HI_DCI0_req
->
hi_dci0_request_body
.
number_of_dci
=
0
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_bch.c
View file @
023b6ebc
...
...
@@ -211,7 +211,7 @@ schedule_SIB1_BR(module_id_t module_idP,
bcch_sdu_length
,
TBS
);
if
((
frameP
&
1023
)
<
200
)
LOG_
D
(
MAC
,
LOG_
I
(
MAC
,
"[eNB %d] Frame %d Subframe %d: SIB1_BR->DLSCH CC_id %d, Received %d bytes, scheduling on NB %d (i %d,m %d,N_S_NB %d) rvidx %d
\n
"
,
module_idP
,
frameP
,
subframeP
,
CC_id
,
bcch_sdu_length
,
n_NB
,
i
,
m
,
N_S_NB
,
rvidx
);
...
...
@@ -408,8 +408,8 @@ schedule_SI_BR(module_id_t module_idP, frame_t frameP,
vrb_map
[
first_rb
+
4
]
=
1
;
vrb_map
[
first_rb
+
5
]
=
1
;
//
if ((frameP&1023) < 200)
LOG_
D
(
MAC
,
"[eNB %d] Frame %d Subframe %d: SI_BR->DLSCH CC_id %d, Narrowband %d rvidx %d (sf_mod_period %d : si_WindowLength_BR_r13 %d : si_RepetitionPattern_r13 %d) bcch_sdu_length %d
\n
"
,
if
((
frameP
&
1023
)
<
200
)
LOG_
I
(
MAC
,
"[eNB %d] Frame %d Subframe %d: SI_BR->DLSCH CC_id %d, Narrowband %d rvidx %d (sf_mod_period %d : si_WindowLength_BR_r13 %d : si_RepetitionPattern_r13 %d) bcch_sdu_length %d
\n
"
,
module_idP
,
frameP
,
subframeP
,
CC_id
,(
int
)
si_Narrowband_r13
-
1
,
rvidx
,
sf_mod_period
,(
int
)
si_WindowLength_BR_r13
,(
int
)
si_RepetitionPattern_r13
,
bcch_sdu_length
);
...
...
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