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
Michael Black
OpenXG-RAN
Commits
cce7ed54
Commit
cce7ed54
authored
Nov 22, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove obsolete code and fix build warnings
parent
c2d948a0
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
64 deletions
+18
-64
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
+0
-33
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.h
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.h
+4
-4
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_common.c
+12
-4
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+0
-10
openair1/SCHED_NR/sched_nr.h
openair1/SCHED_NR/sched_nr.h
+0
-1
openair1/SCHED_NR_UE/defs.h
openair1/SCHED_NR_UE/defs.h
+0
-12
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+2
-0
No files found.
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
View file @
cce7ed54
...
...
@@ -395,39 +395,6 @@ int generate_srs_nr(fapi_nr_ul_config_srs_pdu *srs_config_pdu,
return
(
0
);
}
/*******************************************************************
*
* NAME : is_srs_period_nr
*
* PARAMETERS : pointer to resource set
* pointer to transmit buffer
* amplitude scaling for this physical signal
* slot number of transmission
* RETURN : 0 if it is a valid slot for transmitting srs
* -1 if srs should not be transmitted
*
* DESCRIPTION : for periodic,
*
*********************************************************************/
int
is_srs_period_nr
(
SRS_Resource_t
*
p_SRS_Resource
,
NR_DL_FRAME_PARMS
*
frame_parms
,
int
frame_tx
,
int
slot_tx
)
{
uint16_t
T_SRS
=
srs_period
[
p_SRS_Resource
->
SRS_Periodicity
];
uint16_t
T_offset
=
p_SRS_Resource
->
SRS_Offset
;
/* FFS_TODO_NR to check interface */
if
(
T_offset
>
T_SRS
)
{
LOG_E
(
PHY
,
"is_srs_occasion_nr: T_offset %d is greater than T_SRS %d!
\n
"
,
T_offset
,
T_SRS
);
return
(
-
1
);
}
int16_t
N_slot_frame
=
frame_parms
->
slots_per_frame
;
if
((
N_slot_frame
*
frame_tx
+
slot_tx
-
T_offset
)
%
T_SRS
==
0
)
{
return
(
0
);
}
else
{
return
(
-
1
);
}
}
/*******************************************************************
*
* NAME : ue_srs_procedures_nr
...
...
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.h
View file @
cce7ed54
openair1/SCHED_NR/phy_procedures_nr_common.c
View file @
cce7ed54
...
...
@@ -19,9 +19,17 @@
* contact@openairinterface.org
*/
#include "PHY/defs_gNB.h"
/*! \file phy_procedures_lte_eNB.c
* \brief Implementation of common utilities for eNB/UE procedures from 36.213 LTE specifications
* \author R. Knopp, F. Kaltenberger
* \date 2011
* \version 0.1
* \company Eurecom
* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
* \note
* \warning
*/
bool
is_srs_occasion_nr
(
NR_DL_FRAME_PARMS
frame_parms
,
int
frame_rx
,
int
slot_rx
)
{
return
false
;
}
#include "sched_nr.h"
#include "PHY/INIT/phy_init.h"
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
cce7ed54
...
...
@@ -199,14 +199,6 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_TX
+
offset
,
0
);
}
void
srs_procedures_nr
(
PHY_VARS_gNB
*
gNB
,
int
frame_rx
,
int
slot_rx
)
{
if
(
is_srs_occasion_nr
(
gNB
->
frame_parms
,
frame_rx
,
slot_rx
))
{
LOG_W
(
NR_PHY
,
"SRS procedures are not implemented yet!
\n
"
);
}
}
void
nr_postDecode
(
PHY_VARS_gNB
*
gNB
,
notifiedFIFO_elt_t
*
req
)
{
ldpcDecode_t
*
rdata
=
(
ldpcDecode_t
*
)
NotifiedFifoData
(
req
);
NR_UL_gNB_HARQ_t
*
ulsch_harq
=
rdata
->
ulsch_harq
;
...
...
@@ -638,8 +630,6 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
}
}
else
num_symb
=
NR_NUMBER_OF_SYMBOLS_PER_SLOT
;
srs_procedures_nr
(
gNB
,
frame_rx
,
slot_rx
);
gNB_I0_measurements
(
gNB
,
slot_rx
,
first_symb
,
num_symb
);
int
offset
=
10
*
gNB
->
frame_parms
.
ofdm_symbol_size
+
gNB
->
frame_parms
.
first_carrier_offset
;
...
...
openair1/SCHED_NR/sched_nr.h
View file @
cce7ed54
...
...
@@ -54,6 +54,5 @@ void nr_fep_full(RU_t *ru, int slot);
void
nr_fep_full_2thread
(
RU_t
*
ru
,
int
slot
);
void
feptx_prec
(
RU_t
*
ru
,
int
frame_tx
,
int
tti_tx
);
int
nr_phy_init_RU
(
RU_t
*
ru
);
bool
is_srs_occasion_nr
(
NR_DL_FRAME_PARMS
frame_parms
,
int
frame_rx
,
int
slot_rx
);
#endif
openair1/SCHED_NR_UE/defs.h
View file @
cce7ed54
...
...
@@ -358,24 +358,12 @@ int16_t nr_pucch_power_cntl(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t s
*/
void
nr_pusch_power_cntl
(
PHY_VARS_NR_UE
*
phy_vars_ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
j
,
uint8_t
abstraction_flag
);
/*! \brief This function implements the power control mechanism for SRS from 36.213.
@param phy_vars_ue PHY variables
@param proc Pointer to proc descriptor
@param eNB_id Index of eNB
@param j index of type of PUSCH (SPS, Normal, Msg3)
@returns Transmit power
*/
void
nr_srs_power_cntl
(
PHY_VARS_NR_UE
*
ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
*
pnb_rb_srs
,
uint8_t
abstraction_flag
);
void
nr_get_cqipmiri_params
(
PHY_VARS_NR_UE
*
ue
,
uint8_t
eNB_id
);
void
nr_dump_dlsch
(
PHY_VARS_NR_UE
*
phy_vars_ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
subframe
,
uint8_t
harq_pid
);
void
nr_dump_dlsch_SI
(
PHY_VARS_NR_UE
*
phy_vars_ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
subframe
);
void
nr_dump_dlsch_ra
(
PHY_VARS_NR_UE
*
phy_vars_ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
subframe
);
bool
is_srs_occasion_nr
(
NR_DL_FRAME_PARMS
frame_parms
,
int
frame_rx
,
int
slot_rx
);
void
compute_srs_pos_nr
(
lte_frame_type_t
frameType
,
uint16_t
isrs
,
uint16_t
*
psrsPeriodicity
,
uint16_t
*
psrsOffset
);
void
set_tx_harq_id
(
NR_UE_ULSCH_t
*
ulsch
,
int
harq_pid
,
int
slot_tx
);
int
get_tx_harq_id
(
NR_UE_ULSCH_t
*
ulsch
,
int
slot_tx
);
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
cce7ed54
...
...
@@ -2545,6 +2545,8 @@ uint16_t get_nr_srs_offset(NR_SRS_PeriodicityAndOffset_t periodicityAndOffset) {
case
NR_SRS_PeriodicityAndOffset_PR_NOTHING
:
LOG_W
(
NR_MAC
,
"NR_SRS_PeriodicityAndOffset_PR_NOTHING
\n
"
);
return
0
;
default:
return
0
;
}
}
...
...
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