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
canghaiwuhen
OpenXG-RAN
Commits
7808b6ff
Commit
7808b6ff
authored
Nov 26, 2019
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ping loss
parent
1fbc356f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
2 deletions
+23
-2
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-1
cmake_targets/build_oai
cmake_targets/build_oai
+3
-1
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+19
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
7808b6ff
...
...
@@ -660,7 +660,7 @@ add_boolean_option(EXMIMO_IOT True "????")
add_boolean_option
(
LOCALIZATION False
"???"
)
add_integer_option
(
MAX_NUM_CCs 1
"????"
)
add_boolean_option
(
MU_RECEIVER False
"????"
)
add_boolean_option
(
PHYSIM
Tru
e
"for L1 simulators (dlsim, ulsim, ...)"
)
add_boolean_option
(
PHYSIM
Fals
e
"for L1 simulators (dlsim, ulsim, ...)"
)
add_boolean_option
(
PHY_CONTEXT True
"not clear: must remain False for dlsim"
)
add_boolean_option
(
PHY_EMUL False
"not clear: must remain False for dlsim"
)
add_boolean_option
(
SMBV False
"Rohde&Schwarz SMBV100A vector signal generator"
)
...
...
cmake_targets/build_oai
View file @
7808b6ff
...
...
@@ -69,6 +69,7 @@ UE_AUTOTEST_TRACE="False"
UE_DEBUG_TRACE
=
"False"
UE_TIMING_TRACE
=
"False"
USRP_REC_PLAY
=
"False"
PHYSIM
=
"False"
BUILD_ECLIPSE
=
0
OPTIONAL_LIBRARIES
=
"telnetsrv enbscope uescope msc"
trap
handle_ctrl_c INT
...
...
@@ -246,6 +247,7 @@ function main() {
shift
2
;;
--phy_simulators
)
SIMUS_PHY
=
1
PHYSIM
=
"True"
echo_info
"Will compile dlsim, ulsim, ..."
shift
;;
--core_simulators
)
...
...
@@ -501,7 +503,7 @@ function main() {
echo
"set ( UE_EXPANSION
$UE_EXPANSION
)"
>>
$cmake_file
echo
"set ( PHY_RM
$PHY_RM
)"
>>
$cmake_file
echo
"set ( UDP_1MS
$UDP_1MS
)"
>>
$cmake_file
# echo "set ( PHY_TX_THREAD $UE_EXPANSION
)" >> $cmake_file
echo
"set ( PHYSIM
$PHYSIM
)"
>>
$cmake_file
echo
"set ( PRE_SCD_THREAD
$UE_EXPANSION
)"
>>
$cmake_file
echo
"set ( UESIM_EXPANSION
$UESIM_EXPANSION
)"
>>
$cmake_file
echo
"set ( RRC_ASN1_VERSION
\"
${
REL
}
\"
)"
>>
$cmake_file
...
...
openair1/SCHED/fapi_l1.c
View file @
7808b6ff
...
...
@@ -900,6 +900,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
if
(
1
)
{
//sdu != NULL)
if
(
NFAPI_MODE
!=
NFAPI_MODE_VNF
)
{
if
(
sdu
!=
NULL
)
{
#ifdef PHYSIM
LTE_eNB_PDCCH
*
pdcch_vars
=
&
eNB
->
pdcch_vars
[
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
)
&
1
];
uint8_t
harq_pid_dl
=
0
;
uint8_t
k
;
...
...
@@ -921,6 +922,24 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
LOG_E
(
PHY
,
"schedule_response illegal harq_pid %d
\n
"
,
harq_pid_dl
);
}
}
#else
LTE_TDD_Config_t
*
tdd_Config
=
NULL
;
if
(
fp
->
frame_type
==
TDD
)
{
tdd_Config
=
CALLOC
(
1
,
sizeof
(
struct
LTE_TDD_Config
));
tdd_Config
->
subframeAssignment
=
fp
->
tdd_config
;
tdd_Config
->
specialSubframePatterns
=
fp
->
tdd_config_S
;
}
uint8_t
harq_pid_dl
=
frame_subframe2_dl_harq_pid
(
tdd_Config
,
NFAPI_SFNSF2SFN
(
DL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
));
if
(
harq_pid_dl
>=
0
&&
harq_pid_dl
<
8
)
{
memset
(
dl_pdus
[
harq_pid_dl
][
i
],
0
,
sizeof
(
uint8_t
)
*
9422
);
memcpy
(
dl_pdus
[
harq_pid_dl
][
i
],
TX_req
->
tx_request_body
.
tx_pdu_list
[
pdu_index
].
segments
[
0
].
segment_data
,
TX_req
->
tx_request_body
.
tx_pdu_list
[
pdu_index
].
segments
[
0
].
segment_length
);
handle_nfapi_dlsch_pdu
(
eNB
,
NFAPI_SFNSF2SFN
(
DL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
),
proc
,
dl_config_pdu
,
dlsch_pdu_rel8
->
transport_blocks
-
1
,
dl_pdus
[
harq_pid_dl
][
i
]);
}
else
{
LOG_E
(
PHY
,
"schedule_response illegal harq_pid %d
\n
"
,
harq_pid_dl
);
}
#endif
}
else
{
handle_nfapi_dlsch_pdu
(
eNB
,
NFAPI_SFNSF2SFN
(
DL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
),
proc
,
dl_config_pdu
,
dlsch_pdu_rel8
->
transport_blocks
-
1
,
sdu
);
}
...
...
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