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
2c8aab06
Commit
2c8aab06
authored
Feb 16, 2021
by
Melissa Elkadi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Included PHY channel parameter handling
Also, updated openairinterface5g_limits.h to match develop branch.
parent
17ede970
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
20 deletions
+28
-20
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+21
-1
openair2/PHY_INTERFACE/phy_stub_UE.h
openair2/PHY_INTERFACE/phy_stub_UE.h
+7
-0
targets/COMMON/openairinterface5g_limits.h
targets/COMMON/openairinterface5g_limits.h
+0
-19
No files found.
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
2c8aab06
...
...
@@ -1298,7 +1298,10 @@ void *ue_standalone_pnf_task(void *context)
LOG_E
(
MAC
,
"reading from standalone pnf sctp socket failed
\n
"
);
continue
;
}
/* First we'll check for possible messages from the proxy. We do this by checking
the length of the message. This works because sizeof(uint16_t) < sizeof(nfapi_p7_message_header_t)
and sizeof(phy_channel_params_t) < sizeof(nfapi_p7_message_header_t) and
sizeof(uint16_t) != sizeof(phy_channel_params_t). */
if
(
len
==
sizeof
(
uint16_t
))
{
uint16_t
sfn_sf
=
0
;
...
...
@@ -1311,6 +1314,23 @@ void *ue_standalone_pnf_task(void *context)
abort
();
}
}
else
if
(
len
==
sizeof
(
phy_channel_params_t
))
{
phy_channel_params_t
ch_info
;
memcpy
(
&
ch_info
,
buffer
,
sizeof
(
phy_channel_params_t
));
current_sfn_sf
=
ch_info
.
sfn_sf
;
if
(
sem_post
(
&
sfn_semaphore
)
!=
0
)
{
LOG_E
(
MAC
,
"sem_post() error
\n
"
);
abort
();
}
uint16_t
sf
=
ch_info
.
sfn_sf
&
15
;
if
(
sf
>
10
&&
sf
<
0
)
{
LOG_E
(
MAC
,
"sf out of bounds, sfn: %d
\n
"
,
sf
);
abort
();
}
}
else
{
nfapi_p7_message_header_t
header
;
...
...
openair2/PHY_INTERFACE/phy_stub_UE.h
View file @
2c8aab06
...
...
@@ -97,6 +97,13 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
uint16_t
frame
,
uint8_t
subframe
,
uint8_t
srs_present
,
int
index
,
nfapi_ul_config_request_t
*
ul_config_req
);
typedef
struct
phy_channel_params_t
{
uint16_t
sfn_sf
;
float
sinr
;
// Incomplete, need all channel parameters
}
phy_channel_params_t
;
typedef
struct
nfapi_tx_req_pdu_list_t
{
int
num_pdus
;
/* number .pdus[] objects */
...
...
targets/COMMON/openairinterface5g_limits.h
View file @
2c8aab06
...
...
@@ -8,23 +8,11 @@
# define NUMBER_OF_NR_RU_MAX 2
# ifndef PHYSIM
# ifndef UE_EXPANSION
// TODO:L2 FAPI simulator.
// UESIM_EXPANSION is used to be same value of NUMBER_OF_UE_MAX
// in eNB and UE.
// now , if we use --mu option in UE, compiling error will occur.
// This problem will be fixed in the future.
# ifndef UESIM_EXPANSION
# define NUMBER_OF_UE_MAX 40
# define NUMBER_OF_NR_UE_MAX 4
# define NUMBER_OF_UCI_VARS_MAX 14
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_gNB_MAX 1
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UCI_VARS_MAX 256
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_gNB_MAX 3
# endif
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UCI_VARS_MAX 256
...
...
@@ -49,17 +37,10 @@ eNB process will exit because unexpected access happens.
Now some parts are using NUMBER_OF_UE_MAX
and the other are using MAX_MOBILES_PER_ENB in for-loop.
*/
# ifndef UESIM_EXPANSION
# define NUMBER_OF_UE_MAX 16
# define NUMBER_OF_UCI_VARS_MAX 56
# define NUMBER_OF_CONNECTED_eNB_MAX 3
# define NUMBER_OF_CONNECTED_gNB_MAX 3
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UCI_VARS_MAX 256
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_gNB_MAX 1
# endif
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UCI_VARS_MAX 256
...
...
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