Changeset fbc5ca080beedf8ca032cdd409db30838843f79b

Timestamp:

03/04/10 10:39:50 (5 months ago)

Author:

Harald Welte <laforge@gnumonks.org>

Parents:

3c9c5f941d6053985a3fb2aaea2774a24df1bfd3

Children:

afedeabd919972dcc3968b0d9743dc0b1a80774c

git-committer:

Harald Welte <laforge@gnumonks.org> / 2010-03-04T10:39:50Z+0100

Message:

move gsm_band_name() and gsm_band_parse() to libosmocore

Files:

• openbsc/src/gsm_data.c (modified) (3 diffs)

openbsc/src/gsm_data.c

@@ -1 @@
-/* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org>
+/* (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
  *
  * All Rights Reserved
@@ -28 +28 @@
 #include <openbsc/gsm_data.h>
 #include <osmocore/talloc.h>
+#include <osmocore/gsm_utils.h>
 #include <openbsc/abis_nm.h>
 #include <osmocore/statistics.h>
@@ -436 +437 @@
 }
 
-char *gsm_band_name(enum gsm_band band)
-{
-        switch (band) {
-        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:
-                return "GSM900";
-        case GSM_BAND_1800:
-                return "DCS1800";
-        case GSM_BAND_1900:
-                return "PCS1900";
-        }
-        return "invalid";
-}
-
-enum gsm_band gsm_band_parse(const char* mhz)
-{
-        while (*mhz && !isdigit(*mhz))
-                mhz++;
-
-        if (*mhz == '\0')
-                return -EINVAL;
-
-        switch (atoi(mhz)) {
-        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:
-                return GSM_BAND_900;
-        case 1800:
-                return GSM_BAND_1800;
-        case 1900:
-                return GSM_BAND_1900;
-        default:
-                return -EINVAL;
-        }
-}
-
 static const char *gsm_auth_policy_names[] = {
         [GSM_AUTH_POLICY_CLOSED] = "closed",