aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bts-octphy
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-octphy
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-octphy')
-rw-r--r--src/osmo-bts-octphy/l1_tch.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/osmo-bts-octphy/l1_tch.c b/src/osmo-bts-octphy/l1_tch.c
index 5693313b..79bf245b 100644
--- a/src/osmo-bts-octphy/l1_tch.c
+++ b/src/osmo-bts-octphy/l1_tch.c
@@ -43,7 +43,7 @@ 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;
@@ -93,7 +93,7 @@ static struct msgb *l1_to_rtppayload_efr(uint8_t *l1_payload, uint8_t payload_le
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;
@@ -132,12 +132,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;
}
@@ -164,7 +164,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;
}
@@ -217,13 +217,13 @@ int l1if_tch_rx(struct gsm_bts_trx *trx, uint8_t chan_nr,
goto err_payload_match;
break;
default:
- LOGP(DL1C, LOGL_NOTICE,
+ LOGP(DL1P, LOGL_NOTICE,
"%s Rx Payload Type %d is unsupported\n",
gsm_lchan_name(lchan), payload_type);
break;
}
- LOGP(DL1C, LOGL_DEBUG, "%s Rx codec frame (%u): %s\n",
+ LOGP(DL1P, LOGL_DEBUG, "%s Rx codec frame (%u): %s\n",
gsm_lchan_name(lchan), payload_len, osmo_hexdump(payload,
payload_len));
@@ -247,7 +247,7 @@ int l1if_tch_rx(struct gsm_bts_trx *trx, uint8_t chan_nr,
rmsg = l1_to_rtppayload_amr(payload, payload_len,
&lchan->tch.amr_mr);
#else
- LOGP(DL1C, LOGL_ERROR, "OctPHY only supports FR!\n");
+ LOGP(DL1P, LOGL_ERROR, "OctPHY only supports FR!\n");
return -1;
#endif
break;
@@ -260,7 +260,7 @@ int l1if_tch_rx(struct gsm_bts_trx *trx, uint8_t chan_nr,
return 0;
err_payload_match:
- LOGP(DL1C, LOGL_ERROR,
+ LOGP(DL1P, LOGL_ERROR,
"%s Rx Payload Type %d incompatible with lchan\n",
gsm_lchan_name(lchan), payload_type);
return -EINVAL;