forked from cellular-infrastructure/osmo-pcu
rename sysmo_sock.cpp to osmobts_sock.cpp
This also renames the --enable-sysmbts option to --enable-osmobts This socket interface was nevery sysmoBTS specific, but it is a generic socket interface to any OsmoBTS supported layer1/hardware. So it was a mis-nomer so far.
This commit is contained in:
parent
8df447dc77
commit
d32cbbb130
14
configure.ac
14
configure.ac
|
@ -27,13 +27,13 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty)
|
|||
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.3)
|
||||
PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.5.1.4)
|
||||
|
||||
AC_MSG_CHECKING([whether to enable sysmocom-bts hardware support])
|
||||
AC_ARG_ENABLE(sysmocom-bts,
|
||||
AC_HELP_STRING([--enable-sysmocom-bts],
|
||||
[enable code for sysmocom femto-bts [default=no]]),
|
||||
[enable_sysmocom_bts="$enableval"],[enable_sysmocom_bts="no"])
|
||||
AC_MSG_RESULT([$enable_sysmocom_bts])
|
||||
AM_CONDITIONAL(ENABLE_SYSMOBTS, test "x$enable_sysmocom_bts" = "xyes")
|
||||
AC_MSG_CHECKING([whether to enable support for the osmo-bts layer 1 support])
|
||||
AC_ARG_ENABLE(osmo-bts,
|
||||
AC_HELP_STRING([--enable-osmo-bts],
|
||||
[enable support for osmo-bts L1 if [default=no]]),
|
||||
[enable_osmo_bts="$enableval"],[enable_osmo_bts="no"])
|
||||
AC_MSG_RESULT([$enable_osmo_bts])
|
||||
AM_CONDITIONAL(ENABLE_OSMOBTS, test "x$enable_osmo_bts" = "xyes")
|
||||
|
||||
AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts])
|
||||
AC_ARG_ENABLE(sysmocom-dsp,
|
||||
|
|
|
@ -57,9 +57,9 @@ libgprs_la_SOURCES = \
|
|||
rlc.cpp \
|
||||
gprs_codel.c
|
||||
|
||||
if ENABLE_SYSMOBTS
|
||||
if ENABLE_OSMOBTS
|
||||
libgprs_la_SOURCES += \
|
||||
sysmo_sock.cpp
|
||||
osmobts_sock.cpp
|
||||
else
|
||||
libgprs_la_SOURCES += \
|
||||
openbts_sock.cpp
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* sysmo_sock.cpp
|
||||
/* osmobts_sock.cpp
|
||||
*
|
||||
* Copyright (C) 2012 Andreas Eversberg <jolly@eversberg.eu>
|
||||
*
|
||||
|
@ -46,7 +46,7 @@ int l1if_close_pdch(void *obj);
|
|||
}
|
||||
|
||||
/*
|
||||
* SYSMO-PCU socket functions
|
||||
* osmo-bts PCU socket functions
|
||||
*/
|
||||
|
||||
struct pcu_sock_state {
|
||||
|
@ -236,7 +236,7 @@ int pcu_l1if_open(void)
|
|||
|
||||
bfd->fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
|
||||
if (bfd->fd < 0) {
|
||||
LOGP(DL1IF, LOGL_ERROR, "Failed to create PCU-SYSMO socket.\n");
|
||||
LOGP(DL1IF, LOGL_ERROR, "Failed to create PCU socket.\n");
|
||||
talloc_free(state);
|
||||
return -1;
|
||||
}
|
||||
|
@ -258,8 +258,8 @@ int pcu_l1if_open(void)
|
|||
#endif
|
||||
rc = connect(bfd->fd, (struct sockaddr *) &local, namelen);
|
||||
if (rc != 0) {
|
||||
LOGP(DL1IF, LOGL_ERROR, "Failed to Connect the PCU-SYSMO "
|
||||
"socket, delaying... '%s'\n", local.sun_path);
|
||||
LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the osmo-bts"
|
||||
"PCU socket, delaying... '%s'\n", local.sun_path);
|
||||
pcu_sock_state = state;
|
||||
close(bfd->fd);
|
||||
bfd->fd = -1;
|
||||
|
@ -280,7 +280,7 @@ int pcu_l1if_open(void)
|
|||
return rc;
|
||||
}
|
||||
|
||||
LOGP(DL1IF, LOGL_NOTICE, "PCU-SYSMO socket has been connected\n");
|
||||
LOGP(DL1IF, LOGL_NOTICE, "osmo-bts PCU socket has been connected\n");
|
||||
|
||||
pcu_sock_state = state;
|
||||
|
Loading…
Reference in New Issue