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
c0c0267e
Commit
c0c0267e
authored
Dec 14, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugging of DCI indication and UE-FAPI interface
parent
1107337b
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
3226 additions
and
3213 deletions
+3226
-3213
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-2
cmake_targets/phy_simulators/CMakeLists.txt
cmake_targets/phy_simulators/CMakeLists.txt
+2
-2
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+3051
-3047
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+11
-2
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+159
-158
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+1
-1
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+0
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
c0c0267e
...
@@ -2559,7 +2559,7 @@ add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURC
...
@@ -2559,7 +2559,7 @@ add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURC
target_link_libraries
(
nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
target_link_libraries
(
nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
add_executable
(
nr_dlsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/dlsim.c
${
T_SOURCE
}
)
add_executable
(
nr_dlsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/dlsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR
CONFIG_LIB
-Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
target_link_libraries
(
nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR
RRC_LIB NR_RRC_LIB CONFIG_LIB L2_NR
-Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
foreach
(
myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
)
foreach
(
myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
)
...
...
cmake_targets/phy_simulators/CMakeLists.txt
View file @
c0c0267e
...
@@ -3,11 +3,11 @@ set(PACKAGE_NAME "unitary_tests_simulators")
...
@@ -3,11 +3,11 @@ set(PACKAGE_NAME "unitary_tests_simulators")
set
(
PHYSIM True
)
set
(
PHYSIM True
)
set
(
RF_BOARD None
)
set
(
RF_BOARD None
)
set
(
XFORMS True
)
set
(
XFORMS True
)
set
(
ENABLE_ITTI
Fals
e
)
set
(
ENABLE_ITTI
Tru
e
)
set
(
DEBUG_PHY False
)
set
(
DEBUG_PHY False
)
set
(
MU_RECIEVER False
)
set
(
MU_RECIEVER False
)
set
(
NAS_UE False
)
set
(
NAS_UE False
)
set
(
MESSAGE_CHART_GENERATOR False
)
set
(
MESSAGE_CHART_GENERATOR False
)
set
(
RRC_ASN1_VERSION
"Rel1
4
"
)
set
(
RRC_ASN1_VERSION
"Rel1
5
"
)
set
(
T_TRACER True
)
set
(
T_TRACER True
)
include
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../CMakeLists.txt
)
include
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../CMakeLists.txt
)
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
c0c0267e
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
c0c0267e
...
@@ -53,6 +53,7 @@
...
@@ -53,6 +53,7 @@
#include "NR_PHY_INTERFACE/NR_IF_Module.h"
#include "NR_PHY_INTERFACE/NR_IF_Module.h"
#include "NR_UE_PHY_INTERFACE/NR_IF_Module.h"
#include "NR_UE_PHY_INTERFACE/NR_IF_Module.h"
PHY_VARS_gNB
*
gNB
;
PHY_VARS_gNB
*
gNB
;
PHY_VARS_NR_UE
*
UE
;
PHY_VARS_NR_UE
*
UE
;
RAN_CONTEXT_t
RC
;
RAN_CONTEXT_t
RC
;
...
@@ -105,6 +106,7 @@ void config_common(int Mod_idP,
...
@@ -105,6 +106,7 @@ void config_common(int Mod_idP,
uint32_t
dl_BandwidthP
uint32_t
dl_BandwidthP
);
);
// needed for some functions
// needed for some functions
PHY_VARS_NR_UE
***
PHY_vars_UE_g
;
PHY_VARS_NR_UE
***
PHY_vars_UE_g
;
uint16_t
conjugate
[
8
]
__attribute__
((
aligned
(
32
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
uint16_t
conjugate
[
8
]
__attribute__
((
aligned
(
32
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
...
@@ -475,7 +477,7 @@ int main(int argc, char **argv)
...
@@ -475,7 +477,7 @@ int main(int argc, char **argv)
memcpy
(
&
UE
->
frame_parms
,
frame_parms
,
sizeof
(
NR_DL_FRAME_PARMS
));
memcpy
(
&
UE
->
frame_parms
,
frame_parms
,
sizeof
(
NR_DL_FRAME_PARMS
));
if
(
run_initial_sync
==
1
)
UE
->
is_synchronized
=
0
;
if
(
run_initial_sync
==
1
)
UE
->
is_synchronized
=
0
;
else
UE
->
is_synchronized
=
1
;
else
{
UE
->
is_synchronized
=
1
;
UE
->
UE_mode
[
0
]
=
PUSCH
;}
UE
->
perfect_ce
=
0
;
UE
->
perfect_ce
=
0
;
...
@@ -500,7 +502,7 @@ int main(int argc, char **argv)
...
@@ -500,7 +502,7 @@ int main(int argc, char **argv)
UE
->
if_inst
=
nr_ue_if_module_init
(
0
);
UE
->
if_inst
=
nr_ue_if_module_init
(
0
);
UE
->
if_inst
->
scheduled_response
=
nr_ue_scheduled_response
;
UE
->
if_inst
->
scheduled_response
=
nr_ue_scheduled_response
;
UE
->
if_inst
->
phy_config_request
=
nr_ue_phy_config_request
;
UE
->
if_inst
->
phy_config_request
=
nr_ue_phy_config_request
;
UE
->
if_inst
->
dl_indication
=
dummy_
nr_ue_dl_indication
;
UE
->
if_inst
->
dl_indication
=
nr_ue_dl_indication
;
UE
->
if_inst
->
ul_indication
=
dummy_nr_ue_ul_indication
;
UE
->
if_inst
->
ul_indication
=
dummy_nr_ue_ul_indication
;
...
@@ -582,6 +584,13 @@ int main(int argc, char **argv)
...
@@ -582,6 +584,13 @@ int main(int argc, char **argv)
//Configure UE
//Configure UE
rrc_gNB_carrier_data_t
carrier
;
uint32_t
pdcch_ConfigSIB1
=
0
;
uint32_t
ssb_SubcarrierOffset
=
0
;
carrier
.
MIB
=
(
uint8_t
*
)
malloc
(
4
);
carrier
.
sizeof_MIB
=
do_MIB_NR
(
&
carrier
,
0
,
ssb_SubcarrierOffset
,
pdcch_ConfigSIB1
,
30
,
2
);
nr_rrc_mac_config_req_ue
(
0
,
0
,
0
,
carrier
.
mib
.
message
.
choice
.
mib
,
NULL
,
NULL
,
NULL
);
fapi_nr_dl_config_request_t
dl_config
;
fapi_nr_dl_config_request_t
dl_config
;
// Type0 PDCCH search space
// Type0 PDCCH search space
dl_config
.
number_pdus
=
1
;
dl_config
.
number_pdus
=
1
;
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
c0c0267e
...
@@ -62,13 +62,14 @@ int handle_bcch_dlsch(module_id_t module_id, int cc_id, unsigned int gNB_index,
...
@@ -62,13 +62,14 @@ int handle_bcch_dlsch(module_id_t module_id, int cc_id, unsigned int gNB_index,
// L2 Abstraction Layer
// L2 Abstraction Layer
int
handle_dci
(
module_id_t
module_id
,
int
cc_id
,
unsigned
int
gNB_index
,
fapi_nr_dci_pdu_rel15_t
*
dci
,
uint16_t
rnti
,
uint32_t
dci_type
){
int
handle_dci
(
module_id_t
module_id
,
int
cc_id
,
unsigned
int
gNB_index
,
fapi_nr_dci_pdu_rel15_t
*
dci
,
uint16_t
rnti
,
uint32_t
dci_type
){
printf
(
"handle_dci: rnti %x,dci_type %d
\n
"
,
rnti
,
dci_type
);
return
nr_ue_process_dci
(
module_id
,
cc_id
,
gNB_index
,
dci
,
rnti
,
dci_type
);
return
nr_ue_process_dci
(
module_id
,
cc_id
,
gNB_index
,
dci
,
rnti
,
dci_type
);
}
}
// L2 Abstraction Layer
// L2 Abstraction Layer
int8_t
handle_dlsch
(
module_id_t
module_id
,
int
cc_id
,
uint8_t
gNB_index
,
fapi_nr_dci_indication_t
*
dci_ind
,
uint8_t
*
pduP
,
uint32_t
pdu_len
){
int8_t
handle_dlsch
(
module_id_t
module_id
,
int
cc_id
,
uint8_t
gNB_index
,
fapi_nr_dci_indication_t
*
dci_ind
,
uint8_t
*
pduP
,
uint32_t
pdu_len
){
// return 0;
// return 0;
return
nr_ue_process_dlsch
(
module_id
,
return
nr_ue_process_dlsch
(
module_id
,
cc_id
,
cc_id
,
gNB_index
,
gNB_index
,
...
@@ -131,7 +132,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
...
@@ -131,7 +132,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
if
(
dl_info
->
dci_ind
!=
NULL
){
if
(
dl_info
->
dci_ind
!=
NULL
){
printf
(
"[L2][IF MODULE][DL INDICATION][DCI_IND]
\n
"
);
printf
(
"[L2][IF MODULE][DL INDICATION][DCI_IND]
\n
"
);
for
(
i
=
0
;
i
<
dl_info
->
dci_ind
->
number_of_dcis
;
++
i
){
for
(
i
=
0
;
i
<
dl_info
->
dci_ind
->
number_of_dcis
;
++
i
){
//
printf(">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
printf
(
">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d
\n
"
,
i
,
dl_info
->
dci_ind
->
number_of_dcis
);
fapi_nr_dci_pdu_rel15_t
*
dci
=
&
dl_info
->
dci_ind
->
dci_list
[
i
].
dci
;
fapi_nr_dci_pdu_rel15_t
*
dci
=
&
dl_info
->
dci_ind
->
dci_list
[
i
].
dci
;
ret_mask
|=
(
handle_dci
(
ret_mask
|=
(
handle_dci
(
...
@@ -209,7 +210,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
...
@@ -209,7 +210,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
(
dl_info
->
rx_ind
->
rx_indication_body
+
i
)
->
sib_pdu
.
pdu_length
))
<<
FAPI_NR_RX_PDU_TYPE_SIB
;
(
dl_info
->
rx_ind
->
rx_indication_body
+
i
)
->
sib_pdu
.
pdu_length
))
<<
FAPI_NR_RX_PDU_TYPE_SIB
;
break
;
break
;
case
FAPI_NR_RX_PDU_TYPE_DLSCH
:
case
FAPI_NR_RX_PDU_TYPE_DLSCH
:
// ret_mask |= (0) << FAPI_NR_RX_PDU_TYPE_DLSCH;
// ret_mask |= (0) << FAPI_NR_RX_PDU_TYPE_DLSCH;
ret_mask
|=
(
handle_dlsch
(
dl_info
->
module_id
,
dl_info
->
cc_id
,
dl_info
->
gNB_index
,
&
dl_info
->
dci_ind
,
ret_mask
|=
(
handle_dlsch
(
dl_info
->
module_id
,
dl_info
->
cc_id
,
dl_info
->
gNB_index
,
&
dl_info
->
dci_ind
,
(
dl_info
->
rx_ind
->
rx_indication_body
+
i
)
->
pdsch_pdu
.
pdu
,
(
dl_info
->
rx_ind
->
rx_indication_body
+
i
)
->
pdsch_pdu
.
pdu
,
(
dl_info
->
rx_ind
->
rx_indication_body
+
i
)
->
pdsch_pdu
.
pdu_length
))
<<
FAPI_NR_RX_PDU_TYPE_DLSCH
;
(
dl_info
->
rx_ind
->
rx_indication_body
+
i
)
->
pdsch_pdu
.
pdu_length
))
<<
FAPI_NR_RX_PDU_TYPE_DLSCH
;
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
c0c0267e
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
#include <asn_application.h>
#include <asn_application.h>
#include <asn_internal.h>
/* for _ASN_DEFAULT_STACK_MAX */
#include <asn_internal.h>
/* for _ASN_DEFAULT_STACK_MAX */
#include <per_encoder.h>
#include <per_encoder.h>
//#include "COMMON/messages_types.h"
#include "assertions.h"
#include "assertions.h"
#include "RRCConnectionRequest.h"
#include "RRCConnectionRequest.h"
#include "UL-CCCH-Message.h"
#include "UL-CCCH-Message.h"
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
c0c0267e
...
@@ -42,7 +42,6 @@
...
@@ -42,7 +42,6 @@
#include "asn1_msg.h"
#include "asn1_msg.h"
#include "RRC/NR/nr_rrc_extern.h"
#include "RRC/NR/nr_rrc_extern.h"
#if defined(NR_Rel15)
#if defined(NR_Rel15)
#include "NR_SCS-SpecificCarrier.h"
#include "NR_SCS-SpecificCarrier.h"
#include "NR_TDD-UL-DL-ConfigCommon.h"
#include "NR_TDD-UL-DL-ConfigCommon.h"
...
...
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