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
常顺宇
OpenXG-RAN
Commits
bdbd2bff
Commit
bdbd2bff
authored
Aug 09, 2018
by
Calvin HSU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UE: error fixed, add DL_CONFIG_REQ for DL-SCH.
parent
c8fbd905
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
11 deletions
+20
-11
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+5
-1
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+10
-6
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+2
-2
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+3
-2
No files found.
cmake_targets/CMakeLists.txt
View file @
bdbd2bff
...
@@ -1349,6 +1349,10 @@ if (${COMPILATION_AVX2} STREQUAL "True")
...
@@ -1349,6 +1349,10 @@ if (${COMPILATION_AVX2} STREQUAL "True")
set
(
PHY_SRC_UE
${
PHY_SRC_UE
}
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
)
set
(
PHY_SRC_UE
${
PHY_SRC_UE
}
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
)
endif
()
endif
()
if
(
${
COMPILATION_AVX2
}
STREQUAL
"True"
)
set
(
PHY_NR_UE_SRC
${
PHY_NR_UE_SRC
}
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
)
endif
()
add_library
(
PHY_COMMON
${
PHY_SRC_COMMON
}
)
add_library
(
PHY_COMMON
${
PHY_SRC_COMMON
}
)
add_library
(
PHY
${
PHY_SRC
}
)
add_library
(
PHY
${
PHY_SRC
}
)
add_library
(
PHY_UE
${
PHY_SRC_UE
}
)
add_library
(
PHY_UE
${
PHY_SRC_UE
}
)
...
@@ -1573,7 +1577,7 @@ set ( NR_LTE_UE_REUSE_SRC
...
@@ -1573,7 +1577,7 @@ set ( NR_LTE_UE_REUSE_SRC
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_ue_measurements.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_ue_measurements.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
#
${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
)
)
add_library
(
NR_LTE_UE_REUSE_LIB
add_library
(
NR_LTE_UE_REUSE_LIB
...
...
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
View file @
bdbd2bff
...
@@ -19,14 +19,17 @@
...
@@ -19,14 +19,17 @@
#define _FAPI_NR_UE_INTERFACE_H_
#define _FAPI_NR_UE_INTERFACE_H_
#include "stddef.h"
#include "stddef.h"
#include "platform_types.h"
#include "fapi_nr_ue_constants.h"
#include "fapi_nr_ue_constants.h"
/*
typedef unsigned int uint32_t;
typedef unsigned int uint32_t;
typedef unsigned short uint16_t;
typedef unsigned short uint16_t;
typedef unsigned char uint8_t;
typedef unsigned char uint8_t;
typedef signed int int32_t;
typedef signed int int32_t;
typedef signed short int16_t;
typedef signed short int16_t;
typedef signed char int8_t;
typedef signed char int8_t;
*/
typedef
struct
{
typedef
struct
{
uint8_t
identifier_dci_formats
;
// 0 IDENTIFIER_DCI_FORMATS:
uint8_t
identifier_dci_formats
;
// 0 IDENTIFIER_DCI_FORMATS:
...
@@ -257,6 +260,7 @@ typedef struct {
...
@@ -257,6 +260,7 @@ typedef struct {
typedef
fapi_nr_dci_pdu_rel15_t
fapi_nr_dl_config_dlsch_pdu_rel15_t
;
typedef
fapi_nr_dci_pdu_rel15_t
fapi_nr_dl_config_dlsch_pdu_rel15_t
;
typedef
struct
{
typedef
struct
{
uint16_t
rnti
;
fapi_nr_dl_config_dlsch_pdu_rel15_t
dlsch_config_rel15
;
fapi_nr_dl_config_dlsch_pdu_rel15_t
dlsch_config_rel15
;
}
fapi_nr_dl_config_dlsch_pdu
;
}
fapi_nr_dl_config_dlsch_pdu
;
...
...
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
bdbd2bff
...
@@ -69,8 +69,8 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
...
@@ -69,8 +69,8 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
pdcch_vars2
->
coreset
[
i
].
duration
=
dci_config
->
coreset
.
duration
;
pdcch_vars2
->
coreset
[
i
].
duration
=
dci_config
->
coreset
.
duration
;
pdcch_vars2
->
coreset
[
i
].
frequencyDomainResources
=
dci_config
.
coreset
.
frequency_domain_resource
;
pdcch_vars2
->
coreset
[
i
].
frequencyDomainResources
=
dci_config
->
coreset
.
frequency_domain_resource
;
pdcch_vars2
->
coreset
[
i
].
rb_offset
=
dci_config
.
coreset
.
rb_offset
;
pdcch_vars2
->
coreset
[
i
].
rb_offset
=
dci_config
->
coreset
.
rb_offset
;
if
(
dci_config
->
coreset
.
cce_reg_mapping_type
==
CCE_REG_MAPPING_TYPE_INTERLEAVED
){
if
(
dci_config
->
coreset
.
cce_reg_mapping_type
==
CCE_REG_MAPPING_TYPE_INTERLEAVED
){
pdcch_vars2
->
coreset
[
i
].
cce_reg_mappingType
.
shiftIndex
=
dci_config
->
coreset
.
cce_reg_interleaved_shift_index
;
pdcch_vars2
->
coreset
[
i
].
cce_reg_mappingType
.
shiftIndex
=
dci_config
->
coreset
.
cce_reg_interleaved_shift_index
;
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
bdbd2bff
...
@@ -173,9 +173,10 @@ int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
...
@@ -173,9 +173,10 @@ int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
dlsch_config_pdu->tpc = dci->tpc_command;
dlsch_config_pdu->tpc = dci->tpc_command;
dlsch_config_pdu->pucch_resource_indicator = dci->pucch_resource_indicator;
dlsch_config_pdu->pucch_resource_indicator = dci->pucch_resource_indicator;
dlsch_config_pdu->pdsch_to_harq_feedback_timing_indicator = dci->pdsch_to_harq_feedback_timing_indicator;
dlsch_config_pdu->pdsch_to_harq_feedback_timing_indicator = dci->pdsch_to_harq_feedback_timing_indicator;
dl_config->dl_config_list[dl_config->number_pdus].dlsch_pdu.dlsch_config_rel15.rnti = 0x0000; // TX RNTI: UE-spec
*/
*/
dl_config
->
dl_config_list
[
dl_config
->
number_pdus
].
dlsch_config_pdu
.
rnti
=
0x0000
;
// TX RNTI: UE-spec
memcpy
(
dlsch_config_pdu
,
dci
,
sizeof
(
fapi_nr_dci_pdu_rel15_t
));
dl_config
->
number_pdus
=
dl_config
->
number_pdus
+
1
;
dl_config
->
number_pdus
=
dl_config
->
number_pdus
+
1
;
ret_mask
|=
(
handle_dci
(
ret_mask
|=
(
handle_dci
(
...
...
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