Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
oai
openairinterface5G
Commits
3f2df9bb
Commit
3f2df9bb
authored
7 years ago
by
Younes Khadraoui
Browse files
Options
Downloads
Patches
Plain Diff
added some members to RU_proc, RU_struct, other type of msg and states for RU
parent
242beed0
No related branches found
No related tags found
4 merge requests
!650
Release v1.1.0 Candidate
,
!617
Develop: Integration 2019 Week 25
,
!588
Develop nr merge
,
!576
Multi-RU support and OTA Synch/Calibration for TDD
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
openair1/PHY/defs.h
+23
-1
23 additions, 1 deletion
openair1/PHY/defs.h
with
23 additions
and
1 deletion
openair1/PHY/defs.h
+
23
−
1
View file @
3f2df9bb
...
@@ -332,8 +332,12 @@ typedef struct RU_proc_t_s {
...
@@ -332,8 +332,12 @@ typedef struct RU_proc_t_s {
int
instance_cnt_fep
;
int
instance_cnt_fep
;
/// \internal This variable is protected by \ref mutex_fep
/// \internal This variable is protected by \ref mutex_fep
int
instance_cnt_feptx
;
int
instance_cnt_feptx
;
/// \internal This variable is protected by \ref mutex_ru_thread
int
instance_cnt_ru
;
/// pthread structure for RU FH processing thread
/// pthread structure for RU FH processing thread
pthread_t
pthread_FH
;
pthread_t
pthread_FH
;
/// pthread structure for RU control thread
pthread_t
pthread_ctrl
;
/// pthread structure for RU prach processing thread
/// pthread structure for RU prach processing thread
pthread_t
pthread_prach
;
pthread_t
pthread_prach
;
#ifdef Rel14
#ifdef Rel14
...
@@ -354,6 +358,8 @@ typedef struct RU_proc_t_s {
...
@@ -354,6 +358,8 @@ typedef struct RU_proc_t_s {
int
first_tx
;
int
first_tx
;
/// pthread attributes for RU FH processing thread
/// pthread attributes for RU FH processing thread
pthread_attr_t
attr_FH
;
pthread_attr_t
attr_FH
;
/// pthread attributes for RU control thread
pthread_attr_t
attr_ctrl
;
/// pthread attributes for RU prach
/// pthread attributes for RU prach
pthread_attr_t
attr_prach
;
pthread_attr_t
attr_prach
;
#ifdef Rel14
#ifdef Rel14
...
@@ -398,6 +404,8 @@ typedef struct RU_proc_t_s {
...
@@ -398,6 +404,8 @@ typedef struct RU_proc_t_s {
pthread_cond_t
cond_feptx
;
pthread_cond_t
cond_feptx
;
/// condition variable for eNB signal
/// condition variable for eNB signal
pthread_cond_t
cond_eNBs
;
pthread_cond_t
cond_eNBs
;
/// condition variable for ru_thread
pthread_cond_t
cond_ru_thread
;
/// mutex for RU FH
/// mutex for RU FH
pthread_mutex_t
mutex_FH
;
pthread_mutex_t
mutex_FH
;
/// mutex for RU prach
/// mutex for RU prach
...
@@ -416,6 +424,8 @@ typedef struct RU_proc_t_s {
...
@@ -416,6 +424,8 @@ typedef struct RU_proc_t_s {
pthread_mutex_t
mutex_fep
;
pthread_mutex_t
mutex_fep
;
/// mutex for fep TX worker thread
/// mutex for fep TX worker thread
pthread_mutex_t
mutex_feptx
;
pthread_mutex_t
mutex_feptx
;
/// mutex for ru_thread
pthread_mutex_t
mutex_ru_thread
;
/// symbol mask for IF4p5 reception per subframe
/// symbol mask for IF4p5 reception per subframe
uint32_t
symbol_mask
[
10
];
uint32_t
symbol_mask
[
10
];
/// number of slave threads
/// number of slave threads
...
@@ -773,6 +783,8 @@ typedef struct RU_t_s{
...
@@ -773,6 +783,8 @@ typedef struct RU_t_s{
uint8_t
seqno
;
uint8_t
seqno
;
/// initial timestamp used as an offset make first real timestamp 0
/// initial timestamp used as an offset make first real timestamp 0
openair0_timestamp
ts_offset
;
openair0_timestamp
ts_offset
;
/// Current state of the RU
rru_state_t
state
;
/// process scheduling variables
/// process scheduling variables
RU_proc_t
proc
;
RU_proc_t
proc
;
/// stats thread pthread descriptor
/// stats thread pthread descriptor
...
@@ -1457,9 +1469,19 @@ typedef enum {
...
@@ -1457,9 +1469,19 @@ typedef enum {
RAU_tick
=
0
,
RAU_tick
=
0
,
RRU_capabilities
=
1
,
RRU_capabilities
=
1
,
RRU_config
=
2
,
RRU_config
=
2
,
RRU_MSG_max_num
=
3
RRU_MSG_max_num
=
3
,
RRU_config_ok
=
4
,
RRU_start
=
5
,
RRU_stop
=
6
}
rru_config_msg_type_t
;
}
rru_config_msg_type_t
;
typedef
enum
{
RU_IDLE
=
0
,
RU_CONFIG
=
1
,
RU_READY
=
2
,
RU_RUN
=
3
}
rru_state_t
;
typedef
struct
RRU_CONFIG_msg_s
{
typedef
struct
RRU_CONFIG_msg_s
{
rru_config_msg_type_t
type
;
rru_config_msg_type_t
type
;
ssize_t
len
;
ssize_t
len
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment