Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/10308
Change subject: Clarify frame loss counter for l1sched_chan_state
......................................................................
Clarify frame loss counter for l1sched_chan_state
Each logical channel (e.g. SACCH, SDCCH, etc.) has a counter of
lost L2 frames. Let's use a bit better name for it, and correct
its description in the 'l1sched_chan_state' struct definition.
Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82
---
M include/osmo-bts/scheduler.h
M src/common/scheduler.c
M src/osmo-bts-trx/scheduler_trx.c
M src/osmo-bts-virtual/scheduler_virtbts.c
4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/10308/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index 98f38d3..3fe7978 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -78,7 +78,7 @@
int32_t toa256_sum; /* sum of TOA values (1/256
symbol) */
/* loss detection */
- uint8_t lost; /* (SACCH) loss detection */
+ uint8_t lost_frames; /* how many L2 frames were lost
*/
/* mode */
uint8_t rsl_cmode, tch_mode; /* mode for TCH channels */
diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 3842810..5c250e4 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -367,7 +367,7 @@
memcpy(msg->l2h, l2, l2_len);
if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id))
- l1ts->chan_state[chan].lost = 0;
+ l1ts->chan_state[chan].lost_frames = 0;
/* forward primitive */
l1sap_up(l1t->trx, l1sap);
@@ -396,8 +396,8 @@
if (tch_len)
memcpy(msg->l2h, tch, tch_len);
- if (l1ts->chan_state[chan].lost)
- l1ts->chan_state[chan].lost--;
+ if (l1ts->chan_state[chan].lost_frames)
+ l1ts->chan_state[chan].lost_frames--;
LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, -1, l1sap->u.data.fn,
"%s Rx -> RTP: %s\n",
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index a22b53f..4ab937a 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -192,7 +192,7 @@
/* handle loss detection of SACCH */
if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) {
/* count and send BFI */
- if (++(l1ts->chan_state[chan].lost) > 1) {
+ if (++(l1ts->chan_state[chan].lost_frames) > 1) {
/* TODO: Should we pass old TOA here? Otherwise we risk
* unnecessary decreasing TA */
@@ -351,7 +351,7 @@
/* handle loss detection of received TCH frames */
if (rsl_cmode == RSL_CMOD_SPD_SPEECH
- && ++(chan_state->lost) > 5) {
+ && ++(chan_state->lost_frames) > 5) {
uint8_t tch_data[GSM_FR_BYTES];
int len;
diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c
b/src/osmo-bts-virtual/scheduler_virtbts.c
index de995e6..cdbb9c1 100644
--- a/src/osmo-bts-virtual/scheduler_virtbts.c
+++ b/src/osmo-bts-virtual/scheduler_virtbts.c
@@ -198,7 +198,7 @@
#if 0
/* handle loss detection of received TCH frames */
if (rsl_cmode == RSL_CMOD_SPD_SPEECH
- && ++(chan_state->lost) > 5) {
+ && ++(chan_state->lost_frames) > 5) {
uint8_t tch_data[GSM_FR_BYTES];
int len;
--
To view, visit https://gerrit.osmocom.org/10308
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82
Gerrit-Change-Number: 10308
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <[email protected]>
