summaryrefslogtreecommitdiffstats
path: root/src/host/gsm48-andreas
diff options
context:
space:
mode:
authorHarald Welte2010-03-25 05:43:07 +0100
committerHarald Welte2010-03-25 05:43:07 +0100
commite4616156542de42920cd097ddda12751923fd6b6 (patch)
tree697fdf615132c92cac4754c9ee70dd75faaa8cd9 /src/host/gsm48-andreas
parentMerge commit '52b4abdcb351830f5493a50c4181ef3947f3feab' (diff)
downloadosmocom-e4616156542de42920cd097ddda12751923fd6b6.tar.gz
osmocom-e4616156542de42920cd097ddda12751923fd6b6.tar.xz
osmocom-e4616156542de42920cd097ddda12751923fd6b6.zip
gsm48-andreas: Use value_string wherever possible
The point of this is to not replicate functionality that already exists in libosmocore (get_value_string()/get_string_value()).
Diffstat (limited to 'src/host/gsm48-andreas')
-rw-r--r--src/host/gsm48-andreas/gsm48_mm.c4
-rw-r--r--src/host/gsm48-andreas/gsm48_rr.c46
2 files changed, 20 insertions, 30 deletions
diff --git a/src/host/gsm48-andreas/gsm48_mm.c b/src/host/gsm48-andreas/gsm48_mm.c
index 79f3e99..90b22e2 100644
--- a/src/host/gsm48-andreas/gsm48_mm.c
+++ b/src/host/gsm48-andreas/gsm48_mm.c
@@ -1044,7 +1044,7 @@ static int gsm48_rcv_mm(struct osmocom_ms *ms, struct msgb *msg)
int msg_type = gh->msg_type & 0xbf;
DEBUGP(DMM, "(ms %s) Received '%s' from BS in state %s\n", ms->name,
- gsm0408_mm_msg_names[msg_type], mm_state_names[mm->state]);
+ gsm48_mm_msg_name(msg_type), mm_state_names[mm->state]);
/* find function for current state and message */
for (i = 0; i < MMDATASLLEN; i++)
@@ -1216,7 +1216,7 @@ static int gsm48_rcv_rr(struct osmocom_ms *ms, struct gsm_rr *rrmsg)
int msg_type = rrmsg->msg_type;
DEBUGP(DMM, "(ms %s) Received '%s' from RR in state %s\n", ms->name,
- gsm0408_rr_msg_names[msg_type], mm_state_names[mm->state]);
+ gsm48_rr_msg_name(msg_type), mm_state_names[mm->state]);
/* find function for current state and message */
for (i = 0; i < RRDATASLLEN; i++)
diff --git a/src/host/gsm48-andreas/gsm48_rr.c b/src/host/gsm48-andreas/gsm48_rr.c
index f1dfc18..477fd91 100644
--- a/src/host/gsm48-andreas/gsm48_rr.c
+++ b/src/host/gsm48-andreas/gsm48_rr.c
@@ -2214,37 +2214,27 @@ they queue must be flushed when rr fails
#include <osmocore/protocol/gsm_04_08.h>
#include <osmocore/msgb.h>
+#include <osmocore/utils.h>
#include <osmocore/gsm48.h>
-static struct rr_names {
- char *name;
- int value;
-} rr_names[] = {
- { "RR_EST_REQ", RR_EST_REQ },
- { "RR_EST_IND", RR_EST_IND },
- { "RR_EST_CNF", RR_EST_CNF },
- { "RR_REL_IND", RR_REL_IND },
- { "RR_SYNC_IND", RR_SYNC_IND },
- { "RR_DATA_REQ", RR_DATA_REQ },
- { "RR_DATA_IND", RR_DATA_IND },
- { "RR_UNIT_DATA_IND", RR_UNIT_DATA_IND },
- { "RR_ABORT_REQ", RR_ABORT_REQ },
- { "RR_ABORT_IND", RR_ABORT_IND },
- { "RR_ACT_REQ", RR_ACT_REQ },
-
- {NULL, 0}
+static const struct value_string rr_names[] = {
+ { RR_EST_REQ, "RR_EST_REQ" },
+ { RR_EST_IND, "RR_EST_IND" },
+ { RR_EST_CNF, "RR_EST_CNF" },
+ { RR_REL_IND, "RR_REL_IND" },
+ { RR_SYNC_IND, "RR_SYNC_IND" },
+ { RR_DATA_REQ, "RR_DATA_REQ" },
+ { RR_DATA_IND, "RR_DATA_IND" },
+ { RR_UNIT_DATA_IND, "RR_UNIT_DATA_IND" },
+ { RR_ABORT_REQ, "RR_ABORT_REQ" },
+ { RR_ABORT_IND, "RR_ABORT_IND" },
+ { RR_ACT_REQ, "RR_ACT_REQ" },
+ { 0, NULL }
};
-char *get_rr_name(int value)
+const char *get_rr_name(int value)
{
- int i;
-
- for (i = 0; rr_names[i].name; i++) {
- if (rr_names[i].value == value)
- return rr_names[i].name;
- }
-
- return "RR_Unknown";
+ return get_value_string(rr_names, value);
}
static int rr_rcvmsg(struct osmocom_ms *ms,
@@ -2308,7 +2298,7 @@ static int gsm_send_rr(struct osmocom_ms *ms, struct gsm_rr *msg)
int msg_type = mmh->msg_type;
DEBUGP(DRR, "(ms %s) Sending '%s' to DL in state %s\n", ms->name,
- gsm0408_rr_msg_names[msg_type], mm_state_names[mm->state]);
+ gsm48_rr_msg_name(msg_type), mm_state_names[mm->state]);
/* find function for current state and message */
for (i = 0; i < RRDOWNSLLEN; i++)
@@ -2628,7 +2618,7 @@ static int gsm_rcv_dl(struct osmocom_ms *ms, struct gsm_dl *dlmsg)
int msg_type = dlmsg->msg_type;
DEBUGP(DRR, "(ms %s) Received '%s' from DL in state %s\n", ms->name,
- gsm0408_dl_msg_names[msg_type], mm_state_names[mm->state]);
+ gsm48_dl_msg_name(msg_type), mm_state_names[mm->state]);
/* find function for current state and message */
for (i = 0; i < DLDATASLLEN; i++)