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
OpenXG
OpenXG UE
Commits
923b3b07
Commit
923b3b07
authored
Jun 18, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a bunch of compilation warnings
parent
27327c89
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
44 additions
and
41 deletions
+44
-41
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
+1
-1
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+1
-1
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+2
-2
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+1
-1
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+3
-3
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-1
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+1
-1
openair1/SIMULATION/NR_PHY/pucchsim.c
openair1/SIMULATION/NR_PHY/pucchsim.c
+3
-3
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+4
-4
openair2/GNB_APP/gnb_app.c
openair2/GNB_APP/gnb_app.c
+2
-2
openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c
openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c
+2
-1
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+5
-4
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+1
-1
openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+3
-2
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+2
-2
openair3/GTPV1-U/gtpv1u_gNB.c
openair3/GTPV1-U/gtpv1u_gNB.c
+4
-4
openair3/S1AP/s1ap_eNB_nas_procedures.c
openair3/S1AP/s1ap_eNB_nas_procedures.c
+5
-5
No files found.
openair1/PHY/NR_TRANSPORT/nr_prach.c
View file @
923b3b07
...
...
@@ -164,7 +164,7 @@ void rx_nr_prach_ru(RU_t *ru,
int
dftlen
=
0
;
int
mu
=
fp
->
numerology_index
;
int
Ncp
;
int
Ncp
=
0
;
int16_t
*
prach2
;
if
(
prach_sequence_length
==
0
)
{
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
View file @
923b3b07
...
...
@@ -232,7 +232,7 @@ void nr_ulsch_extract_rbs_single(int32_t **rxdataF,
unsigned
short
start_re
,
re
,
nb_re_pusch
;
unsigned
char
aarx
;
uint8_t
K_ptrs
;
uint8_t
K_ptrs
=
0
;
uint32_t
rxF_ext_index
=
0
;
uint32_t
ul_ch0_ext_index
=
0
;
uint32_t
ul_ch0_index
=
0
;
...
...
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @
923b3b07
...
...
@@ -1585,7 +1585,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
uci_pdu
->
sr
.
sr_bit_len
=
1
;
uci_pdu
->
sr
.
sr_payload
=
malloc
(
1
);
uci_pdu
->
sr
.
sr_payload
[
0
]
=
decodedPayload
[
0
]
&
1
;
decodedPayload
[
0
]
>>
1
;
decodedPayload
[
0
]
=
decodedPayload
[
0
]
>>
1
;
}
// csi
if
(
pucch_pdu
->
bit_len_csi_part1
>
0
)
{
...
...
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @
923b3b07
...
...
@@ -846,7 +846,7 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
rel15
=
&
pdcch_vars
->
pdcch_config
[
i
];
int
dci_length
=
rel15
->
dci_length
;
int
gNB_id
=
0
;
//
int gNB_id = 0;
int16_t
tmp_e
[
16
*
108
];
rnti_t
n_rnti
;
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
923b3b07
...
...
@@ -214,7 +214,7 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
printf
(
"[DEMOD] I am assuming only TB1 is active, it is in cw %d
\n
"
,
dlsch1_harq
->
codeword
);
#endif
AssertFatal
(
1
==
0
,
"[UE][FATAL] DLSCH: TB0 not active and TB1 active case is not supported
%d
\n
"
);
AssertFatal
(
1
==
0
,
"[UE][FATAL] DLSCH: TB0 not active and TB1 active case is not supported
\n
"
);
}
else
{
LOG_E
(
PHY
,
"[UE][FATAL] nr_tti_rx %d: no active DLSCH
\n
"
,
nr_tti_rx
);
...
...
@@ -230,7 +230,7 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
}
if
(
dlsch0_harq
=
NULL
)
if
(
dlsch0_harq
=
=
NULL
)
AssertFatal
(
1
==
0
,
"Done
\n
"
);
dlsch0_harq
->
Qm
=
nr_get_Qm_dl
(
dlsch
[
0
]
->
harq_processes
[
harq_pid
]
->
mcs
,
dlsch
[
0
]
->
harq_processes
[
harq_pid
]
->
mcs_table
);
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
View file @
923b3b07
...
...
@@ -78,7 +78,7 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint8_t slot){
uint16_t
rootSequenceIndex
,
prach_fmt_id
,
NCS
,
*
prach_root_sequence_map
,
preamble_offset
=
0
;
uint16_t
preamble_shift
=
0
,
preamble_index0
,
n_shift_ra
,
n_shift_ra_bar
,
d_start
,
numshift
,
N_ZC
,
u
,
offset
,
offset2
,
first_nonzero_root_idx
;
int16_t
prach_tmp
[
98304
*
2
*
4
]
__attribute__
((
aligned
(
32
)));
int16_t
Ncp
,
amp
,
*
prach
,
*
prach2
,
*
prachF
,
*
Xu
;
int16_t
Ncp
=
0
,
amp
,
*
prach
,
*
prach2
,
*
prachF
,
*
Xu
;
int32_t
Xu_re
,
Xu_im
,
samp_count
;
int
prach_start
,
prach_sequence_length
,
i
,
prach_len
,
dftlen
,
mu
,
kbar
,
K
,
n_ra_prb
,
k
;
//int restricted_Type;
...
...
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
923b3b07
...
...
@@ -51,7 +51,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
// Note: we have to handle the thread IDs for this. To be revisited completely.
thread_id
=
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
current_thread_id
[
slot
];
NR_UE_DLSCH_t
*
dlsch0
;
NR_UE_DLSCH_t
*
dlsch0
=
NULL
;
NR_UE_PDCCH
*
pdcch_vars
=
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
pdcch_vars
[
thread_id
][
0
];
NR_UE_ULSCH_t
*
ulsch0
=
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
ulsch
[
thread_id
][
0
][
0
];
...
...
@@ -123,7 +123,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
uint8_t
pdu_type
=
ul_config
->
ul_config_list
[
i
].
pdu_type
,
pucch_resource_id
,
current_harq_pid
,
format
,
gNB_id
=
0
;
/* PRACH */
NR_PRACH_RESOURCES_t
*
prach_resources
;
//
NR_PRACH_RESOURCES_t *prach_resources;
fapi_nr_ul_config_prach_pdu
*
prach_config_pdu
;
/* PUSCH */
nfapi_nr_ue_pusch_pdu_t
*
pusch_config_pdu
;
...
...
@@ -193,7 +193,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
case
(
FAPI_NR_UL_CONFIG_TYPE_PRACH
):
// prach config pdu
prach_resources
=
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
prach_resources
[
gNB_id
];
//
prach_resources = PHY_vars_UE_g[module_id][cc_id]->prach_resources[gNB_id];
prach_config_pdu
=
&
ul_config
->
ul_config_list
[
i
].
prach_config_pdu
;
memcpy
((
void
*
)
&
(
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
prach_vars
[
gNB_id
]
->
prach_pdu
),
(
void
*
)
prach_config_pdu
,
sizeof
(
fapi_nr_ul_config_prach_pdu
));
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
prach_vars
[
gNB_id
]
->
prach_Config_enabled
=
1
;
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
923b3b07
...
...
@@ -4487,7 +4487,7 @@ void nr_ue_prach_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t
uint8_t
mod_id
=
ue
->
Mod_id
;
UE_MODE_t
UE_mode
=
get_nrUE_mode
(
mod_id
,
ue
->
CC_id
,
gNB_id
);
NR_PRACH_RESOURCES_t
*
prach_resources
=
ue
->
prach_resources
[
gNB_id
];
uint8_t
nr_prach
;
uint8_t
nr_prach
=
0
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH
,
VCD_FUNCTION_IN
);
...
...
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
923b3b07
...
...
@@ -87,7 +87,7 @@ int main(int argc, char **argv){
double
**
s_re
,
**
s_im
,
**
r_re
,
**
r_im
,
iqim
=
0
.
0
,
delay_avg
=
0
,
ue_speed
=
0
,
fs
,
bw
;
int
i
,
aa
,
aarx
,
**
txdata
,
trial
,
n_frames
=
1
,
prach_start
,
rx_prach_start
;
//, ntrials=1;
int
N_RB_UL
=
106
,
delay
=
0
,
NCS_config
=
13
,
rootSequenceIndex
=
1
,
threequarter_fs
=
0
,
mu
=
1
,
fd_occasion
=
0
,
loglvl
=
OAILOG_INFO
,
numRA
=
0
,
prachStartSymbol
=
0
;
uint8_t
snr1set
=
0
,
ue_speed1set
=
0
,
transmission_mode
=
1
,
n_tx
=
1
,
n_rx
=
1
,
awgn_flag
=
0
,
msg1_frequencystart
=
0
,
num_prach_fd_occasions
=
1
,
prach_format
;
uint8_t
snr1set
=
0
,
ue_speed1set
=
0
,
transmission_mode
=
1
,
n_tx
=
1
,
n_rx
=
1
,
awgn_flag
=
0
,
msg1_frequencystart
=
0
,
num_prach_fd_occasions
=
1
,
prach_format
=
0
;
uint8_t
frame
=
1
,
subframe
=
19
,
config_index
=
98
,
prach_sequence_length
=
1
,
num_root_sequences
=
16
,
restrictedSetConfig
=
0
,
N_dur
,
N_t_slot
,
start_symbol
;
uint16_t
Nid_cell
=
0
,
preamble_tx
=
0
,
preamble_delay
,
format
,
format0
,
format1
;
uint32_t
tx_lev
=
10000
,
prach_errors
=
0
,
samp_count
;
//,tx_lev_dB;
...
...
openair1/SIMULATION/NR_PHY/pucchsim.c
View file @
923b3b07
...
...
@@ -84,7 +84,7 @@ int main(int argc, char **argv)
int
format
=
0
;
//uint8_t extended_prefix_flag=0;
FILE
*
input_fd
=
NULL
;
uint8_t
nacktoack_flag
=
0
;
//
uint8_t nacktoack_flag=0;
int16_t
amp
=
0x7FFF
;
int
nr_tti_tx
=
0
;
uint64_t
actual_payload
=
0
,
payload_received
;
...
...
@@ -283,7 +283,7 @@ int main(int argc, char **argv)
actual_payload
=
atoi
(
optarg
);
break
;
case
'T'
:
nacktoack_flag
=
(
uint8_t
)
atoi
(
optarg
);
//
nacktoack_flag=(uint8_t)atoi(optarg);
target_error_rate
=
0
.
001
;
break
;
default:
...
...
@@ -457,7 +457,7 @@ int main(int argc, char **argv)
pucch_GroupHopping_t
PUCCH_GroupHopping
=
UE
->
pucch_config_common_nr
->
pucch_GroupHopping
;
uint32_t
hopping_id
=
UE
->
pucch_config_common_nr
->
hoppingId
;
uint32_t
dmrs_scrambling_id
=
0
,
data_scrambling_id
=
0
;
t_nrPolar_params
*
currentPtr
;
//
t_nrPolar_params *currentPtr;
if
(
format
==
0
){
// for now we are not considering SR just HARQ-ACK
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
923b3b07
...
...
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
int
trial
,
n_trials
=
1
,
n_errors
=
0
,
n_false_positive
=
0
,
delay
=
0
;
uint8_t
n_tx
=
1
,
n_rx
=
1
;
//uint8_t transmission_mode = 1;
uint16_t
Nid_cell
=
0
;
//
uint16_t Nid_cell = 0;
channel_desc_t
*
gNB2UE
;
uint8_t
extended_prefix_flag
=
0
;
//int8_t interf1 = -21, interf2 = -21;
...
...
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
int
frame_length_complex_samples
,
frame_length_complex_samples_no_prefix
;
NR_DL_FRAME_PARMS
*
frame_parms
;
int
loglvl
=
OAILOG_WARNING
;
uint64_t
SSB_positions
=
0x01
;
//
uint64_t SSB_positions=0x01;
uint16_t
nb_symb_sch
=
12
;
int
start_symbol
=
2
;
uint16_t
nb_rb
=
50
;
...
...
@@ -294,11 +294,11 @@ int main(int argc, char **argv)
break
;
case
'M'
:
SSB_positions
=
atoi
(
optarg
);
//
SSB_positions = atoi(optarg);
break
;
case
'N'
:
Nid_cell
=
atoi
(
optarg
);
//
Nid_cell = atoi(optarg);
break
;
case
'R'
:
...
...
openair2/GNB_APP/gnb_app.c
View file @
923b3b07
...
...
@@ -75,12 +75,12 @@ static void configure_nr_rrc(uint32_t gnb_id)
static
uint32_t
gNB_app_register
(
uint32_t
gnb_id_start
,
uint32_t
gnb_id_end
)
//, const Enb_properties_array_t *enb_properties)
{
uint32_t
gnb_id
;
MessageDef
*
msg_p
;
//
MessageDef *msg_p;
uint32_t
register_gnb_pending
=
0
;
for
(
gnb_id
=
gnb_id_start
;
(
gnb_id
<
gnb_id_end
)
;
gnb_id
++
)
{
{
s1ap_register_enb_req_t
*
s1ap_register_gNB
;
//Type Temporarily reuse
//
s1ap_register_enb_req_t *s1ap_register_gNB; //Type Temporarily reuse
// note: there is an implicit relationship between the data structure and the message name
/*msg_p = itti_alloc_new_message (TASK_GNB_APP, S1AP_REGISTER_ENB_REQ); //Message Temporarily reuse
...
...
openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c
View file @
923b3b07
...
...
@@ -130,6 +130,7 @@ int8_t nr_get_DELTA_PREAMBLE(module_id_t mod_id, int CC_id, uint16_t prach_forma
AssertFatal
(
1
==
0
,
"[UE %d] ue_procedures.c: FATAL, Illegal preambleFormat %d, prachConfigIndex %d
\n
"
,
mod_id
,
prach_format
,
prachConfigIndex
);
}
}
return
0
;
}
/* TS 38.321 subclause 5.1.3 - RA preamble transmission - ra_PREAMBLE_RECEIVED_TARGET_POWER configuration */
...
...
@@ -149,4 +150,4 @@ int nr_get_Po_NOMINAL_PUSCH(NR_PRACH_RESOURCES_t *prach_resources, module_id_t m
receivedTargerPower
=
preambleReceivedTargetPower
+
delta_preamble
+
(
mac
->
RA_PREAMBLE_POWER_RAMPING_COUNTER
-
1
)
*
prach_resources
->
RA_PREAMBLE_POWER_RAMPING_STEP
;
return
receivedTargerPower
;
}
\ No newline at end of file
}
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
923b3b07
...
...
@@ -88,7 +88,7 @@ void nr_get_prach_resources(module_id_t mod_id,
// NR_BeamFailureRecoveryConfig_t *beam_failure_recovery_config = &mac->RA_BeamFailureRecoveryConfig; // todo
int
messagePowerOffsetGroupB
=
0
,
messageSizeGroupA
,
PLThreshold
,
sizeOfRA_PreamblesGroupA
,
numberOfRA_Preambles
,
i
,
deltaPreamble_Msg3
=
0
;
int
messagePowerOffsetGroupB
=
0
,
messageSizeGroupA
,
PLThreshold
,
sizeOfRA_PreamblesGroupA
=
0
,
numberOfRA_Preambles
,
i
,
deltaPreamble_Msg3
=
0
;
uint8_t
noGroupB
=
0
,
s_id
,
f_id
,
ul_carrier_id
,
prach_ConfigIndex
,
SFN_nbr
,
Msg3_size
;
AssertFatal
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
!=
NULL
,
"[UE %d] FATAL nr_rach_ConfigCommon is NULL !!!
\n
"
,
mod_id
);
...
...
@@ -344,14 +344,15 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
mod_id
);
uint8_t
mac_sdus
[
MAX_NR_ULSCH_PAYLOAD_BYTES
];
uint8_t
lcid
=
UL_SCH_LCID_CCCH_MSG3
,
*
payload
,
ra_ResponseWindow
;
uint8_t
lcid
=
UL_SCH_LCID_CCCH_MSG3
,
*
payload
;
//uint8_t ra_ResponseWindow;
uint16_t
size_sdu
=
0
;
unsigned
short
post_padding
;
fapi_nr_config_request_t
*
cfg
=
&
mac
->
phy_config
.
config_req
;
//
fapi_nr_config_request_t *cfg = &mac->phy_config.config_req;
NR_ServingCellConfigCommon_t
*
scc
=
mac
->
scc
;
NR_RACH_ConfigCommon_t
*
setup
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
;
NR_RACH_ConfigGeneric_t
*
rach_ConfigGeneric
=
&
setup
->
rach_ConfigGeneric
;
NR_FrequencyInfoDL_t
*
frequencyInfoDL
=
scc
->
downlinkConfigCommon
->
frequencyInfoDL
;
//
NR_FrequencyInfoDL_t *frequencyInfoDL = scc->downlinkConfigCommon->frequencyInfoDL;
NR_RACH_ConfigDedicated_t
*
rach_ConfigDedicated
=
mac
->
rach_ConfigDedicated
;
// int32_t frame_diff = 0;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
View file @
923b3b07
...
...
@@ -157,7 +157,7 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
if
(
mac
->
crnti
>
0
)
{
NR_SearchSpace_t
*
css
;
NR_SearchSpace_t
*
uss
;
NR_SearchSpace_t
*
uss
=
NULL
;
NR_ServingCellConfigCommon_t
*
scc
;
NR_SearchSpaceId_t
ra_SearchSpaceId
;
rel15
=
&
dl_config
->
dl_config_list
[
dl_config
->
number_pdus
].
dci_config_pdu
.
dci_config_rel15
;
...
...
openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
View file @
923b3b07
...
...
@@ -105,7 +105,7 @@ uint16_t nr_ue_process_rar(module_id_t mod_id,
NR_MAC_RAR
*
rar
=
(
NR_MAC_RAR
*
)
(
dlsch_buffer
+
1
);
// RAR subPDU pointer
uint8_t
n_subPDUs
=
0
;
// number of RAR payloads
uint8_t
n_subheaders
=
0
;
// number of MAC RAR subheaders
uint8_t
best_rx_rapid
=
-
1
;
// the closest RAPID receive from all RARs
//
uint8_t best_rx_rapid = -1; // the closest RAPID receive from all RARs
unsigned
char
freq_hopping
,
msg3_t_alloc
,
mcs
,
tpc_command
,
csi_req
;
uint16_t
ta_command
=
0
,
msg3_f_alloc
,
bwp_size
;
int
f_alloc
,
mask
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
923b3b07
...
...
@@ -219,7 +219,7 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
// slot and frame limit to transmit msg2 according to response window
uint8_t
slot_limit
=
(
rach_slot
+
slot_window
)
%
nr_slots_per_frame
[
mu
];
uint8_t
frame_limit
=
(
slot_limit
>
(
rach_slot
))
?
rach_frame
:
(
rach_frame
+
1
);
//
uint8_t frame_limit = (slot_limit>(rach_slot))? rach_frame : (rach_frame +1);
// go to previous slot if the current scheduled slot is beyond the response window
// and if the slot is not among the PDCCH monitored ones (38.213 10.1)
...
...
@@ -762,7 +762,8 @@ void nr_fill_rar(uint8_t Mod_idP,
NR_RA_HEADER_RAPID
*
rarh
=
(
NR_RA_HEADER_RAPID
*
)
dlsch_buffer
;
NR_MAC_RAR
*
rar
=
(
NR_MAC_RAR
*
)
(
dlsch_buffer
+
1
);
unsigned
char
csi_req
=
0
,
tpc_command
;
uint8_t
N_UL_Hop
,
valid_bits
;
//uint8_t N_UL_Hop;
uint8_t
valid_bits
;
uint32_t
ul_grant
;
uint16_t
f_alloc
,
prb_alloc
,
bwp_size
,
truncation
=
0
;
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
923b3b07
...
...
@@ -118,7 +118,7 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
if
(
is_nr_UL_slot
(
mac
->
scc
,
ul_info
->
slot_tx
)
&&
get_softmodem_params
()
->
do_ra
){
nr_ue_prach_scheduler
(
module_id
,
ul_info
->
frame_tx
,
ul_info
->
slot_tx
);
if
(
mac
->
generate_nr_prach
){
uint16_t
monitoring_slot_period
,
monitoring_offset
;
//
uint16_t monitoring_slot_period, monitoring_offset;
uint16_t
rach_frame
=
mac
->
scheduled_response
.
ul_config
->
sfn
;
uint16_t
rx_rach_frame
=
(
rach_frame
+
mac
->
RA_offset
)
%
MAX_FRAME_NUMBER
;
// compensate 2 frames offset delay at gNB side
uint16_t
rach_slot
=
mac
->
scheduled_response
.
ul_config
->
slot
;
...
...
@@ -244,8 +244,8 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
dl_info
->
rx_ind
=
NULL
;
dl_info
->
dci_ind
=
NULL
;
return
0
;
}
return
0
;
}
nr_ue_if_module_t
*
nr_ue_if_module_init
(
uint32_t
module_id
){
...
...
openair3/GTPV1-U/gtpv1u_gNB.c
View file @
923b3b07
...
...
@@ -129,14 +129,14 @@ NwGtpv1uRcT gtpv1u_gNB_process_stack_req(
case
NW_GTPV1U_ULP_API_RECV_TPDU
:
{
uint8_t
buffer
[
4096
];
uint32_t
buffer_len
;
uint16_t
msgType
=
NW_GTP_GPDU
;
NwGtpv1uMsgT
*
pMsg
=
NULL
;
//
uint16_t msgType = NW_GTP_GPDU;
//
NwGtpv1uMsgT *pMsg = NULL;
/* Nw-gptv1u stack has processed a PDU. we can schedule it to PDCP
* for transmission.
*/
teid
=
pUlpApi
->
apiInfo
.
recvMsgInfo
.
teid
;
pMsg
=
(
NwGtpv1uMsgT
*
)
pUlpApi
->
apiInfo
.
recvMsgInfo
.
hMsg
;
msgType
=
pMsg
->
msgType
;
//
pMsg = (NwGtpv1uMsgT *) pUlpApi->apiInfo.recvMsgInfo.hMsg;
//
msgType = pMsg->msgType;
if
(
NW_GTPV1U_OK
!=
nwGtpv1uMsgGetTpdu
(
pUlpApi
->
apiInfo
.
recvMsgInfo
.
hMsg
,
buffer
,
&
buffer_len
))
{
...
...
openair3/S1AP/s1ap_eNB_nas_procedures.c
View file @
923b3b07
...
...
@@ -1791,8 +1791,8 @@ int s1ap_eNB_generate_E_RAB_Modification_Indication(
S1AP_E_RABToBeModifiedItemBearerModInd_t
*
E_RAB_ToBeModifiedItem_BearerModInd
=
NULL
;
S1AP_E_RABToBeModifiedItemBearerModIndIEs_t
*
E_RAB_ToBeModifiedItem_BearerModInd_IEs
=
NULL
;
S1AP_E_RABNotToBeModifiedItemBearerModInd_t
*
E_RAB_NotToBeModifiedItem_BearerModInd
=
NULL
;
S1AP_E_RABNotToBeModifiedItemBearerModIndIEs_t
*
E_RAB_NotToBeModifiedItem_BearerModInd_IEs
=
NULL
;
//
S1AP_E_RABNotToBeModifiedItemBearerModInd_t *E_RAB_NotToBeModifiedItem_BearerModInd = NULL;
//
S1AP_E_RABNotToBeModifiedItemBearerModIndIEs_t *E_RAB_NotToBeModifiedItem_BearerModInd_IEs = NULL;
s1ap_eNB_instance_t
*
s1ap_eNB_instance_p
=
NULL
;
...
...
@@ -1804,10 +1804,10 @@ int s1ap_eNB_generate_E_RAB_Modification_Indication(
DevAssert
(
e_rab_modification_ind
!=
NULL
);
int
num_e_rabs_tobemodified
=
e_rab_modification_ind
->
nb_of_e_rabs_tobemodified
;
int
num_e_rabs_nottobemodified
=
e_rab_modification_ind
->
nb_of_e_rabs_nottobemodified
;
//
int num_e_rabs_nottobemodified = e_rab_modification_ind->nb_of_e_rabs_nottobemodified;
uint32_t
CSG_id
=
0
;
uint32_t
pseudo_gtp_teid
=
10
;
//
uint32_t CSG_id = 0;
//
uint32_t pseudo_gtp_teid = 10;
if
((
ue_context_p
=
s1ap_eNB_get_ue_context
(
s1ap_eNB_instance_p
,
e_rab_modification_ind
->
eNB_ue_s1ap_id
))
==
NULL
)
{
...
...
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