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
864e594e
Commit
864e594e
authored
Jul 11, 2020
by
Andrew Burger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed logging to speed up system
parent
9a8880fd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
openair2/LAYER2/MAC/ra_procedures.c
openair2/LAYER2/MAC/ra_procedures.c
+4
-4
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+1
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+3
-3
No files found.
openair2/LAYER2/MAC/ra_procedures.c
View file @
864e594e
...
@@ -289,7 +289,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
...
@@ -289,7 +289,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
uint8_t
Size
=
0
;
uint8_t
Size
=
0
;
UE_MODE_t
UE_mode
;
UE_MODE_t
UE_mode
;
LOG_
E
(
MAC
,
"got inside ue_get_rach
\n
"
);
LOG_
D
(
MAC
,
"got inside ue_get_rach
\n
"
);
// Modification for phy_stub_ue operation
// Modification for phy_stub_ue operation
if
(
NFAPI_MODE
==
NFAPI_UE_STUB_PNF
||
NFAPI_MODE
==
NFAPI_MODE_STANDALONE_PNF
)
{
// phy_stub_ue mode
if
(
NFAPI_MODE
==
NFAPI_UE_STUB_PNF
||
NFAPI_MODE
==
NFAPI_MODE_STANDALONE_PNF
)
{
// phy_stub_ue mode
...
@@ -322,7 +322,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
...
@@ -322,7 +322,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
}
}
if
(
UE_mac_inst
[
module_idP
].
RA_active
==
0
)
{
if
(
UE_mac_inst
[
module_idP
].
RA_active
==
0
)
{
LOG_
I
(
MAC
,
"RA not active
\n
"
);
LOG_
D
(
MAC
,
"RA not active
\n
"
);
// check if RRC is ready to initiate the RA procedure
// check if RRC is ready to initiate the RA procedure
Size
=
mac_rrc_data_req_ue
(
module_idP
,
Size
=
mac_rrc_data_req_ue
(
module_idP
,
CC_id
,
CC_id
,
...
@@ -335,10 +335,10 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
...
@@ -335,10 +335,10 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
0
);
0
);
Size16
=
(
uint16_t
)
Size
;
Size16
=
(
uint16_t
)
Size
;
// LOG_D(MAC,"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes\n",module_idP,frameP,Size);
// LOG_D(MAC,"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes\n",module_idP,frameP,Size);
LOG_
I
(
RRC
,
LOG_
D
(
RRC
,
"[MSC_MSG][FRAME %05d][RRC_UE][MOD %02d][][--- MAC_DATA_REQ (RRCConnectionRequest eNB %d) --->][MAC_UE][MOD %02d][]
\n
"
,
"[MSC_MSG][FRAME %05d][RRC_UE][MOD %02d][][--- MAC_DATA_REQ (RRCConnectionRequest eNB %d) --->][MAC_UE][MOD %02d][]
\n
"
,
frameP
,
module_idP
,
eNB_indexP
,
module_idP
);
frameP
,
module_idP
,
eNB_indexP
,
module_idP
);
LOG_
I
(
MAC
,
LOG_
D
(
MAC
,
"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes
\n
"
,
"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes
\n
"
,
module_idP
,
frameP
,
Size
);
module_idP
,
frameP
,
Size
);
...
...
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
864e594e
...
@@ -233,7 +233,7 @@ void fill_rach_indication_UE_MAC(int Mod_id,
...
@@ -233,7 +233,7 @@ void fill_rach_indication_UE_MAC(int Mod_id,
.
preamble_rel13
.
rach_resource_type
=
0
;
.
preamble_rel13
.
rach_resource_type
=
0
;
UL_INFO
->
rach_ind
.
rach_indication_body
.
preamble_list
[
0
].
instance_length
=
0
;
UL_INFO
->
rach_ind
.
rach_indication_body
.
preamble_list
[
0
].
instance_length
=
0
;
LOG_
I
(
PHY
,
LOG_
D
(
PHY
,
"UE Filling NFAPI indication for RACH : TA %d, Preamble %d, rnti %x, "
"UE Filling NFAPI indication for RACH : TA %d, Preamble %d, rnti %x, "
"rach_resource_type %d
\n
"
,
"rach_resource_type %d
\n
"
,
UL_INFO
->
rach_ind
.
rach_indication_body
.
preamble_list
[
0
]
UL_INFO
->
rach_ind
.
rach_indication_body
.
preamble_list
[
0
]
...
...
targets/RT/USER/lte-ue.c
View file @
864e594e
...
@@ -1150,7 +1150,7 @@ static void *UE_phy_stub_standalone_pnf_task(void *arg)
...
@@ -1150,7 +1150,7 @@ static void *UE_phy_stub_standalone_pnf_task(void *arg)
#endif
#endif
int
rx_frame
=
proc
->
subframe_tx
<
4
?
(
proc
->
frame_tx
+
1023
)
%
1024
:
proc
->
frame_tx
;
// subtracting 4 from subframe_tx
int
rx_frame
=
proc
->
subframe_tx
<
4
?
(
proc
->
frame_tx
+
1023
)
%
1024
:
proc
->
frame_tx
;
// subtracting 4 from subframe_tx
int
rx_subframe
=
proc
->
subframe_tx
<
4
?
proc
->
subframe_tx
+
6
:
proc
->
subframe_tx
-
4
;
int
rx_subframe
=
proc
->
subframe_tx
<
4
?
proc
->
subframe_tx
+
6
:
proc
->
subframe_tx
-
4
;
LOG_
E
(
MAC
,
"rx_frame %d rx_subframe %d
\n
"
,
rx_frame
,
rx_subframe
);
LOG_
D
(
MAC
,
"rx_frame %d rx_subframe %d
\n
"
,
rx_frame
,
rx_subframe
);
if
(
UE
->
mac_enabled
==
1
)
{
if
(
UE
->
mac_enabled
==
1
)
{
ret
=
ue_scheduler
(
ue_Mod_id
,
ret
=
ue_scheduler
(
ue_Mod_id
,
rx_frame
,
rx_frame
,
...
@@ -1185,10 +1185,10 @@ static void *UE_phy_stub_standalone_pnf_task(void *arg)
...
@@ -1185,10 +1185,10 @@ static void *UE_phy_stub_standalone_pnf_task(void *arg)
// The one working strangely...
// The one working strangely...
//if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx && Mod_id == (module_id_t) init_ra_UE) ) {
//if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx && Mod_id == (module_id_t) init_ra_UE) ) {
PRACH_RESOURCES_t
*
prach_resources
=
ue_get_rach
(
ue_Mod_id
,
0
,
proc
->
frame_tx
,
0
,
proc
->
subframe_tx
);
PRACH_RESOURCES_t
*
prach_resources
=
ue_get_rach
(
ue_Mod_id
,
0
,
proc
->
frame_tx
,
0
,
proc
->
subframe_tx
);
LOG_
I
(
MAC
,
"Celtics prach_resources %p
\n
"
,
prach_resources
);
LOG_
D
(
MAC
,
"Celtics prach_resources %p
\n
"
,
prach_resources
);
if
(
prach_resources
!=
NULL
)
{
if
(
prach_resources
!=
NULL
)
{
UE_mac_inst
[
ue_Mod_id
].
ra_frame
=
proc
->
frame_rx
;
UE_mac_inst
[
ue_Mod_id
].
ra_frame
=
proc
->
frame_rx
;
LOG_
I
(
MAC
,
"UE_phy_stub_thread_rxn_txnp4 before RACH, Mod_id: %d frame %d subframe %d
\n
"
,
ue_Mod_id
,
proc
->
frame_tx
,
proc
->
subframe_tx
);
LOG_
D
(
MAC
,
"UE_phy_stub_thread_rxn_txnp4 before RACH, Mod_id: %d frame %d subframe %d
\n
"
,
ue_Mod_id
,
proc
->
frame_tx
,
proc
->
subframe_tx
);
fill_rach_indication_UE_MAC
(
ue_Mod_id
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
UL_INFO
,
prach_resources
->
ra_PreambleIndex
,
prach_resources
->
ra_RNTI
);
fill_rach_indication_UE_MAC
(
ue_Mod_id
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
UL_INFO
,
prach_resources
->
ra_PreambleIndex
,
prach_resources
->
ra_RNTI
);
sent_any
=
true
;
sent_any
=
true
;
Msg1_transmitted
(
ue_Mod_id
,
0
,
proc
->
frame_tx
,
0
);
Msg1_transmitted
(
ue_Mod_id
,
0
,
proc
->
frame_tx
,
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