Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
6ac85cde
Commit
6ac85cde
authored
Sep 30, 2016
by
Laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small update
parent
8cc8c2d9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
7 deletions
+36
-7
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-1
openair1/PHY/defs.h
openair1/PHY/defs.h
+12
-1
openair1/PHY/extern.h
openair1/PHY/extern.h
+7
-1
openair1/PHY/impl_defs_lte.h
openair1/PHY/impl_defs_lte.h
+8
-2
openair2/X2AP/x2ap_common.h
openair2/X2AP/x2ap_common.h
+2
-0
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+6
-2
No files found.
cmake_targets/CMakeLists.txt
View file @
6ac85cde
...
@@ -881,7 +881,7 @@ set(UTIL_SRC
...
@@ -881,7 +881,7 @@ set(UTIL_SRC
${
OPENAIR2_DIR
}
/UTIL/OMG/job.c
${
OPENAIR2_DIR
}
/UTIL/OMG/job.c
${
OPENAIR2_DIR
}
/UTIL/OMG/mobility_parser.c
${
OPENAIR2_DIR
}
/UTIL/OMG/mobility_parser.c
${
OPENAIR2_DIR
}
/UTIL/OMG/omg.c
${
OPENAIR2_DIR
}
/UTIL/OMG/omg.c
${
OPENAIR2_DIR
}
/UTIL/OMG/omg_hashtable.c
#
${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c
${
OPENAIR2_DIR
}
/UTIL/OMG/rwalk.c
${
OPENAIR2_DIR
}
/UTIL/OMG/rwalk.c
${
OPENAIR2_DIR
}
/UTIL/OMG/rwp.c
${
OPENAIR2_DIR
}
/UTIL/OMG/rwp.c
${
OPENAIR2_DIR
}
/UTIL/OMG/socket_traci_OMG.c
${
OPENAIR2_DIR
}
/UTIL/OMG/socket_traci_OMG.c
...
...
openair1/PHY/defs.h
View file @
6ac85cde
...
@@ -53,6 +53,11 @@
...
@@ -53,6 +53,11 @@
# define msg mexPrintf
# define msg mexPrintf
#else
#else
# ifdef OPENAIR2
# ifdef OPENAIR2
# if ENABLE_RAL
# include "collection/hashtable/hashtable.h"
# include "COMMON/ral_messages_types.h"
# include "UTIL/queue.h"
# endif
# include "log.h"
# include "log.h"
# define msg(aRGS...) LOG_D(PHY, ##aRGS)
# define msg(aRGS...) LOG_D(PHY, ##aRGS)
# else
# else
...
@@ -127,6 +132,8 @@ static inline void* malloc16_clear( size_t size )
...
@@ -127,6 +132,8 @@ static inline void* malloc16_clear( size_t size )
#include "PHY/TOOLS/defs.h"
#include "PHY/TOOLS/defs.h"
#include "platform_types.h"
#include "platform_types.h"
#ifdef OPENAIR_LTE
#include "PHY/LTE_TRANSPORT/defs.h"
#include "PHY/LTE_TRANSPORT/defs.h"
#include <pthread.h>
#include <pthread.h>
...
@@ -138,6 +145,9 @@ static inline void* malloc16_clear( size_t size )
...
@@ -138,6 +145,9 @@ static inline void* malloc16_clear( size_t size )
#define NB_BANDS_MAX 8
#define NB_BANDS_MAX 8
#ifdef OCP_FRAMEWORK
#include <enums.h>
#else
typedef
enum
{
normal_txrx
=
0
,
rx_calib_ue
=
1
,
rx_calib_ue_med
=
2
,
rx_calib_ue_byp
=
3
,
debug_prach
=
4
,
no_L2_connect
=
5
,
calib_prach_tx
=
6
,
rx_dump_frame
=
7
,
loop_through_memory
=
8
}
runmode_t
;
typedef
enum
{
normal_txrx
=
0
,
rx_calib_ue
=
1
,
rx_calib_ue_med
=
2
,
rx_calib_ue_byp
=
3
,
debug_prach
=
4
,
no_L2_connect
=
5
,
calib_prach_tx
=
6
,
rx_dump_frame
=
7
,
loop_through_memory
=
8
}
runmode_t
;
enum
transmission_access_mode
{
enum
transmission_access_mode
{
...
@@ -161,6 +171,7 @@ typedef enum {
...
@@ -161,6 +171,7 @@ typedef enum {
synch_to_ext_device
=
0
,
// synch to RF or Ethernet device
synch_to_ext_device
=
0
,
// synch to RF or Ethernet device
synch_to_other
// synch to another source (timer, other CC_id)
synch_to_other
// synch to another source (timer, other CC_id)
}
eNB_timing_t
;
}
eNB_timing_t
;
#endif
typedef
struct
UE_SCAN_INFO_s
{
typedef
struct
UE_SCAN_INFO_s
{
/// 10 best amplitudes (linear) for each pss signals
/// 10 best amplitudes (linear) for each pss signals
...
@@ -837,5 +848,5 @@ typedef struct {
...
@@ -837,5 +848,5 @@ typedef struct {
#include "PHY/LTE_ESTIMATION/defs.h"
#include "PHY/LTE_ESTIMATION/defs.h"
#include "SIMULATION/ETH_TRANSPORT/defs.h"
#include "SIMULATION/ETH_TRANSPORT/defs.h"
#endif
#endif // __PHY_DEFS__H__
#endif // __PHY_DEFS__H__
openair1/PHY/extern.h
View file @
6ac85cde
...
@@ -47,11 +47,17 @@ extern int number_of_cards;
...
@@ -47,11 +47,17 @@ extern int number_of_cards;
//extern PHY_CONFIG *PHY_config;
//extern PHY_CONFIG *PHY_config;
//extern PHY_VARS *PHY_vars;
//extern PHY_VARS *PHY_vars;
#ifndef OCP_FRAMEWORK
extern
PHY_VARS_UE
***
PHY_vars_UE_g
;
extern
PHY_VARS_UE
***
PHY_vars_UE_g
;
extern
PHY_VARS_eNB
***
PHY_vars_eNB_g
;
extern
PHY_VARS_eNB
***
PHY_vars_eNB_g
;
extern
PHY_VARS_RN
**
PHY_vars_RN_g
;
extern
PHY_VARS_RN
**
PHY_vars_RN_g
;
extern
LTE_DL_FRAME_PARMS
*
lte_frame_parms_g
;
extern
LTE_DL_FRAME_PARMS
*
lte_frame_parms_g
;
#else
#define MAX_UE 10
#define MAX_eNB 20
extern
PHY_VARS_UE
*
PHY_vars_UE_g
[
MAX_UE
][
MAX_NUM_CCs
];
extern
PHY_VARS_eNB
*
PHY_vars_eNB_g
[
MAX_eNB
][
MAX_NUM_CCs
];
#endif
extern
MAC_xface
*
mac_xface
;
extern
MAC_xface
*
mac_xface
;
...
...
openair1/PHY/impl_defs_lte.h
View file @
6ac85cde
...
@@ -62,7 +62,9 @@
...
@@ -62,7 +62,9 @@
#define MAX_MBSFN_AREA 8
#define MAX_MBSFN_AREA 8
#ifdef OCP_FRAMEWORK
#include "enums.h"
#else
typedef
enum
{
TDD
=
1
,
FDD
=
0
}
lte_frame_type_t
;
typedef
enum
{
TDD
=
1
,
FDD
=
0
}
lte_frame_type_t
;
typedef
enum
{
EXTENDED
=
1
,
NORMAL
=
0
}
lte_prefix_type_t
;
typedef
enum
{
EXTENDED
=
1
,
NORMAL
=
0
}
lte_prefix_type_t
;
...
@@ -82,7 +84,7 @@ typedef enum {
...
@@ -82,7 +84,7 @@ typedef enum {
one
=
6
,
one
=
6
,
two
=
12
two
=
12
}
PHICH_RESOURCE_t
;
}
PHICH_RESOURCE_t
;
#endif
/// PHICH-Config from 36.331 RRC spec
/// PHICH-Config from 36.331 RRC spec
typedef
struct
{
typedef
struct
{
/// Parameter: PHICH-Duration, see TS 36.211 (Table 6.9.3-1).
/// Parameter: PHICH-Duration, see TS 36.211 (Table 6.9.3-1).
...
@@ -169,10 +171,12 @@ typedef struct {
...
@@ -169,10 +171,12 @@ typedef struct {
}
UL_REFERENCE_SIGNALS_PUSCH_t
;
}
UL_REFERENCE_SIGNALS_PUSCH_t
;
/// Enumeration for parameter Hopping-mode \ref PUSCH_CONFIG_COMMON::hoppingMode.
/// Enumeration for parameter Hopping-mode \ref PUSCH_CONFIG_COMMON::hoppingMode.
#ifndef OCP_FRAMEWORK
typedef
enum
{
typedef
enum
{
interSubFrame
=
0
,
interSubFrame
=
0
,
intraAndInterSubFrame
=
1
intraAndInterSubFrame
=
1
}
PUSCH_HOPPING_t
;
}
PUSCH_HOPPING_t
;
#endif
/// PUSCH-ConfigCommon from 36.331 RRC spec.
/// PUSCH-ConfigCommon from 36.331 RRC spec.
typedef
struct
{
typedef
struct
{
...
@@ -337,6 +341,7 @@ typedef struct {
...
@@ -337,6 +341,7 @@ typedef struct {
uint8_t
filterCoefficient
;
uint8_t
filterCoefficient
;
}
UL_POWER_CONTROL_DEDICATED
;
}
UL_POWER_CONTROL_DEDICATED
;
#ifndef OCP_FRAMEWORK
/// Enumeration for parameter \f$\alpha\f$ \ref UL_POWER_CONTROL_CONFIG_COMMON::alpha.
/// Enumeration for parameter \f$\alpha\f$ \ref UL_POWER_CONTROL_CONFIG_COMMON::alpha.
typedef
enum
{
typedef
enum
{
al0
=
0
,
al0
=
0
,
...
@@ -348,6 +353,7 @@ typedef enum {
...
@@ -348,6 +353,7 @@ typedef enum {
al09
=
6
,
al09
=
6
,
al1
=
7
al1
=
7
}
PUSCH_alpha_t
;
}
PUSCH_alpha_t
;
#endif
/// \note UNUSED
/// \note UNUSED
typedef
enum
{
typedef
enum
{
...
...
openair2/X2AP/x2ap_common.h
View file @
6ac85cde
...
@@ -290,8 +290,10 @@
...
@@ -290,8 +290,10 @@
# define X2AP_PORT 36422
# define X2AP_PORT 36422
#endif
#endif
#ifndef TRUE
#define TRUE 1
#define TRUE 1
#define FALSE 0
#define FALSE 0
#endif
extern
int
asn_debug
;
extern
int
asn_debug
;
extern
int
asn1_xer_print
;
extern
int
asn1_xer_print
;
...
...
targets/RT/USER/lte-enb.c
View file @
6ac85cde
...
@@ -190,10 +190,10 @@ static inline void thread_top_init(char *thread_name,
...
@@ -190,10 +190,10 @@ static inline void thread_top_init(char *thread_name,
if
(
sched_setattr
(
0
,
&
attr
,
flags
)
<
0
)
{
if
(
sched_setattr
(
0
,
&
attr
,
flags
)
<
0
)
{
perror
(
"[SCHED] eNB tx thread: sched_setattr failed
\n
"
);
perror
(
"[SCHED] eNB tx thread: sched_setattr failed
\n
"
);
exit
_fun
(
"Error setting deadline scheduler"
);
exit
(
1
);
}
}
LOG_I
(
HW
,
"[SCHED] eNB
%s deadline thread (TID %ld) started on CPU %d
\n
"
,
gettid
(),
thread_name
,
sched_getcpu
()
);
LOG_I
(
HW
,
"[SCHED] eNB
RXn-TXnp4 deadline thread (TID %ld) started on CPU %d
\n
"
,
gettid
(),
sched_getcpu
()
);
#else //LOW_LATENCY
#else //LOW_LATENCY
int
policy
,
s
,
j
;
int
policy
,
s
,
j
;
...
@@ -1352,7 +1352,9 @@ void init_eNB_proc(int inst) {
...
@@ -1352,7 +1352,9 @@ void init_eNB_proc(int inst) {
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
eNB
=
PHY_vars_eNB_g
[
inst
][
CC_id
];
eNB
=
PHY_vars_eNB_g
[
inst
][
CC_id
];
#ifndef OCP_FRAMEWORK
LOG_I
(
PHY
,
"Initializing eNB %d CC_id %d (%s,%s),
\n
"
,
inst
,
CC_id
,
eNB_functions
[
eNB
->
node_function
],
eNB_timing
[
eNB
->
node_timing
]);
LOG_I
(
PHY
,
"Initializing eNB %d CC_id %d (%s,%s),
\n
"
,
inst
,
CC_id
,
eNB_functions
[
eNB
->
node_function
],
eNB_timing
[
eNB
->
node_timing
]);
#endif
proc
=
&
eNB
->
proc
;
proc
=
&
eNB
->
proc
;
proc_rxtx
=
proc
->
proc_rxtx
;
proc_rxtx
=
proc
->
proc_rxtx
;
...
@@ -1625,7 +1627,9 @@ void init_eNB(eNB_func_t node_function[], eNB_timing_t node_timing[],int nb_inst
...
@@ -1625,7 +1627,9 @@ void init_eNB(eNB_func_t node_function[], eNB_timing_t node_timing[],int nb_inst
eNB
->
node_timing
=
node_timing
[
CC_id
];
eNB
->
node_timing
=
node_timing
[
CC_id
];
eNB
->
abstraction_flag
=
0
;
eNB
->
abstraction_flag
=
0
;
eNB
->
single_thread_flag
=
single_thread_flag
;
eNB
->
single_thread_flag
=
single_thread_flag
;
#ifndef OCP_FRAMEWORK
LOG_I
(
PHY
,
"Initializing eNB %d CC_id %d : (%s,%s)
\n
"
,
inst
,
CC_id
,
eNB_functions
[
node_function
[
CC_id
]],
eNB_timing
[
node_timing
[
CC_id
]]);
LOG_I
(
PHY
,
"Initializing eNB %d CC_id %d : (%s,%s)
\n
"
,
inst
,
CC_id
,
eNB_functions
[
node_function
[
CC_id
]],
eNB_timing
[
node_timing
[
CC_id
]]);
#endif
switch
(
node_function
[
CC_id
])
{
switch
(
node_function
[
CC_id
])
{
case
NGFI_RRU_IF5
:
case
NGFI_RRU_IF5
:
...
...
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