aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bts-litecell15
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2017-06-30 11:36:20 +0200
committerHarald Welte <laforge@gnumonks.org>2017-07-04 13:36:52 +0000
commit171d80a8d6f3203d2d5ac0c19dd39b0030489907 (patch)
tree9c12332168e599f1f809a343f66882dc7ad60897 /src/osmo-bts-litecell15
parent8baa45a8e312852d1ae65d218ee9c98430cd15bb (diff)
Use L1P instead of L1C for TCH logging and allocation
L1C is for L1-Control primitives, while TCH channels are L1 Data channels. Change-Id: I07ea3a7326bfcb62271d58deb0743311f6d97c8b
Diffstat (limited to 'src/osmo-bts-litecell15')
-rw-r--r--src/osmo-bts-litecell15/tch.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/osmo-bts-litecell15/tch.c b/src/osmo-bts-litecell15/tch.c
index 8bed695..c82d6f8 100644
--- a/src/osmo-bts-litecell15/tch.c
+++ b/src/osmo-bts-litecell15/tch.c
@@ -61,7 +61,7 @@ static struct msgb *l1_to_rtppayload_fr(uint8_t *l1_payload, uint8_t payload_len
struct msgb *msg;
uint8_t *cur;
- msg = msgb_alloc_headroom(1024, 128, "L1C-to-RTP");
+ msg = msgb_alloc_headroom(1024, 128, "L1P-to-RTP");
if (!msg)
return NULL;
@@ -95,7 +95,7 @@ static struct msgb *l1_to_rtppayload_efr(uint8_t *l1_payload,
struct msgb *msg;
uint8_t *cur;
- msg = msgb_alloc_headroom(1024, 128, "L1C-to-RTP");
+ msg = msgb_alloc_headroom(1024, 128, "L1P-to-RTP");
if (!msg)
return NULL;
@@ -126,12 +126,12 @@ static struct msgb *l1_to_rtppayload_hr(uint8_t *l1_payload, uint8_t payload_len
struct msgb *msg;
uint8_t *cur;
- msg = msgb_alloc_headroom(1024, 128, "L1C-to-RTP");
+ msg = msgb_alloc_headroom(1024, 128, "L1P-to-RTP");
if (!msg)
return NULL;
if (payload_len != GSM_HR_BYTES) {
- LOGP(DL1C, LOGL_ERROR, "L1 HR frame length %u != expected %u\n",
+ LOGP(DL1P, LOGL_ERROR, "L1 HR frame length %u != expected %u\n",
payload_len, GSM_HR_BYTES);
return NULL;
}
@@ -155,7 +155,7 @@ static int rtppayload_to_l1_hr(uint8_t *l1_payload, const uint8_t *rtp_payload,
{
if (payload_len != GSM_HR_BYTES) {
- LOGP(DL1C, LOGL_ERROR, "RTP HR frame length %u != expected %u\n",
+ LOGP(DL1P, LOGL_ERROR, "RTP HR frame length %u != expected %u\n",
payload_len, GSM_HR_BYTES);
return 0;
}
@@ -172,7 +172,7 @@ static struct msgb *l1_to_rtppayload_amr(uint8_t *l1_payload, uint8_t payload_le
uint8_t amr_if2_len = payload_len - 2;
uint8_t *cur;
- msg = msgb_alloc_headroom(1024, 128, "L1C-to-RTP");
+ msg = msgb_alloc_headroom(1024, 128, "L1P-to-RTP");
if (!msg)
return NULL;
@@ -405,31 +405,31 @@ int l1if_tch_rx(struct gsm_bts_trx *trx, uint8_t chan_nr, struct msgb *l1p_msg)
case GsmL1_TchPlType_Amr_SidFirstP1:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGP(DL1C, LOGL_DEBUG, "DTX: received SID_FIRST_P1 from L1 "
+ LOGP(DL1P, LOGL_DEBUG, "DTX: received SID_FIRST_P1 from L1 "
"(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstP2:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGP(DL1C, LOGL_DEBUG, "DTX: received SID_FIRST_P2 from L1 "
+ LOGP(DL1P, LOGL_DEBUG, "DTX: received SID_FIRST_P2 from L1 "
"(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->rtp_tx_marker = true;
- LOGP(DL1C, LOGL_DEBUG, "DTX: received SID_FIRST_INH from L1 "
+ LOGP(DL1P, LOGL_DEBUG, "DTX: received SID_FIRST_INH from L1 "
"(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidUpdateInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->rtp_tx_marker = true;
- LOGP(DL1C, LOGL_DEBUG, "DTX: received SID_UPDATE_INH from L1 "
+ LOGP(DL1P, LOGL_DEBUG, "DTX: received SID_UPDATE_INH from L1 "
"(%d bytes)\n", payload_len);
break;
default:
- LOGP(DL1C, LOGL_NOTICE, "%s Rx Payload Type %s is unsupported\n",
+ LOGP(DL1P, LOGL_NOTICE, "%s Rx Payload Type %s is unsupported\n",
gsm_lchan_name(lchan),
get_value_string(lc15bts_tch_pl_names, payload_type));
break;
@@ -465,7 +465,7 @@ int l1if_tch_rx(struct gsm_bts_trx *trx, uint8_t chan_nr, struct msgb *l1p_msg)
return 0;
err_payload_match:
- LOGP(DL1C, LOGL_ERROR, "%s Rx Payload Type %s incompatible with lchan\n",
+ LOGP(DL1P, LOGL_ERROR, "%s Rx Payload Type %s incompatible with lchan\n",
gsm_lchan_name(lchan),
get_value_string(lc15bts_tch_pl_names, payload_type));
return -EINVAL;