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
898d402a
Commit
898d402a
authored
Jun 10, 2020
by
Andrew Burger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trying to get oai sfnTo work
parent
e7eabf3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
39 deletions
+52
-39
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+49
-36
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+3
-3
No files found.
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
898d402a
...
@@ -1136,7 +1136,7 @@ int ue_init_standalone_socket(const char *addr, int port)
...
@@ -1136,7 +1136,7 @@ int ue_init_standalone_socket(const char *addr, int port)
void
*
ue_standalone_pnf_task
(
void
*
context
)
void
*
ue_standalone_pnf_task
(
void
*
context
)
{
{
uint16_t
sfn_sf
=
0
;
const
char
*
standalone_addr
=
"127.0.0.1"
;
const
char
*
standalone_addr
=
"127.0.0.1"
;
int
standalone_port
=
3289
;
int
standalone_port
=
3289
;
char
buffer
[
1024
];
char
buffer
[
1024
];
...
@@ -1152,51 +1152,64 @@ void *ue_standalone_pnf_task(void *context)
...
@@ -1152,51 +1152,64 @@ void *ue_standalone_pnf_task(void *context)
continue
;
continue
;
}
}
nfapi_p7_message_header_t
header
;
if
(
len
==
2
&&
len
>
0
)
if
(
nfapi_p7_message_header_unpack
((
void
*
)
buffer
,
len
,
&
header
,
sizeof
(
header
),
NULL
)
<
0
)
{
LOG_E
(
MAC
,
"Header unpack failed for standalone pnf
\n
"
);
continue
;
}
switch
(
header
.
message_id
)
{
case
NFAPI_DL_CONFIG_REQUEST
:
{
{
nfapi_dl_config_request_t
dl_config_req
;
memcpy
((
void
*
)
&
sfn_sf
,
buffer
,
sizeof
(
sfn_sf
));
if
(
nfapi_p7_message_unpack
((
void
*
)
buffer
,
len
,
&
dl_config_req
,
if
(
sfn_sf
%
300
==
0
)
sizeof
(
dl_config_req
),
NULL
)
<
0
)
{
{
LOG_E
(
MAC
,
"Message dl_config_req failed to unpack
\n
"
);
LOG_I
(
MAC
,
"Unpacked sfn_sf sf: %u sfn: %u
\n
"
,
NFAPI_SFNSF2SFN
(
sfn_sf
),
NFAPI_SFNSF2SF
(
sfn_sf
));
}
}
else
{
// check to see if dl_config_req is null
memcpy_dl_config_req
(
NULL
,
NULL
,
&
dl_config_req
);
}
break
;
}
}
case
NFAPI_TX_REQUEST
:
else
{
{
nfapi_tx_request_t
tx_req
;
nfapi_p7_message_header_t
header
;
// lock this tx_req
if
(
nfapi_p7_message_header_unpack
((
void
*
)
buffer
,
len
,
&
header
,
sizeof
(
header
),
NULL
)
<
0
)
if
(
nfapi_p7_message_unpack
((
void
*
)
buffer
,
len
,
&
tx_req
,
sizeof
(
tx_req
),
NULL
)
<
0
)
{
{
LOG_E
(
MAC
,
"Message tx_req failed to unpack
\n
"
);
LOG_E
(
MAC
,
"Header unpack failed for standalone pnf
\n
"
);
continue
;
}
}
else
switch
(
header
.
message_id
)
{
case
NFAPI_DL_CONFIG_REQUEST
:
{
{
// check to see if tx_req is null
nfapi_dl_config_request_t
dl_config_req
;
memcpy_tx_req
(
NULL
,
&
tx_req
);
if
(
nfapi_p7_message_unpack
((
void
*
)
buffer
,
len
,
&
dl_config_req
,
sizeof
(
dl_config_req
),
NULL
)
<
0
)
{
LOG_E
(
MAC
,
"Message dl_config_req failed to unpack
\n
"
);
}
else
{
// check to see if dl_config_req is null
memcpy_dl_config_req
(
NULL
,
NULL
,
&
dl_config_req
);
}
break
;
}
}
break
;
case
NFAPI_TX_REQUEST
:
}
{
case
NFAPI_HI_DCI0_REQUEST
:
nfapi_tx_request_t
tx_req
;
break
;
// lock this tx_req
if
(
nfapi_p7_message_unpack
((
void
*
)
buffer
,
len
,
&
tx_req
,
sizeof
(
tx_req
),
NULL
)
<
0
)
{
LOG_E
(
MAC
,
"Message tx_req failed to unpack
\n
"
);
}
else
{
// check to see if tx_req is null
memcpy_tx_req
(
NULL
,
&
tx_req
);
}
break
;
}
case
NFAPI_HI_DCI0_REQUEST
:
break
;
default:
default:
LOG_E
(
MAC
,
"Case Statement has no corresponding nfapi message
\n
"
);
LOG_E
(
MAC
,
"Case Statement has no corresponding nfapi message
\n
"
);
break
;
break
;
}
}
}
}
}
}
}
...
...
targets/RT/USER/lte-ue.c
View file @
898d402a
...
@@ -1288,9 +1288,9 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg)
...
@@ -1288,9 +1288,9 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg)
next_ra_frame
++
;
next_ra_frame
++
;
if
(
next_ra_frame
>
500
)
{
if
(
next_ra_frame
>
500
)
{
// check if we have PRACH opportunity
// check if we have PRACH opportunity
LOG_I
(
MAC
,
"is_prach_subframe: %d UE_mac_inst[ue_MOD_id].SI_Decoded: %u
\n
"
,
//
LOG_I(MAC, "is_prach_subframe: %d UE_mac_inst[ue_MOD_id].SI_Decoded: %u\n",
is_prach_subframe
(
&
UE
->
frame_parms
,
proc
->
frame_tx
,
proc
->
subframe_tx
),
//
is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx),
UE_mac_inst
[
ue_Mod_id
].
SI_Decoded
);
//
UE_mac_inst[ue_Mod_id].SI_Decoded);
if
(
is_prach_subframe
(
&
UE
->
frame_parms
,
proc
->
frame_tx
,
proc
->
subframe_tx
)
&&
UE_mac_inst
[
ue_Mod_id
].
SI_Decoded
==
1
)
{
if
(
is_prach_subframe
(
&
UE
->
frame_parms
,
proc
->
frame_tx
,
proc
->
subframe_tx
)
&&
UE_mac_inst
[
ue_Mod_id
].
SI_Decoded
==
1
)
{
// 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) ) {
...
...
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