diff options
author | Harald Welte <laforge@gnumonks.org> | 2015-11-11 21:23:23 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2015-11-12 01:01:35 +0100 |
commit | d32cbbb13087eae2617920d4ea980f0e8869a89e (patch) | |
tree | 36f3b68fcc0f6c67fc525a8285cb6c88e479c75d | |
parent | 8df447dc77d69a044c6f277b369be671655590f0 (diff) |
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.
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/osmobts_sock.cpp (renamed from src/sysmo_sock.cpp) | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 876f7d41..b0f874b2 100644 --- a/configure.ac +++ b/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, diff --git a/src/Makefile.am b/src/Makefile.am index 35874164..e7c676d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/sysmo_sock.cpp b/src/osmobts_sock.cpp index 951653e2..52c13c42 100644 --- a/src/sysmo_sock.cpp +++ b/src/osmobts_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; |