laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/32920 )
Change subject: trxcon/l1sched: cosmetic: use variable names like in
osmo-bts-trx
......................................................................
trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx
This way it's easier to keep trxcon in sync with osmo-bts-trx.
Change-Id: I8138a45cca4e9063bf7d36ebc920b20b755138dd
Related: OS#4396
---
M src/host/trxcon/src/sched_lchan_pdtch.c
M src/host/trxcon/src/sched_lchan_tchf.c
M src/host/trxcon/src/sched_lchan_tchh.c
M src/host/trxcon/src/sched_lchan_xcch.c
4 files changed, 93 insertions(+), 79 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c
b/src/host/trxcon/src/sched_lchan_pdtch.c
index 6702d9d..b6c3b4c 100644
--- a/src/host/trxcon/src/sched_lchan_pdtch.c
+++ b/src/host/trxcon/src/sched_lchan_pdtch.c
@@ -38,12 +38,12 @@
{
uint8_t l2[GPRS_L2_MAX_LEN], *mask;
int n_errors, n_bits_total, rc;
- sbit_t *buffer, *offset;
+ sbit_t *bursts_p, *burst;
size_t l2_len;
/* Set up pointers */
mask = &lchan->rx_burst_mask;
- buffer = lchan->rx_bursts;
+ bursts_p = lchan->rx_bursts;
LOGP_LCHAND(lchan, LOGL_DEBUG,
"Packet data received: fn=%u bid=%u\n", bi->fn, bi->bid);
@@ -59,9 +59,9 @@
l1sched_lchan_meas_push(lchan, bi);
/* Copy burst to buffer of 4 bursts */
- offset = buffer + bi->bid * 116;
- memcpy(offset, bi->burst + 3, 58);
- memcpy(offset + 58, bi->burst + 87, 58);
+ burst = bursts_p + bi->bid * 116;
+ memcpy(burst, bi->burst + 3, 58);
+ memcpy(burst + 58, bi->burst + 87, 58);
/* Wait until complete set of bursts */
if (bi->bid != 3)
@@ -84,7 +84,7 @@
*mask = *mask << 4;
/* Attempt to decode */
- rc = gsm0503_pdtch_decode(l2, buffer,
+ rc = gsm0503_pdtch_decode(l2, bursts_p,
NULL, &n_errors, &n_bits_total);
if (rc < 0) {
LOGP_LCHAND(lchan, LOGL_ERROR,
@@ -105,14 +105,14 @@
int tx_pdtch_fn(struct l1sched_lchan_state *lchan,
struct l1sched_burst_req *br)
{
- ubit_t *buffer, *offset;
+ ubit_t *bursts_p, *burst;
const uint8_t *tsc;
uint8_t *mask;
int rc;
/* Set up pointers */
mask = &lchan->tx_burst_mask;
- buffer = lchan->tx_bursts;
+ bursts_p = lchan->tx_bursts;
if (br->bid > 0) {
/* If we have encoded bursts */
@@ -123,7 +123,7 @@
}
/* Encode payload */
- rc = gsm0503_pdtch_encode(buffer, msgb_l2(lchan->prim),
msgb_l2len(lchan->prim));
+ rc = gsm0503_pdtch_encode(bursts_p, msgb_l2(lchan->prim),
msgb_l2len(lchan->prim));
if (rc < 0) {
LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload
(len=%u): %s\n",
msgb_l2len(lchan->prim),
msgb_hexdump_l2(lchan->prim));
@@ -133,7 +133,7 @@
send_burst:
/* Determine which burst should be sent */
- offset = buffer + br->bid * 116;
+ burst = bursts_p + br->bid * 116;
/* Update mask */
*mask |= (1 << br->bid);
@@ -143,9 +143,9 @@
/* Compose a new burst */
memset(br->burst, 0, 3); /* TB */
- memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */
+ memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */
memcpy(br->burst + 61, tsc, 26); /* TSC */
- memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
+ memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
br->burst_len = GSM_NBITS_NB_GMSK_BURST;
diff --git a/src/host/trxcon/src/sched_lchan_tchf.c
b/src/host/trxcon/src/sched_lchan_tchf.c
index 3674bb7..f38c82a 100644
--- a/src/host/trxcon/src/sched_lchan_tchf.c
+++ b/src/host/trxcon/src/sched_lchan_tchf.c
@@ -61,15 +61,16 @@
const struct l1sched_burst_ind *bi)
{
int n_errors = -1, n_bits_total = 0, rc;
- sbit_t *buffer, *offset;
- uint8_t l2[128], *mask;
- size_t l2_len;
+ sbit_t *bursts_p, *burst;
+ uint8_t tch_data[128];
+ size_t tch_data_len;
+ uint8_t *mask;
int amr = 0;
uint8_t ft;
/* Set up pointers */
mask = &lchan->rx_burst_mask;
- buffer = lchan->rx_bursts;
+ bursts_p = lchan->rx_bursts;
LOGP_LCHAND(lchan, LOGL_DEBUG,
"Traffic received: fn=%u bid=%u\n", bi->fn, bi->bid);
@@ -85,9 +86,9 @@
l1sched_lchan_meas_push(lchan, bi);
/* Copy burst to end of buffer of 8 bursts */
- offset = buffer + bi->bid * 116 + 464;
- memcpy(offset, bi->burst + 3, 58);
- memcpy(offset + 58, bi->burst + 87, 58);
+ burst = bursts_p + bi->bid * 116 + 464;
+ memcpy(burst, bi->burst + 3, 58);
+ memcpy(burst + 58, bi->burst + 87, 58);
/* Wait until complete set of bursts */
if (bi->bid != 3)
@@ -113,11 +114,11 @@
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1: /* FR */
- rc = gsm0503_tch_fr_decode(l2, buffer,
+ rc = gsm0503_tch_fr_decode(&tch_data[0], bursts_p,
1, 0, &n_errors, &n_bits_total);
break;
case GSM48_CMODE_SPEECH_EFR: /* EFR */
- rc = gsm0503_tch_fr_decode(l2, buffer,
+ rc = gsm0503_tch_fr_decode(&tch_data[0], bursts_p,
1, 1, &n_errors, &n_bits_total);
break;
case GSM48_CMODE_SPEECH_AMR: /* AMR */
@@ -126,7 +127,7 @@
* receive an FACCH frame instead of a voice frame (we do not
* know this before we actually decode the frame) */
amr = 2;
- rc = gsm0503_tch_afs_decode_dtx(l2 + amr, buffer,
+ rc = gsm0503_tch_afs_decode_dtx(&tch_data[amr], bursts_p,
!sched_tchf_dl_amr_cmi_map[bi->fn % 26],
lchan->amr.codec,
lchan->amr.codecs,
@@ -143,9 +144,9 @@
/* SID frames will always get Frame Type Index
8 (AMR_SID) */
ft = AMR_SID;
}
- rc = osmo_amr_rtp_enc(l2,
- lchan->amr.codec[lchan->amr.dl_cmr],
- ft, AMR_GOOD);
+ rc = osmo_amr_rtp_enc(&tch_data[0],
+
lchan->amr.codec[lchan->amr.dl_cmr],
+ ft, AMR_GOOD);
if (rc < 0)
LOGP_LCHAND(lchan, LOGL_ERROR,
"osmo_amr_rtp_enc() returned
rc=%d\n", rc);
@@ -157,7 +158,7 @@
}
/* Shift buffer by 4 bursts for interleaving */
- memcpy(buffer, buffer + 464, 464);
+ memcpy(bursts_p, bursts_p + 464, 464);
/* Check decoding result */
if (rc < 4) {
@@ -169,7 +170,7 @@
goto bfi;
} else if (rc == GSM_MACBLOCK_LEN) {
/* FACCH received, forward it to the higher layers */
- l1sched_lchan_emit_data_ind(lchan, l2 + amr, GSM_MACBLOCK_LEN,
+ l1sched_lchan_emit_data_ind(lchan, &tch_data[amr],
GSM_MACBLOCK_LEN,
n_errors, n_bits_total, false);
/* Send BFI substituting a stolen TCH frame */
@@ -177,11 +178,11 @@
goto bfi;
} else {
/* A good TCH frame received */
- l2_len = rc;
+ tch_data_len = rc;
}
/* Send a traffic frame to the higher layers */
- return l1sched_lchan_emit_data_ind(lchan, l2, l2_len,
+ return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len,
n_errors, n_bits_total, true);
bfi:
@@ -204,24 +205,24 @@
}
/* Bad frame indication */
- l2_len = l1sched_bad_frame_ind(l2, lchan);
+ tch_data_len = l1sched_bad_frame_ind(&tch_data[0], lchan);
/* Send a BFI frame to the higher layers */
- return l1sched_lchan_emit_data_ind(lchan, l2, l2_len,
+ return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len,
n_errors, n_bits_total, true);
}
int tx_tchf_fn(struct l1sched_lchan_state *lchan,
struct l1sched_burst_req *br)
{
- ubit_t *buffer, *offset;
+ ubit_t *bursts_p, *burst;
const uint8_t *tsc;
uint8_t *mask;
int rc;
/* Set up pointers */
mask = &lchan->tx_burst_mask;
- buffer = lchan->tx_bursts;
+ bursts_p = lchan->tx_bursts;
/* If we have encoded bursts */
if (*mask)
@@ -232,14 +233,14 @@
return 0;
/* Shift buffer by 4 bursts back for interleaving */
- memcpy(buffer, buffer + 464, 464);
+ memcpy(bursts_p, bursts_p + 464, 464);
/* populate the buffer with bursts */
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1:
case GSM48_CMODE_SPEECH_EFR:
- rc = gsm0503_tch_fr_encode(buffer,
+ rc = gsm0503_tch_fr_encode(bursts_p,
msgb_l2(lchan->prim),
msgb_l2len(lchan->prim), 1);
break;
@@ -290,7 +291,7 @@
} else {
lchan->amr.ul_cmr = cmr;
}
- rc = gsm0503_tch_afs_encode(buffer,
+ rc = gsm0503_tch_afs_encode(bursts_p,
msgb_l2(lchan->prim) + 2,
msgb_l2len(lchan->prim) - 2,
amr_fn_is_cmr,
@@ -317,7 +318,7 @@
send_burst:
/* Determine which burst should be sent */
- offset = buffer + br->bid * 116;
+ burst = bursts_p + br->bid * 116;
/* Update mask */
*mask |= (1 << br->bid);
@@ -327,9 +328,9 @@
/* Compose a new burst */
memset(br->burst, 0, 3); /* TB */
- memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */
+ memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */
memcpy(br->burst + 61, tsc, 26); /* TSC */
- memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
+ memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
br->burst_len = GSM_NBITS_NB_GMSK_BURST;
diff --git a/src/host/trxcon/src/sched_lchan_tchh.c
b/src/host/trxcon/src/sched_lchan_tchh.c
index 3832deb..f3b7877 100644
--- a/src/host/trxcon/src/sched_lchan_tchh.c
+++ b/src/host/trxcon/src/sched_lchan_tchh.c
@@ -238,15 +238,16 @@
const struct l1sched_burst_ind *bi)
{
int n_errors = -1, n_bits_total = 0, rc;
- sbit_t *buffer, *offset;
- uint8_t l2[128], *mask;
- size_t l2_len;
+ sbit_t *bursts_p, *burst;
+ uint8_t tch_data[128];
+ size_t tch_data_len;
+ uint8_t *mask;
int amr = 0;
uint8_t ft;
/* Set up pointers */
mask = &lchan->rx_burst_mask;
- buffer = lchan->rx_bursts;
+ bursts_p = lchan->rx_bursts;
LOGP_LCHAND(lchan, LOGL_DEBUG,
"Traffic received: fn=%u bid=%u\n", bi->fn, bi->bid);
@@ -273,9 +274,9 @@
l1sched_lchan_meas_push(lchan, bi);
/* Copy burst to the end of buffer of 6 bursts */
- offset = buffer + bi->bid * 116 + 464;
- memcpy(offset, bi->burst + 3, 58);
- memcpy(offset + 58, bi->burst + 87, 58);
+ burst = bursts_p + bi->bid * 116 + 464;
+ memcpy(burst, bi->burst + 3, 58);
+ memcpy(burst + 58, bi->burst + 87, 58);
/* Wait until the second burst */
if (bi->bid != 1)
@@ -301,14 +302,14 @@
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1: /* HR */
- rc = gsm0503_tch_hr_decode(l2, buffer,
+ rc = gsm0503_tch_hr_decode(&tch_data[0], bursts_p,
!sched_tchh_dl_facch_map[bi->fn %
26],
&n_errors, &n_bits_total);
break;
case GSM48_CMODE_SPEECH_AMR: /* AMR */
/* See comment in function rx_tchf_fn() */
amr = 2;
- rc = gsm0503_tch_ahs_decode_dtx(l2 + amr, buffer,
+ rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], bursts_p,
!sched_tchh_dl_facch_map[bi->fn
% 26],
!sched_tchh_dl_amr_cmi_map[bi->fn % 26],
lchan->amr.codec,
@@ -326,7 +327,7 @@
/* SID frames will always get Frame Type Index
8 (AMR_SID) */
ft = AMR_SID;
}
- rc = osmo_amr_rtp_enc(l2,
+ rc = osmo_amr_rtp_enc(&tch_data[0],
lchan->amr.codec[lchan->amr.dl_cmr],
ft, AMR_GOOD);
if (rc < 0)
@@ -340,8 +341,8 @@
}
/* Shift buffer by 4 bursts for interleaving */
- memcpy(buffer, buffer + 232, 232);
- memcpy(buffer + 232, buffer + 464, 232);
+ memcpy(bursts_p, bursts_p + 232, 232);
+ memcpy(bursts_p + 232, bursts_p + 464, 232);
/* Shift burst mask */
*mask = *mask << 2;
@@ -365,7 +366,7 @@
l1sched_lchan_meas_avg(lchan, 6);
/* FACCH/H received, forward to the higher layers */
- l1sched_lchan_emit_data_ind(lchan, l2 + amr, GSM_MACBLOCK_LEN,
+ l1sched_lchan_emit_data_ind(lchan, &tch_data[amr],
GSM_MACBLOCK_LEN,
n_errors, n_bits_total, false);
/* Send BFI substituting 1/2 stolen TCH frames */
@@ -373,20 +374,20 @@
goto bfi;
} else {
/* A good TCH frame received */
- l2_len = rc;
+ tch_data_len = rc;
/* Calculate AVG of the measurements (traffic takes 4 bursts) */
l1sched_lchan_meas_avg(lchan, 4);
}
/* Send a traffic frame to the higher layers */
- return l1sched_lchan_emit_data_ind(lchan, l2, l2_len,
+ return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len,
n_errors, n_bits_total, true);
bfi_shift:
/* Shift buffer */
- memcpy(buffer, buffer + 232, 232);
- memcpy(buffer + 232, buffer + 464, 232);
+ memcpy(bursts_p, bursts_p + 232, 232);
+ memcpy(bursts_p + 232, bursts_p + 464, 232);
/* Shift burst mask */
*mask = *mask << 2;
@@ -411,24 +412,24 @@
}
/* Bad frame indication */
- l2_len = l1sched_bad_frame_ind(l2, lchan);
+ tch_data_len = l1sched_bad_frame_ind(&tch_data[0], lchan);
/* Send a BFI frame to the higher layers */
- return l1sched_lchan_emit_data_ind(lchan, l2, l2_len,
+ return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len,
n_errors, n_bits_total, true);
}
int tx_tchh_fn(struct l1sched_lchan_state *lchan,
struct l1sched_burst_req *br)
{
- ubit_t *buffer, *offset;
+ ubit_t *bursts_p, *burst;
const uint8_t *tsc;
uint8_t *mask;
int rc;
/* Set up pointers */
mask = &lchan->tx_burst_mask;
- buffer = lchan->tx_bursts;
+ bursts_p = lchan->tx_bursts;
if (br->bid > 0) {
/* Align to the first burst */
@@ -445,14 +446,14 @@
}
/* Shift buffer by 2 bursts back for interleaving */
- memcpy(buffer, buffer + 232, 232);
+ memcpy(bursts_p, bursts_p + 232, 232);
/* Also shift TX burst mask */
*mask = *mask << 2;
/* If FACCH/H blocks are still pending */
if (lchan->ul_facch_blocks > 2) {
- memcpy(buffer + 232, buffer + 464, 232);
+ memcpy(bursts_p + 232, bursts_p + 464, 232);
goto send_burst;
}
@@ -463,7 +464,7 @@
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1:
- rc = gsm0503_tch_hr_encode(buffer,
+ rc = gsm0503_tch_hr_encode(bursts_p,
msgb_l2(lchan->prim),
msgb_l2len(lchan->prim));
break;
@@ -514,7 +515,7 @@
} else {
lchan->amr.ul_cmr = cmr;
}
- rc = gsm0503_tch_ahs_encode(buffer,
+ rc = gsm0503_tch_ahs_encode(bursts_p,
msgb_l2(lchan->prim) + 2,
msgb_l2len(lchan->prim) - 2,
amr_fn_is_cmr,
@@ -541,7 +542,7 @@
send_burst:
/* Determine which burst should be sent */
- offset = buffer + br->bid * 116;
+ burst = bursts_p + br->bid * 116;
/* Update mask */
*mask |= (1 << br->bid);
@@ -551,9 +552,9 @@
/* Compose a new burst */
memset(br->burst, 0, 3); /* TB */
- memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */
+ memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */
memcpy(br->burst + 61, tsc, 26); /* TSC */
- memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
+ memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
br->burst_len = GSM_NBITS_NB_GMSK_BURST;
diff --git a/src/host/trxcon/src/sched_lchan_xcch.c
b/src/host/trxcon/src/sched_lchan_xcch.c
index 0dca098..b246a17 100644
--- a/src/host/trxcon/src/sched_lchan_xcch.c
+++ b/src/host/trxcon/src/sched_lchan_xcch.c
@@ -38,11 +38,11 @@
{
uint8_t l2[GSM_MACBLOCK_LEN], *mask;
int n_errors, n_bits_total, rc;
- sbit_t *buffer, *offset;
+ sbit_t *bursts_p, *burst;
/* Set up pointers */
mask = &lchan->rx_burst_mask;
- buffer = lchan->rx_bursts;
+ bursts_p = lchan->rx_bursts;
LOGP_LCHAND(lchan, LOGL_DEBUG,
"Data received: fn=%u bid=%u\n", bi->fn, bi->bid);
@@ -58,9 +58,9 @@
l1sched_lchan_meas_push(lchan, bi);
/* Copy burst to buffer of 4 bursts */
- offset = buffer + bi->bid * 116;
- memcpy(offset, bi->burst + 3, 58);
- memcpy(offset + 58, bi->burst + 87, 58);
+ burst = bursts_p + bi->bid * 116;
+ memcpy(burst, bi->burst + 3, 58);
+ memcpy(burst + 58, bi->burst + 87, 58);
/* Wait until complete set of bursts */
if (bi->bid != 3)
@@ -86,7 +86,7 @@
*mask = *mask << 4;
/* Attempt to decode */
- rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total);
+ rc = gsm0503_xcch_decode(l2, bursts_p, &n_errors, &n_bits_total);
if (rc) {
LOGP_LCHAND(lchan, LOGL_ERROR,
"Received bad frame (rc=%d, ber=%d/%d) at fn=%u\n",
@@ -101,14 +101,14 @@
int tx_data_fn(struct l1sched_lchan_state *lchan,
struct l1sched_burst_req *br)
{
- ubit_t *buffer, *offset;
+ ubit_t *bursts_p, *burst;
const uint8_t *tsc;
uint8_t *mask;
int rc;
/* Set up pointers */
mask = &lchan->tx_burst_mask;
- buffer = lchan->tx_bursts;
+ bursts_p = lchan->tx_bursts;
if (br->bid > 0) {
/* If we have encoded bursts */
@@ -128,7 +128,7 @@
}
/* Encode payload */
- rc = gsm0503_xcch_encode(buffer, msgb_l2(lchan->prim));
+ rc = gsm0503_xcch_encode(bursts_p, msgb_l2(lchan->prim));
if (rc) {
LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload
(len=%u): %s\n",
msgb_l2len(lchan->prim),
msgb_hexdump_l2(lchan->prim));
@@ -138,7 +138,7 @@
send_burst:
/* Determine which burst should be sent */
- offset = buffer + br->bid * 116;
+ burst = bursts_p + br->bid * 116;
/* Update mask */
*mask |= (1 << br->bid);
@@ -148,9 +148,9 @@
/* Compose a new burst */
memset(br->burst, 0, 3); /* TB */
- memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */
+ memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */
memcpy(br->burst + 61, tsc, 26); /* TSC */
- memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
+ memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
br->burst_len = GSM_NBITS_NB_GMSK_BURST;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32920
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I8138a45cca4e9063bf7d36ebc920b20b755138dd
Gerrit-Change-Number: 32920
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
