Move NULL and ASSIGN tbf_state transition to tbf_fsm
At some point later in time the state_flags will most probably be split
into different variables, one ending up in a different FSM. It is moved
so far to the exsiting FSM from the C++ class since it's easier to
access it from C and C++ code, and anyway that kind of information
belongs to the FSM.
Related: OS#2709
Change-Id: I3c62e9e83965cb28065338733f182863e54d7474
diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp
index 0b83a68..657e5a1 100644
--- a/src/pcu_vty_functions.cpp
+++ b/src/pcu_vty_functions.cpp
@@ -55,9 +55,9 @@
tbf->direction == GPRS_RLCMAC_UL_TBF ? "UL" : "DL",
tbf->imsi(), VTY_NEWLINE);
vty_out(vty, " created=%lu state=%08x [CCCH:%u, PACCH:%u] 1st_TS=%d 1st_cTS=%d ctrl_TS=%d MS_CLASS=%d/%d%s",
- tbf->created_ts(), tbf->state_flags,
- tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH),
- tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH),
+ tbf->created_ts(), tbf->state_fsm.state_flags,
+ tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH),
+ tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH),
tbf->first_ts,
tbf->first_common_ts, tbf->control_ts,
tbf->ms_class(),
@@ -113,7 +113,7 @@
trx = &bts->trx[trx_no];
llist_for_each_entry(iter, &trx->ul_tbfs, list) {
tbf = (struct gprs_rlcmac_tbf *)iter->entry;
- if (tbf->state_flags & flags)
+ if (tbf->state_fsm.state_flags & flags)
tbf_print_vty_info(vty, tbf);
}
}
@@ -123,7 +123,7 @@
trx = &bts->trx[trx_no];
llist_for_each_entry(iter, &trx->dl_tbfs, list) {
tbf = (struct gprs_rlcmac_tbf *)iter->entry;
- if (tbf->state_flags & flags)
+ if (tbf->state_fsm.state_flags & flags)
tbf_print_vty_info(vty, tbf);
}
}