Merge branch 'master' of gitosis@bs11-abis.gnumonks.org:openbsc

This commit is contained in:
Harald Welte 2009-07-01 11:24:18 +02:00
commit 1a9913060f
3 changed files with 3 additions and 3 deletions

View File

@ -415,7 +415,7 @@ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac,
char *gsm_band_name(enum gsm_band band); char *gsm_band_name(enum gsm_band band);
enum gsm_band gsm_band_parse(int mhz); enum gsm_band gsm_band_parse(int mhz);
void *tall_bsc_ctx; extern void *tall_bsc_ctx;
static inline int is_ipaccess_bts(struct gsm_bts *bts) static inline int is_ipaccess_bts(struct gsm_bts *bts)
{ {

View File

@ -49,8 +49,6 @@
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/talloc.h> #include <openbsc/talloc.h>
void *tall_bsc_ctx;
/* global pointer to the gsm network data structure */ /* global pointer to the gsm network data structure */
static struct gsm_network *gsmnet; static struct gsm_network *gsmnet;

View File

@ -27,6 +27,8 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/talloc.h> #include <openbsc/talloc.h>
void *tall_bsc_ctx;
void set_ts_e1link(struct gsm_bts_trx_ts *ts, u_int8_t e1_nr, void set_ts_e1link(struct gsm_bts_trx_ts *ts, u_int8_t e1_nr,
u_int8_t e1_ts, u_int8_t e1_ts_ss) u_int8_t e1_ts, u_int8_t e1_ts_ss)
{ {