Make LCR compile with latest osmocomBB code.
The libosmocore structure has changed.
This commit is contained in:
parent
d0698802a0
commit
39a36cb99a
|
@ -78,7 +78,8 @@ GSM_LIB += ./layer23/src/mobile/libmobile.a \
|
||||||
./layer23/src/common/liblayer23.a \
|
./layer23/src/common/liblayer23.a \
|
||||||
./libosmocore/build-host/src/.libs/libosmocore.a \
|
./libosmocore/build-host/src/.libs/libosmocore.a \
|
||||||
./libosmocore/build-host/src/vty/.libs/libosmovty.a \
|
./libosmocore/build-host/src/vty/.libs/libosmovty.a \
|
||||||
./libosmocore/build-host/src/codec/.libs/libosmocodec.a
|
./libosmocore/build-host/src/codec/.libs/libosmocodec.a \
|
||||||
|
./libosmocore/build-host/src/gsm/.libs/libosmogsm.a
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,9 @@ extern "C" {
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/gsmtap_util.h>
|
#include <osmocom/core/gsmtap_util.h>
|
||||||
|
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmocom/bb/common/logging.h>
|
||||||
|
@ -34,6 +34,7 @@ short vty_port = 4247;
|
||||||
struct llist_head ms_list;
|
struct llist_head ms_list;
|
||||||
struct log_target *stderr_target;
|
struct log_target *stderr_target;
|
||||||
void *l23_ctx = NULL;
|
void *l23_ctx = NULL;
|
||||||
|
struct gsmtap_inst *gsmtap_inst;
|
||||||
|
|
||||||
static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index);
|
static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index);
|
||||||
|
|
||||||
|
@ -913,7 +914,7 @@ int handle_gsm_ms(int *_quit)
|
||||||
if (quit && llist_empty(&ms_list))
|
if (quit && llist_empty(&ms_list))
|
||||||
*_quit = 1;
|
*_quit = 1;
|
||||||
// debug_reset_context();
|
// debug_reset_context();
|
||||||
if (bsc_select_main(1)) /* polling */
|
if (osmo_select_main(1)) /* polling */
|
||||||
work = 1;
|
work = 1;
|
||||||
|
|
||||||
return work;
|
return work;
|
||||||
|
|
3
gsm_ms.h
3
gsm_ms.h
|
@ -1,3 +1,6 @@
|
||||||
|
#ifndef _GNU_SOURCE
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
#endif
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/mobile/mncc.h>
|
#include <osmocom/bb/mobile/mncc.h>
|
||||||
|
|
7
main.c
7
main.c
|
@ -10,10 +10,13 @@
|
||||||
\*****************************************************************************/
|
\*****************************************************************************/
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#ifdef PACKAGE_VERSION
|
||||||
|
#undef PACKAGE_VERSION
|
||||||
|
#endif
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#ifdef WITH_GSM_MS
|
#ifdef WITH_GSM_MS
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <osmocore/signal.h>
|
#include <osmocom/core/signal.h>
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -156,7 +159,7 @@ void sighandler(int sigset)
|
||||||
#ifdef WITH_GSM_MS
|
#ifdef WITH_GSM_MS
|
||||||
if (!wait_ms) {
|
if (!wait_ms) {
|
||||||
wait_ms = 1;
|
wait_ms = 1;
|
||||||
dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -13,6 +13,9 @@
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
|
#ifdef PACKAGE_VERSION
|
||||||
|
#undef PACKAGE_VERSION
|
||||||
|
#endif
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue