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
lizhongxiao
OpenXG-RAN
Commits
fe1edff0
Commit
fe1edff0
authored
Feb 06, 2024
by
malik
Browse files
Options
Browse Files
Download
Plain Diff
synch with latest develop
parents
ae8c83ec
3490555f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
19 deletions
+11
-19
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+2
-2
openair2/COMMON/ngap_messages_types.h
openair2/COMMON/ngap_messages_types.h
+1
-6
openair3/NGAP/ngap_gNB_NRPPa_transport_procedures.c
openair3/NGAP/ngap_gNB_NRPPa_transport_procedures.c
+0
-3
openair3/NGAP/ngap_gNB_itti_messaging.c
openair3/NGAP/ngap_gNB_itti_messaging.c
+4
-4
openair3/NRPPA/nrppa_gNB_itti_messaging.c
openair3/NRPPA/nrppa_gNB_itti_messaging.c
+4
-4
No files found.
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
View file @
fe1edff0
...
...
@@ -514,7 +514,7 @@ void nr_pusch_ptrs_processing(PHY_VARS_gNB *gNB,
c16_t
*
phase_per_symbol
=
(
c16_t
*
)
pusch_vars
->
ptrs_phase_per_slot
[
aarx
];
ptrs_re_symbol
=
&
pusch_vars
->
ptrs_re_per_slot
;
*
ptrs_re_symbol
=
0
;
phase_per_symbol
[
symbol
].
i
=
0
;
phase_per_symbol
[
symbol
].
i
=
0
;
/* set DMRS estimates to 0 angle with magnitude 1 */
if
(
is_dmrs_symbol
(
symbol
,
*
dmrsSymbPos
))
{
/* set DMRS real estimation to 32767 */
...
...
@@ -524,7 +524,7 @@ void nr_pusch_ptrs_processing(PHY_VARS_gNB *gNB,
#endif
}
else
{
// real ptrs value is set to 0
phase_per_symbol
[
symbol
].
r
=
0
;
phase_per_symbol
[
symbol
].
r
=
0
;
}
if
(
symbol
==
*
startSymbIndex
)
{
...
...
openair2/COMMON/ngap_messages_types.h
View file @
fe1edff0
...
...
@@ -71,15 +71,10 @@
#define NGAP_PDUSESSION_RELEASE_RESPONSE(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_release_resp
#define NGAP_UPLINKUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_UplinkUEAssociatedNRPPa
#define NGAP_UPLINKNONUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_UplinkNonUEAssociatedNRPPa
#define NGAP_UPLINKNONUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_UplinkNonUEAssociatedNRPPa
#define NGAP_DOWNLINKUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_DownlinkUEAssociatedNRPPa
#define NGAP_DOWNLINKNONUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_DownlinkNonUEAssociatedNRPPa
#define NGAP_UPLINKUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_UplinkUEAssociatedNRPPa
#define NGAP_UPLINKNONUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_UplinkNonUEAssociatedNRPPa
#define NGAP_DOWNLINKUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_DownlinkUEAssociatedNRPPa
#define NGAP_DOWNLINKNONUEASSOCIATEDNRPPA(mSGpTR) (mSGpTR)->ittiMsg.ngap_DownlinkNonUEAssociatedNRPPa
//-------------------------------------------------------------------------------------------//
/* Maximum number of e-rabs to be setup/deleted in a single message.
* Even if only one bearer will be modified by message.
...
...
openair3/NGAP/ngap_gNB_NRPPa_transport_procedures.c
View file @
fe1edff0
...
...
@@ -51,7 +51,6 @@
int
ngap_gNB_UplinkUEAssociatedNRPPaTransport
(
instance_t
instance
,
ngap_UplinkUEAssociatedNRPPa_t
*
UlNRPPaMsg
)
{
LOG_I
(
NGAP
,
"Initiating ngap_gNB_UplinkUEAssociatedNRPPaTransport
\n
"
);
DevAssert
(
UlNRPPaMsg
!=
NULL
);
struct
ngap_gNB_ue_context_s
*
ue_context_p
=
NULL
;
ngap_gNB_instance_t
*
ngap_gNB_instance_p
=
NULL
;
...
...
@@ -74,7 +73,6 @@ int ngap_gNB_UplinkUEAssociatedNRPPaTransport(instance_t instance, ngap_UplinkUE
head
->
procedureCode
=
NGAP_ProcedureCode_id_UplinkUEAssociatedNRPPaTransport
;
head
->
criticality
=
NGAP_Criticality_ignore
;
head
->
value
.
present
=
NGAP_InitiatingMessage__value_PR_UplinkUEAssociatedNRPPaTransport
;
NGAP_UplinkUEAssociatedNRPPaTransport_t
*
out
=
&
head
->
value
.
choice
.
UplinkUEAssociatedNRPPaTransport
;
// IE: 9.3.3.1 AMF UE NGAP ID /* mandatory */
...
...
@@ -121,7 +119,6 @@ int ngap_gNB_UplinkUEAssociatedNRPPaTransport(instance_t instance, ngap_UplinkUE
/* Encode procedure has failed... */
return
-
1
;
}
LOG_I
(
NGAP
,
"Sending sctp_data_req for ngap_gNB_UplinkUEAssociatedNRPPaTransport
\n
"
);
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req
(
ngap_gNB_instance_p
->
instance
,
...
...
openair3/NGAP/ngap_gNB_itti_messaging.c
View file @
fe1edff0
...
...
@@ -89,7 +89,7 @@ void ngap_gNB_itti_send_DownlinkUEAssociatedNRPPa(instance_t instance,
uint8_t
*
nrppa_pdu
,
uint32_t
nrppa_pdu_length
)
{
/*
MessageDef *msg= itti_alloc_new_message(TASK_NGAP, 0, NGAP_DOWNLINKUEASSOCIATEDNRPPA);
MessageDef
*
msg
=
itti_alloc_new_message
(
TASK_NGAP
,
0
,
NGAP_DOWNLINKUEASSOCIATEDNRPPA
);
ngap_DownlinkUEAssociatedNRPPa_t
*
DLNRPPa
=
&
NGAP_DOWNLINKUEASSOCIATEDNRPPA
(
msg
);
DLNRPPa
->
gNB_ue_ngap_id
=
gNB_ue_ngap_id
;
...
...
@@ -105,9 +105,9 @@ void ngap_gNB_itti_send_DownlinkUEAssociatedNRPPa(instance_t instance,
memcpy
(
DLNRPPa
->
nrppa_pdu
.
buffer
,
nrppa_pdu
,
nrppa_pdu_length
);
DLNRPPa
->
nrppa_pdu
.
length
=
nrppa_pdu_length
;
itti_send_msg_to_task(TASK_NRPPA, instance, msg);
*/
itti_send_msg_to_task
(
TASK_NRPPA
,
instance
,
msg
);
MessageDef
*
msg
=
itti_alloc_new_message_sized
(
TASK_NGAP
,
0
,
NGAP_DOWNLINKUEASSOCIATEDNRPPA
,
/*
MessageDef *msg=itti_alloc_new_message_sized(TASK_NGAP, 0, NGAP_DOWNLINKUEASSOCIATEDNRPPA,
sizeof(ngap_DownlinkUEAssociatedNRPPa_t)+ routingId_buffer_length + nrppa_pdu_length);
ngap_DownlinkUEAssociatedNRPPa_t *msgData = &NGAP_DOWNLINKUEASSOCIATEDNRPPA(msg);
...
...
@@ -124,7 +124,7 @@ void ngap_gNB_itti_send_DownlinkUEAssociatedNRPPa(instance_t instance,
memcpy(msgData->nrppa_pdu.buffer, nrppa_pdu, nrppa_pdu_length);
msgData->nrppa_pdu.length = nrppa_pdu_length;
itti_send_msg_to_task
(
TASK_NRPPA
,
instance
,
msg
);
itti_send_msg_to_task(TASK_NRPPA, instance, msg);
*/
}
void
ngap_gNB_itti_send_DownlinkNonUEAssociatedNRPPa
(
instance_t
instance
,
...
...
openair3/NRPPA/nrppa_gNB_itti_messaging.c
View file @
fe1edff0
...
...
@@ -86,7 +86,7 @@ void nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa(instance_t instance,
{
LOG_I
(
NRPPA
,
"initiating nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa
\n
"
);
MessageDef
*
msg
=
itti_alloc_new_message
(
TASK_NRPPA
,
0
,
NGAP_UPLINKNONUEASSOCIATEDNRPPA
);
/*
MessageDef *msg = itti_alloc_new_message(TASK_NRPPA, 0, NGAP_UPLINKNONUEASSOCIATEDNRPPA);
ngap_UplinkNonUEAssociatedNRPPa_t *ULNRPPA= &NGAP_UPLINKNONUEASSOCIATEDNRPPA(msg);
// Routing ID
...
...
@@ -99,9 +99,9 @@ void nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa(instance_t instance,
memcpy(ULNRPPA->nrppa_pdu.buffer, nrppa_pdu, nrppa_pdu_length);
ULNRPPA->nrppa_pdu.length = nrppa_pdu_length;
itti_send_msg_to_task
(
TASK_NGAP
,
instance
,
msg
);
itti_send_msg_to_task(TASK_NGAP, instance, msg);
*/
/
*
TODO try the below approach
/
/
TODO try the below approach
MessageDef
*
msg
=
itti_alloc_new_message_sized
(
TASK_NRPPA
,
0
,
NGAP_UPLINKNONUEASSOCIATEDNRPPA
,
sizeof
(
ngap_UplinkNonUEAssociatedNRPPa_t
)
+
routingId_buffer_length
+
nrppa_pdu_length
);
...
...
@@ -117,5 +117,5 @@ void nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa(instance_t instance,
memcpy
(
msgData
->
nrppa_pdu
.
buffer
,
nrppa_pdu
,
nrppa_pdu_length
);
msgData
->
nrppa_pdu
.
length
=
nrppa_pdu_length
;
itti_send_msg_to_task(TASK_NGAP, instance, msg);
*/
itti_send_msg_to_task
(
TASK_NGAP
,
instance
,
msg
);
}
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