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
29eb0719
Commit
29eb0719
authored
Jan 22, 2023
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed mac_IF_mutex
parent
69507efa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
11 deletions
+6
-11
executables/nr-ue.c
executables/nr-ue.c
+0
-6
openair1/PHY/defs_nr_UE.h
openair1/PHY/defs_nr_UE.h
+0
-1
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+0
-4
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+6
-0
No files found.
executables/nr-ue.c
View file @
29eb0719
...
...
@@ -581,9 +581,7 @@ void processSlotTX(void *arg) {
ul_indication
.
slot_tx
=
proc
->
nr_slot_tx
;
ul_indication
.
phy_data
=
&
phy_data
;
pthread_mutex_lock
(
&
UE
->
mac_IF_mutex
);
UE
->
if_inst
->
ul_indication
(
&
ul_indication
);
pthread_mutex_unlock
(
&
UE
->
mac_IF_mutex
);
stop_meas
(
&
UE
->
ue_ul_indication_stats
);
}
...
...
@@ -615,9 +613,7 @@ void UE_processing(void *arg) {
if
(
UE
->
if_inst
!=
NULL
&&
UE
->
if_inst
->
dl_indication
!=
NULL
)
{
nr_downlink_indication_t
dl_indication
;
nr_fill_dl_indication
(
&
dl_indication
,
NULL
,
NULL
,
proc
,
UE
,
&
phy_data
);
pthread_mutex_lock
(
&
UE
->
mac_IF_mutex
);
UE
->
if_inst
->
dl_indication
(
&
dl_indication
,
NULL
);
pthread_mutex_unlock
(
&
UE
->
mac_IF_mutex
);
}
uint64_t
a
=
rdtsc_oai
();
...
...
@@ -766,8 +762,6 @@ void *UE_thread(void *arg) {
notifiedFIFO_t
freeBlocks
;
initNotifiedFIFO_nothreadSafe
(
&
freeBlocks
);
pthread_mutex_init
(
&
UE
->
mac_IF_mutex
,
NULL
);
int
timing_advance
=
UE
->
timing_advance
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
0
);
...
...
openair1/PHY/defs_nr_UE.h
View file @
29eb0719
...
...
@@ -652,7 +652,6 @@ typedef struct {
void
*
phy_sim_pdsch_rxdataF_comp
;
void
*
phy_sim_pdsch_dl_ch_estimates
;
void
*
phy_sim_pdsch_dl_ch_estimates_ext
;
pthread_mutex_t
mac_IF_mutex
;
notifiedFIFO_t
phy_config_ind
;
}
PHY_VARS_NR_UE
;
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
29eb0719
...
...
@@ -538,9 +538,7 @@ int nr_ue_pdcch_procedures(PHY_VARS_NR_UE *ue,
// fill dl_indication message
nr_fill_dl_indication
(
&
dl_indication
,
&
dci_ind
,
NULL
,
proc
,
ue
,
phy_data
);
// send to mac
pthread_mutex_lock
(
&
ue
->
mac_IF_mutex
);
ue
->
if_inst
->
dl_indication
(
&
dl_indication
,
NULL
);
pthread_mutex_unlock
(
&
ue
->
mac_IF_mutex
);
stop_meas
(
&
ue
->
dlsch_rx_pdcch_stats
);
...
...
@@ -856,9 +854,7 @@ bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
}
// send to mac
if
(
ue
->
if_inst
&&
ue
->
if_inst
->
dl_indication
)
{
pthread_mutex_lock
(
&
ue
->
mac_IF_mutex
);
ue
->
if_inst
->
dl_indication
(
&
dl_indication
,
ul_time_alignment
);
pthread_mutex_unlock
(
&
ue
->
mac_IF_mutex
);
}
if
(
ue
->
mac_enabled
==
1
)
{
// TODO: move this from PHY to MAC layer!
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
29eb0719
...
...
@@ -66,6 +66,7 @@ queue_t nr_dl_tti_req_queue;
queue_t
nr_tx_req_queue
;
queue_t
nr_ul_dci_req_queue
;
queue_t
nr_ul_tti_req_queue
;
pthread_mutex_t
mac_IF_mutex
;
void
nrue_init_standalone_socket
(
int
tx_port
,
int
rx_port
)
{
...
...
@@ -1118,6 +1119,7 @@ void update_harq_status(module_id_t module_id, uint8_t harq_pid, uint8_t ack_nac
int
nr_ue_ul_indication
(
nr_uplink_indication_t
*
ul_info
){
pthread_mutex_lock
(
&
mac_IF_mutex
);
NR_UE_L2_STATE_t
ret
=
0
;
module_id_t
module_id
=
ul_info
->
module_id
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
...
...
@@ -1146,11 +1148,13 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
break
;
}
pthread_mutex_unlock
(
&
mac_IF_mutex
);
return
0
;
}
int
nr_ue_dl_indication
(
nr_downlink_indication_t
*
dl_info
,
NR_UL_TIME_ALIGNMENT_t
*
ul_time_alignment
){
pthread_mutex_lock
(
&
mac_IF_mutex
);
uint32_t
ret_mask
=
0x0
;
module_id_t
module_id
=
dl_info
->
module_id
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
...
...
@@ -1247,6 +1251,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
dl_info
->
rx_ind
=
NULL
;
}
}
pthread_mutex_unlock
(
&
mac_IF_mutex
);
return
0
;
}
...
...
@@ -1267,6 +1272,7 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id){
nr_ue_if_module_inst
[
module_id
]
->
dl_indication
=
nr_ue_dl_indication
;
nr_ue_if_module_inst
[
module_id
]
->
ul_indication
=
nr_ue_ul_indication
;
}
pthread_mutex_init
(
&
mac_IF_mutex
,
NULL
);
return
nr_ue_if_module_inst
[
module_id
];
}
...
...
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