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
3eaebbca
Commit
3eaebbca
authored
Feb 23, 2022
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CSI PDU received at PHY layer in new function nr_ue_csi_rs_procedures at UE
parent
853776ef
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
95 additions
and
6 deletions
+95
-6
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-0
executables/main-ocp.c
executables/main-ocp.c
+1
-1
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/csi_rx.c
openair1/PHY/NR_UE_TRANSPORT/csi_rx.c
+75
-0
openair1/SCHED_NR_UE/defs.h
openair1/SCHED_NR_UE/defs.h
+3
-0
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+0
-2
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+12
-0
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+1
-1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
3eaebbca
...
...
@@ -1759,6 +1759,7 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/dci_nr.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/pucch_nr.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/csi_rx.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_uci_tools_common.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
${
OPENAIR1_DIR
}
/PHY/NR_REFSIG/ul_ref_seq_nr.c
...
...
executables/main-ocp.c
View file @
3eaebbca
...
...
@@ -173,7 +173,7 @@ void init_transport(PHY_VARS_eNB *eNB) {
}
for
(
int
i
=
0
;
i
<
NUMBER_OF_ULSCH_MAX
;
i
++
)
{
LOG_D
(
PHY
,
"Allocating Transport Channel Buffer for ULSCH, UE %d
\n
"
,
i
);
LOG_D
(
PHY
,
"Allocating Transport Channel Buffer
s
for ULSCH, UE %d
\n
"
,
i
);
AssertFatal
((
eNB
->
ulsch
[
1
+
i
]
=
new_eNB_ulsch
(
MAX_TURBO_ITERATIONS
,
fp
->
N_RB_UL
,
0
))
!=
NULL
,
"Can't get eNB ulsch structures
\n
"
);
// this is the transmission mode for the signalling channels
...
...
openair1/PHY/INIT/nr_init.c
View file @
3eaebbca
...
...
@@ -573,7 +573,7 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
for
(
int
i
=
0
;
i
<
gNB
->
number_of_nr_ulsch_max
;
i
++
)
{
LOG_I
(
PHY
,
"Allocating Transport Channel Buffer for ULSCH %d/%d
\n
"
,
i
,
gNB
->
number_of_nr_ulsch_max
);
LOG_I
(
PHY
,
"Allocating Transport Channel Buffer
s
for ULSCH %d/%d
\n
"
,
i
,
gNB
->
number_of_nr_ulsch_max
);
for
(
int
j
=
0
;
j
<
2
;
j
++
)
{
// ULSCH for data
...
...
openair1/PHY/NR_UE_TRANSPORT/csi_rx.c
0 → 100644
View file @
3eaebbca
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
/***********************************************************************
*
* FILENAME : csi_rx.c
*
* MODULE :
*
* DESCRIPTION : function to receive the channel state information
*
************************************************************************/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "nr_transport_proto_ue.h"
#include "PHY/phy_extern_nr_ue.h"
#include "common/utils/nr/nr_common.h"
//#define NR_CSIRS_DEBUG
int
nr_ue_csi_im_procedures
(
PHY_VARS_NR_UE
*
ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
gNB_id
)
{
return
0
;
}
int
nr_ue_csi_rs_procedures
(
PHY_VARS_NR_UE
*
ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
gNB_id
)
{
if
(
!
ue
->
csirs_vars
[
gNB_id
]
->
active
)
{
return
-
1
;
}
fapi_nr_dl_config_csirs_pdu_rel15_t
*
csirs_config_pdu
=
(
fapi_nr_dl_config_csirs_pdu_rel15_t
*
)
&
ue
->
csirs_vars
[
gNB_id
]
->
csirs_config_pdu
;
#ifdef NR_CSIRS_DEBUG
LOG_I
(
NR_PHY
,
"csirs_config_pdu->bwp_size = %i
\n
"
,
csirs_config_pdu
->
bwp_size
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->bwp_start = %i
\n
"
,
csirs_config_pdu
->
bwp_start
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->subcarrier_spacing = %i
\n
"
,
csirs_config_pdu
->
subcarrier_spacing
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->cyclic_prefix = %i
\n
"
,
csirs_config_pdu
->
cyclic_prefix
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->start_rb = %i
\n
"
,
csirs_config_pdu
->
start_rb
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->nr_of_rbs = %i
\n
"
,
csirs_config_pdu
->
nr_of_rbs
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->csi_type = %i (0:TRS, 1:CSI-RS NZP, 2:CSI-RS ZP)
\n
"
,
csirs_config_pdu
->
csi_type
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->row = %i
\n
"
,
csirs_config_pdu
->
row
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->freq_domain = %i
\n
"
,
csirs_config_pdu
->
freq_domain
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->symb_l0 = %i
\n
"
,
csirs_config_pdu
->
symb_l0
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->symb_l1 = %i
\n
"
,
csirs_config_pdu
->
symb_l1
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->cdm_type = %i
\n
"
,
csirs_config_pdu
->
cdm_type
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->freq_density = %i (0: dot5 (even RB), 1: dot5 (odd RB), 2: one, 3: three)
\n
"
,
csirs_config_pdu
->
freq_density
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->scramb_id = %i
\n
"
,
csirs_config_pdu
->
scramb_id
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->power_control_offset = %i
\n
"
,
csirs_config_pdu
->
power_control_offset
);
LOG_I
(
NR_PHY
,
"csirs_config_pdu->power_control_offset_ss = %i
\n
"
,
csirs_config_pdu
->
power_control_offset_ss
);
#endif
return
0
;
}
openair1/SCHED_NR_UE/defs.h
View file @
3eaebbca
...
...
@@ -418,6 +418,9 @@ int nr_ue_pdcch_procedures(uint8_t gNB_id,
UE_nr_rxtx_proc_t
*
proc
,
int
n_ss
);
int
nr_ue_csi_im_procedures
(
PHY_VARS_NR_UE
*
ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
gNB_id
);
int
nr_ue_csi_rs_procedures
(
PHY_VARS_NR_UE
*
ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
gNB_id
);
#endif
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
3eaebbca
...
...
@@ -305,13 +305,11 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
LOG_D
(
PHY
,
"Number of DCI SearchSpaces %d
\n
"
,
pdcch_vars
->
nb_search_space
);
break
;
case
FAPI_NR_DL_CONFIG_TYPE_CSI_IM
:
LOG_I
(
PHY
,
"Received CSI-IM PDU at FAPI
\n
"
);
csiim_config_pdu
=
&
dl_config
->
dl_config_list
[
i
].
csiim_config_pdu
.
csiim_config_rel15
;
memcpy
((
void
*
)
&
(
csiim_vars
->
csiim_config_pdu
),
(
void
*
)
csiim_config_pdu
,
sizeof
(
fapi_nr_dl_config_csiim_pdu_rel15_t
));
csirs_vars
->
active
=
true
;
break
;
case
FAPI_NR_DL_CONFIG_TYPE_CSI_RS
:
LOG_I
(
PHY
,
"Received CSI-RS PDU at FAPI
\n
"
);
csirs_config_pdu
=
&
dl_config
->
dl_config_list
[
i
].
csirs_config_pdu
.
csirs_config_rel15
;
memcpy
((
void
*
)
&
(
csirs_vars
->
csirs_config_pdu
),
(
void
*
)
csirs_config_pdu
,
sizeof
(
fapi_nr_dl_config_csirs_pdu_rel15_t
));
csirs_vars
->
active
=
true
;
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
3eaebbca
...
...
@@ -1641,6 +1641,18 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
}
// do procedures for CSI-IM
if
((
ue
->
csiim_vars
[
gNB_id
])
&&
(
ue
->
csiim_vars
[
gNB_id
]
->
active
==
1
))
{
nr_ue_csi_im_procedures
(
ue
,
proc
,
gNB_id
);
ue
->
csiim_vars
[
gNB_id
]
->
active
=
0
;
}
// do procedures for CSI-RS
if
((
ue
->
csirs_vars
[
gNB_id
])
&&
(
ue
->
csirs_vars
[
gNB_id
]
->
active
==
1
))
{
nr_ue_csi_rs_procedures
(
ue
,
proc
,
gNB_id
);
ue
->
csirs_vars
[
gNB_id
]
->
active
=
0
;
}
start_meas
(
&
ue
->
generic_stat
);
if
(
nr_slot_rx
==
9
)
{
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
3eaebbca
...
...
@@ -1419,7 +1419,7 @@ void fill_initial_SpCellConfig(int uid,
imres0
->
csi_IM_ResourceElementPattern
->
choice
.
pattern1
->
symbolLocation_p1
=
6
;
imres0
->
freqBand
=
calloc
(
1
,
sizeof
(
*
imres0
->
freqBand
));
imres0
->
freqBand
->
startingRB
=
0
;
imres0
->
freqBand
->
nrofRBs
=
108
;
imres0
->
freqBand
->
nrofRBs
=
((
curr_bwp
>>
2
)
+
(
curr_bwp
%
4
>
0
))
<<
2
;
imres0
->
periodicityAndOffset
=
calloc
(
1
,
sizeof
(
*
imres0
->
periodicityAndOffset
));
imres0
->
periodicityAndOffset
->
present
=
NR_CSI_ResourcePeriodicityAndOffset_PR_slots320
;
imres0
->
periodicityAndOffset
->
choice
.
slots320
=
0
;
...
...
targets/RT/USER/lte-enb.c
View file @
3eaebbca
...
...
@@ -1137,7 +1137,7 @@ void init_transport(PHY_VARS_eNB *eNB) {
}
for
(
int
i
=
0
;
i
<
NUMBER_OF_ULSCH_MAX
;
i
++
)
{
LOG_I
(
PHY
,
"Allocating Transport Channel Buffer for ULSCH %d/%d
\n
"
,
i
,
NUMBER_OF_ULSCH_MAX
);
LOG_I
(
PHY
,
"Allocating Transport Channel Buffer
s
for ULSCH %d/%d
\n
"
,
i
,
NUMBER_OF_ULSCH_MAX
);
eNB
->
ulsch
[
i
]
=
new_eNB_ulsch
(
MAX_TURBO_ITERATIONS
,
fp
->
N_RB_UL
,
0
);
if
(
!
eNB
->
ulsch
[
i
])
{
...
...
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