cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

move is_ipaccess_bts() and parse_btstype9) to gsm_data.c

This commit is contained in:
Harald Welte 2009-03-10 12:15:10 +00:00
parent a27d8d2a91
commit 32201c1aea
4 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/openbsc/gsm_data.h
View File

@ -333,4 +333,19 @@ enum gsm_e1_event {
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);
enum gsm_bts_type parse_btstype(char *arg);
char *btstype2str(enum gsm_bts_type type);
static inline int is_ipaccess_bts(struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_NANOBTS_900:
case GSM_BTS_TYPE_NANOBTS_1800:
return 1;
default:
break;
}
return 0;
}
#endif

19
src/bsc_hack.c
View File

@ -1,6 +1,6 @@
/* A hackish minimal BSC (+MSC +HLR) implementation */
/* (C) 2008 by Harald Welte <laforge@gnumonks.org>
/* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org>
* (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
* All Rights Reserved
*
@ -963,23 +963,6 @@ static void print_help()
printf(" -h --help this text\n");
}
static const char *bts_types[] = {
[GSM_BTS_TYPE_UNKNOWN] = "unknown",
[GSM_BTS_TYPE_BS11] = "bs11",
[GSM_BTS_TYPE_NANOBTS_900] = "nanobts900",
[GSM_BTS_TYPE_NANOBTS_1800] = "nanobts1800",
};
enum gsm_bts_type parse_btstype(char *arg)
{
int i;
for (i = 0; i < ARRAY_SIZE(bts_types); i++) {
if (!strcmp(arg, bts_types[i]))
return i;
}
return GSM_BTS_TYPE_BS11; /* Default: BS11 */
}
static void handle_options(int argc, char** argv)
{
while (1) {

12
src/gsm_04_08.c
View File

@ -85,18 +85,6 @@ static const struct tlv_definition rsl_att_tlvdef = {
},
};
static inline int is_ipaccess_bts(struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_NANOBTS_900:
case GSM_BTS_TYPE_NANOBTS_1800:
return 1;
default:
break;
}
return 0;
}
static int gsm48_tx_simple(struct gsm_lchan *lchan,
u_int8_t pdisc, u_int8_t msg_type);
static void schedule_reject(struct gsm_lchan *lchan);

26
src/gsm_data.c
View File

@ -1,4 +1,4 @@
/* (C) 2008 by Harald Welte <laforge@gnumonks.org>
/* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
@ -155,3 +155,27 @@ char *gsm_ts_name(struct gsm_bts_trx_ts *ts)
return ts2str;
}
static const char *bts_types[] = {
[GSM_BTS_TYPE_UNKNOWN] = "unknown",
[GSM_BTS_TYPE_BS11] = "bs11",
[GSM_BTS_TYPE_NANOBTS_900] = "nanobts900",
[GSM_BTS_TYPE_NANOBTS_1800] = "nanobts1800",
};
enum gsm_bts_type parse_btstype(char *arg)
{
int i;
for (i = 0; i < ARRAY_SIZE(bts_types); i++) {
if (!strcmp(arg, bts_types[i]))
return i;
}
return GSM_BTS_TYPE_BS11; /* Default: BS11 */
}
char *btstype2str(enum gsm_bts_type type)
{
if (type > ARRAY_SIZE(bts_types))
return "undefined";
return bts_types[type];
}