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
zzha zzha
OpenXG-RAN
Commits
8c22204a
Commit
8c22204a
authored
Oct 02, 2017
by
frtabu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
temporary fix undefined symbols in telnet shared lib
parent
502e4509
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
30 deletions
+14
-30
common/utils/telnetsrv/CMakeLists.txt
common/utils/telnetsrv/CMakeLists.txt
+8
-2
common/utils/telnetsrv/telnetsrv_phycmd.c
common/utils/telnetsrv/telnetsrv_phycmd.c
+3
-26
common/utils/telnetsrv/telnetsrv_phycmd.h
common/utils/telnetsrv/telnetsrv_phycmd.h
+3
-2
No files found.
common/utils/telnetsrv/CMakeLists.txt
View file @
8c22204a
...
...
@@ -14,6 +14,7 @@ set(APPROOT ${OPENAIR_DIR}/common/utils/telnetsrv )
set
(
OPENAIR_BUILD_DIR $ENV{OPENAIR_DIR}/cmake_targets
)
set
(
OPENAIR1_DIR $ENV{OPENAIR1_DIR}
)
set
(
OPENAIR2_DIR $ENV{OPENAIR2_DIR}
)
set
(
OPENAIR3_DIR $ENV{OPENAIR3_DIR}
)
set
(
OPENAIR_PHY_DIR $ENV{OPENAIR1_DIR}/PHY
)
set
(
OPENAIR_TARGET_DIR $ENV{OPENAIR_DIR}/targets
)
set
(
OPENAIR_COMMONUTILS_DIR $ENV{OPENAIR_DIR}/common/utils
)
...
...
@@ -27,8 +28,13 @@ add_definitions (-DRel14 -DCMAKER -DENABLE_FXP -DENABLE_ITTI -DENABLE_NAS_UE_LO
add_compile_options
(
-fPIC -march=native -Ofast
)
include_directories
(
./
${
OPENAIR_COMMON_DIR
}
${
OPENAIR_DIR
}
${
OPENAIR1_DIR
}
${
OPENAIR2_DIR
}
${
OPENAIR2_COMMON_DIR
}
${
OPENAIR2_DIR
}
/UTIL/LOG
${
OPENAIR_COMMONUTILS_DIR
}
/msc
${
OPENAIR_COMMONUTILS_DIR
}
/itti
${
OPENAIR_ASN1INC
}
${
OPENAIR_TARGET_DIR
}
/COMMON
${
OPENAIR_TARGET_DIR
}
/ARCH/COMMON
${
OPENAIR_NFAPIINC
}
)
${
OPENAIR_COMMONUTILS_DIR
}
/msc
${
OPENAIR_COMMONUTILS_DIR
}
/itti
${
OPENAIR_COMMONUTILS_DIR
}
/hashtable
${
OPENAIR_COMMONUTILS_DIR
}
${
OPENAIR_ASN1INC
}
${
OPENAIR2_DIR
}
/LAYER2/RLC/AM_v9.3.0
${
OPENAIR_COMMONUTILS_DIR
}
/msc
${
OPENAIR_COMMONUTILS_DIR
}
/itti
${
OPENAIR_COMMONUTILS_DIR
}
/hashtable
${
OPENAIR_COMMONUTILS_DIR
}
${
OPENAIR_ASN1INC
}
${
OPENAIR2_DIR
}
/LAYER2/RLC
${
OPENAIR2_DIR
}
/UTIL/LISTS
${
OPENAIR2_DIR
}
/UTIL/MEM
${
OPENAIR2_DIR
}
/LAYER2/RLC/UM_v9.3.0
${
OPENAIR2_DIR
}
/LAYER2/RLC/TM_v9.3.0
${
OPENAIR2_DIR
}
/RRC/LITE
${
OPENAIR_TARGET_DIR
}
/COMMON
${
OPENAIR_TARGET_DIR
}
/ARCH/COMMON
${
OPENAIR3_DIR
}
/NAS/COMMON/API/NETWORK
${
OPENAIR3_DIR
}
/NAS/COMMON/EMM/MSG/
${
OPENAIR3_DIR
}
/NAS/COMMON/IES/
${
OPENAIR3_DIR
}
/NAS/COMMON/UTIL
${
OPENAIR3_DIR
}
/NAS/COMMON/ESM/MSG/
${
OPENAIR3_DIR
}
/GTPV1-U
${
OPENAIR3_DIR
}
/GTPV1-U/nw-gtpv1u/shared
${
OPENAIR3_DIR
}
/GTPV1-U/nw-gtpv1u/include
${
OPENAIR3_DIR
}
/UTILS
${
OPENAIR_NFAPIINC
}
)
set
(
TELNETSRV_SOURCE
${
APPROOT
}
/telnetsrv.c
...
...
common/utils/telnetsrv/telnetsrv_phycmd.c
View file @
8c22204a
...
...
@@ -12,15 +12,6 @@ extern int dump_eNB_stats(PHY_VARS_eNB *eNB, char* buffer, int length);
void
init_phytelnet
()
{
if
(
PHY_vars_eNB_g
!=
NULL
)
printf
(
"init_phytelnet: phy var at 0x%08lx
\n
"
,(
unsigned
long
int
)
PHY_vars_eNB_g
);
else
fprintf
(
stderr
,
"init_phytelnet: phy var not found...
\n
"
);
phy_vardef
[
TELNETVAR_PHYCC0
].
varvalptr
=
&
(
PHY_vars_eNB_g
[
0
][
0
]);
phy_vardef
[
TELNETVAR_PHYCC1
].
varvalptr
=
&
(
PHY_vars_eNB_g
[
0
][
1
]);
prnbuff
=
malloc
(
get_phybsize
()
);
if
(
prnbuff
==
NULL
)
{
...
...
@@ -38,7 +29,7 @@ void dump_uestats(int debug, telnet_printfunc_t prnt, uint8_t prntflag)
int
p
;
p
=
dump_eNB_
stats
(
PHY_vars_eNB_g
[
0
][
0
],
prnbuff
,
0
);
p
=
dump_eNB_
l2_stats
(
prnbuff
,
0
);
if
(
prntflag
>=
1
)
prnt
(
"%s
\n
"
,
prnbuff
);
if
(
debug
>=
1
)
...
...
@@ -52,19 +43,7 @@ void display_uestats(int debug, telnet_printfunc_t prnt, int ue)
for
(
int
cc
=
0
;
cc
<
1
;
cc
++
)
{
if
((
PHY_vars_eNB_g
[
0
][
cc
]
->
dlsch
[
ue
][
0
]
->
rnti
>
0
)
&&
(
PHY_vars_eNB_g
[
0
][
cc
]
->
UE_stats
[
ue
].
mode
==
PUSCH
))
{
prnt
(
"%02i %04i %04hx %04i %04i %04i %-04i %04i %06i
\n
"
,
cc
,
ue
,
PHY_vars_eNB_g
[
0
][
cc
]
->
UE_stats
[
ue
].
crnti
,
PHY_vars_eNB_g
[
0
][
cc
]
->
dlsch
[
ue
][
0
]
->
harq_processes
[
0
]
->
mcs
,
0
,
// PHY_vars_eNB_g[0][cc]->ulsch[ue]->harq_processes[0]->mcs,
PHY_vars_eNB_g
[
0
][
cc
]
->
UE_stats
[
ue
].
UE_timing_offset
,
PHY_vars_eNB_g
[
0
][
cc
]
->
UE_stats
[
ue
].
timing_advance_update
,
PHY_vars_eNB_g
[
0
][
cc
]
->
UE_stats
[
ue
].
dlsch_bitrate
/
1000
,
PHY_vars_eNB_g
[
0
][
cc
]
->
UE_stats
[
ue
].
total_TBS
/
1000
);
}
}
}
...
...
@@ -73,9 +52,7 @@ void display_phycounters(char *buf, int debug, telnet_printfunc_t prnt)
prnt
(
" DLSCH kb DLSCH kb/s
\n
"
);
dump_uestats
(
debug
,
prnt
,
0
);
prnt
(
" %09i %06i
\n
"
,
PHY_vars_eNB_g
[
0
][
0
]
->
total_transmitted_bits
/
1000
,
PHY_vars_eNB_g
[
0
][
0
]
->
total_dlsch_bitrate
/
1000
);
}
int
dump_phyvars
(
char
*
buf
,
int
debug
,
telnet_printfunc_t
prnt
)
...
...
common/utils/telnetsrv/telnetsrv_phycmd.h
View file @
8c22204a
...
...
@@ -4,7 +4,8 @@
#include "UTIL/LOG/log.h"
#include "openair1/PHY/defs.h"
#include "openair1/PHY/extern.h"
#define TELNETVAR_PHYCC0 0
...
...
@@ -23,7 +24,7 @@ telnetshell_vardef_t phy_vardef[] = {
//{"rachdmax",TELNET_VARTYPE_INT32,NULL},
{
""
,
0
,
NULL
}
};
extern
PHY_VARS_eNB
***
PHY_vars_eNB_g
;
#else
extern
void
add_phy_cmds
();
...
...
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