phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

lapdm: remove get_rsl_name() and use libosmogsm:gsm_rsl_name() instead

This commit is contained in:
Harald Welte 2011-06-23 23:57:34 +02:00
parent 3538c38835
commit e4ea01041e
3 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/host/layer23/src/common/lapdm.c
View File

@ -2166,34 +2166,6 @@ static int l2_ph_chan_conf(struct msgb *msg, struct lapdm_entity *le, uint32_t f
return rslms_sendmsg(msg, le);
}
/* Names for Radio Link Layer Management */
static const struct value_string rsl_msg_names[] = {
{ RSL_MT_DATA_REQ, "RSL_MT_DATA_REQ" },
{ RSL_MT_DATA_IND, "RSL_MT_DATA_IND" },
{ RSL_MT_ERROR_IND, "RSL_MT_ERROR_IND" },
{ RSL_MT_EST_REQ, "RSL_MT_EST_REQ" },
{ RSL_MT_EST_CONF, "RSL_MT_EST_CONF" },
{ RSL_MT_EST_IND, "RSL_MT_EST_IND" },
{ RSL_MT_EST_IND, "RSL_MT_REL_REQ" },
{ RSL_MT_REL_REQ, "RSL_MT_REL_REQ" },
{ RSL_MT_REL_CONF, "RSL_MT_REL_CONF" },
{ RSL_MT_REL_IND, "RSL_MT_REL_IND" },
{ RSL_MT_UNIT_DATA_REQ, "RSL_MT_UNIT_DATA_REQ" },
{ RSL_MT_UNIT_DATA_IND, "RSL_MT_UNIT_DATA_IND" },
{ RSL_MT_SUSP_REQ, "RSL_MT_SUSP_REQ" },
{ RSL_MT_SUSP_CONF, "RSL_MT_SUSP_CONF" },
{ RSL_MT_RES_REQ, "RSL_MT_RES_REQ" },
{ RSL_MT_RECON_REQ, "RSL_MT_RECON_REQ" },
{ RSL_MT_CHAN_RQD, "RSL_MT_CHAN_RQD" },
{ RSL_MT_CHAN_CONF, "RSL_MT_CHAN_CONF" },
{ 0, NULL }
};
const char *get_rsl_name(int value)
{
return get_value_string(rsl_msg_names, value);
}
const char *lapdm_state_names[] = {
"LAPDm_STATE_NULL",
"LAPDm_STATE_IDLE",
@ -2284,7 +2256,7 @@ static int rslms_rx_rll(struct msgb *msg, struct lapdm_channel *lc)
}
LOGP(DRSL, LOGL_INFO, "(%p) RLL Message '%s' received in state %s\n",
lc->name, get_rsl_name(msg_type), lapdm_state_names[dl->state]);
lc->name, rsl_msg_name(msg_type), lapdm_state_names[dl->state]);
/* find function for current state and message */
for (i = 0; i < L2DOWNSLLEN; i++) {

2
src/host/layer23/src/misc/cell_log.c
View File

@ -744,7 +744,7 @@ static int rcv_cch(struct osmocom_ms *ms, struct msgb *msg)
int rc;
LOGP(DRSL, LOGL_INFO, "Received '%s' from layer1\n",
get_rsl_name(msg_type));
rsl_msg_name(msg_type));
if (state == SCAN_STATE_RACH && msg_type == RSL_MT_CHAN_CONF) {
rc = chan_conf(ms, msg);

4
src/host/layer23/src/mobile/gsm48_rr.c
View File

@ -4916,7 +4916,7 @@ static int gsm48_rcv_rll(struct osmocom_ms *ms, struct msgb *msg)
if (msg_type != RSL_MT_UNIT_DATA_IND) {
LOGP(DRSL, LOGL_INFO, "(ms %s) Received '%s' from L2 in state "
"%s\n", ms->name, get_rsl_name(msg_type),
"%s\n", ms->name, rsl_msg_name(msg_type),
gsm48_rr_state_names[rr->state]);
}
@ -4948,7 +4948,7 @@ static int gsm48_rcv_cch(struct osmocom_ms *ms, struct msgb *msg)
int rc;
LOGP(DRSL, LOGL_INFO, "(ms %s) Received '%s' from L2 in state "
"%s\n", ms->name, get_rsl_name(msg_type),
"%s\n", ms->name, rsl_msg_name(msg_type),
gsm48_rr_state_names[rr->state]);
if (rr->state == GSM48_RR_ST_CONN_PEND