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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-RAN
Commits
2989bb59
Commit
2989bb59
authored
Nov 29, 2024
by
Robert Schmidt
Committed by
Roberto Rosca
Dec 11, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handle position from RRC
parent
be618b06
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
CMakeLists.txt
CMakeLists.txt
+0
-2
executables/position_interface.h
executables/position_interface.h
+2
-2
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+4
-4
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
+2
-2
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+3
-1
No files found.
CMakeLists.txt
View file @
2989bb59
...
...
@@ -2219,7 +2219,6 @@ target_link_libraries(nr_pucchsim PRIVATE
target_link_libraries
(
nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs
)
add_executable
(
nr_dlsim
${
OPENAIR_DIR
}
/executables/position_interface.c
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/dlsim.c
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/nr_dummy_functions.c
${
OPENAIR_DIR
}
/executables/softmodem-common.c
...
...
@@ -2255,7 +2254,6 @@ target_link_libraries(nr_ulschsim PRIVATE
target_link_libraries
(
nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs
)
add_executable
(
nr_ulsim
${
OPENAIR_DIR
}
/executables/position_interface.c
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/ulsim.c
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/nr_dummy_functions.c
${
OPENAIR_DIR
}
/executables/softmodem-common.c
...
...
executables/position_interface.h
View file @
2989bb59
...
...
@@ -47,7 +47,7 @@
}
// clang-format on
typedef
struct
{
typedef
struct
position
{
double
positionX
;
double
positionY
;
double
positionZ
;
...
...
@@ -56,4 +56,4 @@ typedef struct {
void
config_position_coordinates
(
int
Mod_id
);
position_t
*
init_position_coordinates
(
char
*
sectionName
);
position_t
*
get_position_coordinates
(
int
Mod_id
);
#endif
\ No newline at end of file
#endif
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
2989bb59
...
...
@@ -1749,7 +1749,7 @@ void nr_rrc_mac_config_req_sib1(module_id_t module_id,
}
// computes delay between ue and sat based on SIB19 ephemeris data
static
double
calculate_ue_sat_ta
(
position_t
*
position_params
,
struct
NR_PositionVelocity_r17
*
sat_pos
)
static
double
calculate_ue_sat_ta
(
const
position_t
*
position_params
,
struct
NR_PositionVelocity_r17
*
sat_pos
)
{
// get UE position coordinates
double
posx
=
position_params
->
positionX
;
...
...
@@ -1768,7 +1768,7 @@ static double calculate_ue_sat_ta(position_t *position_params, struct NR_Positio
return
ta_ms
;
}
void
nr_rrc_mac_config_req_sib19_r17
(
module_id_t
module_id
,
NR_SIB19_r17_t
*
sib19_r17
)
void
nr_rrc_mac_config_req_sib19_r17
(
module_id_t
module_id
,
const
position_t
*
pos
,
NR_SIB19_r17_t
*
sib19_r17
)
{
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
int
ret
=
pthread_mutex_lock
(
&
mac
->
if_mutex
);
...
...
@@ -1786,7 +1786,7 @@ void nr_rrc_mac_config_req_sib19_r17(module_id_t module_id, NR_SIB19_r17_t *sib1
if
(
position_velocity
&&
(
position_velocity
->
positionX_r17
!=
0
||
position_velocity
->
positionY_r17
!=
0
||
position_velocity
->
positionZ_r17
!=
0
))
{
mac
->
ntn_ta
.
N_UE_TA_adj
=
calculate_ue_sat_ta
(
get_position_coordinates
(
module_id
)
,
position_velocity
);
mac
->
ntn_ta
.
N_UE_TA_adj
=
calculate_ue_sat_ta
(
pos
,
position_velocity
);
}
}
// if cellSpecificKoffset_r17 is present
...
...
@@ -2647,4 +2647,4 @@ void nr_rrc_mac_config_req_cg(module_id_t module_id,
ue_init_config_request
(
mac
,
mac
->
current_DL_BWP
->
scs
);
ret
=
pthread_mutex_unlock
(
&
mac
->
if_mutex
);
AssertFatal
(
!
ret
,
"mutex failed %d
\n
"
,
ret
);
}
\ No newline at end of file
}
openair2/LAYER2/NR_MAC_UE/mac_proto.h
View file @
2989bb59
...
...
@@ -91,8 +91,8 @@ void nr_rrc_mac_config_req_sib1(module_id_t module_id,
NR_SI_SchedulingInfo_v1700_t
*
si_SchedulingInfo_v1700
,
NR_ServingCellConfigCommonSIB_t
*
scc
);
void
nr_rrc_mac_config_req_sib19_r17
(
module_id_t
module_id
,
NR_SIB19_r17_t
*
sib19_r17
);
struct
position
;
/* forward declaration */
void
nr_rrc_mac_config_req_sib19_r17
(
module_id_t
module_id
,
const
struct
position
*
pos
,
NR_SIB19_r17_t
*
sib19_r17
);
void
nr_rrc_mac_config_req_reset
(
module_id_t
module_id
,
NR_UE_MAC_reset_cause_t
cause
);
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
2989bb59
...
...
@@ -62,6 +62,7 @@
#include "common/utils/LOG/log.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "executables/position_interface.h"
#ifndef CELLULAR
#include "RRC/NR/MESSAGES/asn1_msg.h"
...
...
@@ -241,7 +242,8 @@ static void nr_decode_SI(NR_UE_RRC_SI_INFO *SI_info, NR_SystemInformation_t *si,
SI_info
->
SInfo_r17
.
sib19_validity
=
true
;
if
(
g_log
->
log_component
[
NR_RRC
].
level
>=
OAILOG_DEBUG
)
xer_fprint
(
stdout
,
&
asn_DEF_NR_SIB19_r17
,
(
const
void
*
)
typeandinfo
->
choice
.
sib19_v1700
);
nr_rrc_mac_config_req_sib19_r17
(
ue_id
,
typeandinfo
->
choice
.
sib19_v1700
);
position_t
*
p
=
get_position_coordinates
(
0
);
nr_rrc_mac_config_req_sib19_r17
(
ue_id
,
p
,
typeandinfo
->
choice
.
sib19_v1700
);
nr_timer_start
(
&
SI_info
->
SInfo_r17
.
sib19_timer
);
break
;
default:
...
...
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