Change in osmocom-bb[master]: trxcon: cosmetic: s/state/clck_state/ in struct l1sched_state

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28662 ) Change subject: trxcon: cosmetic: s/state/clck_state/ in struct l1sched_state ...................................................................... trxcon: cosmetic: s/state/clck_state/ in struct l1sched_state Change-Id: I8a1b971abaf06c0b1339895cf1748c5eb21d45e6 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h M src/host/trxcon/src/sched_clck.c 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/28662/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h index 7cdb043..ae0bf9c 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h @@ -349,7 +349,7 @@ /*! One scheduler instance */ struct l1sched_state { /*! Clock state */ - enum l1sched_clck_state state; + enum l1sched_clck_state clck_state; /*! Local clock source */ struct timespec clock; /*! Count of processed frames */ diff --git a/src/host/trxcon/src/sched_clck.c b/src/host/trxcon/src/sched_clck.c index 5fb8d62..9c77382 100644 --- a/src/host/trxcon/src/sched_clck.c +++ b/src/host/trxcon/src/sched_clck.c @@ -55,7 +55,7 @@ /* Check if transceiver is still alive */ if (sched->fn_counter_lost++ == TRX_LOSS_FRAMES) { LOGP(DSCH, LOGL_DEBUG, "No more clock from transceiver\n"); - sched->state = L1SCHED_CLCK_ST_WAIT; + sched->clck_state = L1SCHED_CLCK_ST_WAIT; return; } @@ -72,7 +72,7 @@ LOGP(DSCH, LOGL_NOTICE, "PC clock skew: " "elapsed uS %" PRId64 "\n", elapsed_us); - sched->state = L1SCHED_CLCK_ST_WAIT; + sched->clck_state = L1SCHED_CLCK_ST_WAIT; return; } @@ -124,11 +124,11 @@ tv_clock = &sched->clock; /* If this is the first CLCK IND */ - if (sched->state == L1SCHED_CLCK_ST_WAIT) { + if (sched->clck_state == L1SCHED_CLCK_ST_WAIT) { l1sched_clck_correct(sched, &tv_now, fn); LOGP(DSCH, LOGL_DEBUG, "Initial clock received: fn=%u\n", fn); - sched->state = L1SCHED_CLCK_ST_OK; + sched->clck_state = L1SCHED_CLCK_ST_OK; return 0; } @@ -195,7 +195,7 @@ void l1sched_clck_reset(struct l1sched_state *sched) { /* Reset internal state */ - sched->state = L1SCHED_CLCK_ST_WAIT; + sched->clck_state = L1SCHED_CLCK_ST_WAIT; /* Stop clock timer */ osmo_timer_del(&sched->clock_timer); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1b971abaf06c0b1339895cf1748c5eb21d45e6 Gerrit-Change-Number: 28662 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange