diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:37 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:45 +0100 |
commit | 1ebad7437729d6abbf5308de19161b0574e3451a (patch) | |
tree | 1229a0bfb2bb0093dec05959fd4bbfca557d64c9 /openbsc/src/gsm_data.c | |
parent | 36ed8cc4c33e3b69bb0f84f1b5b593ae46aff08f (diff) | |
parent | 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c (diff) |
Merge remote branch 'origin/master' into on-waves/mgcp
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/src/Makefile.am
Diffstat (limited to 'openbsc/src/gsm_data.c')
-rw-r--r-- | openbsc/src/gsm_data.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c index 1f2e1a1fc..a6b060c2d 100644 --- a/openbsc/src/gsm_data.c +++ b/openbsc/src/gsm_data.c @@ -26,9 +26,9 @@ #include <ctype.h> #include <openbsc/gsm_data.h> -#include <openbsc/talloc.h> +#include <osmocore/talloc.h> #include <openbsc/abis_nm.h> -#include <openbsc/statistics.h> +#include <osmocore/statistics.h> void *tall_bsc_ctx; @@ -438,8 +438,14 @@ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, char *gsm_band_name(enum gsm_band band) { switch (band) { - case GSM_BAND_400: - return "GSM400"; + case GSM_BAND_450: + return "GSM450"; + case GSM_BAND_480: + return "GSM450"; + case GSM_BAND_750: + return "GSM750"; + case GSM_BAND_810: + return "GSM810"; case GSM_BAND_850: return "GSM850"; case GSM_BAND_900: @@ -461,8 +467,14 @@ enum gsm_band gsm_band_parse(const char* mhz) return -EINVAL; switch (atoi(mhz)) { - case 400: - return GSM_BAND_400; + case 450: + return GSM_BAND_450; + case 480: + return GSM_BAND_480; + case 750: + return GSM_BAND_750; + case 810: + return GSM_BAND_810; case 850: return GSM_BAND_850; case 900: |