Rename as_{dl,ul}_tbf -> tbf_as_{dl,ul}_tbf
Prefix the function accordingly to specify the input object.
Change-Id: I225568fe2cb5236817cdd9609354c24c66723606
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 67defec..278da72 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -506,9 +506,9 @@
/* 3GPP TS 44.018 §10.5.2.16 IA Rest Octets */
dest->cur_bit = wp;
if (downlink) {
- OSMO_ASSERT(as_dl_tbf(tbf) != NULL);
+ OSMO_ASSERT(tbf_as_dl_tbf(tbf) != NULL);
- rc = write_ia_rest_downlink(as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma,
+ rc = write_ia_rest_downlink(tbf_as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma,
ta_idx);
} else if (((burst_type == GSM_L1_BURST_TYPE_ACCESS_1) || (burst_type == GSM_L1_BURST_TYPE_ACCESS_2))) {
SET_L(dest); SET_H(dest); // "LH"
@@ -518,8 +518,8 @@
SET_0(dest); // No < Access Technologies Request struct >
- if (as_ul_tbf(tbf) != NULL)
- rc = write_ia_rest_egprs_uplink_sba(as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx);
+ if (tbf_as_ul_tbf(tbf) != NULL)
+ rc = write_ia_rest_egprs_uplink_sba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx);
else
rc = write_ia_rest_egprs_uplink_mba(dest, fn, alpha, gamma);
} else {
@@ -528,8 +528,8 @@
SET_H(dest); SET_H(dest); // "HH"
SET_0(dest); SET_0(dest); // "00" < Packet Uplink Assignment >
- if (as_ul_tbf(tbf) != NULL)
- rc = write_ia_rest_uplink_mba(as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx);
+ if (tbf_as_ul_tbf(tbf) != NULL)
+ rc = write_ia_rest_uplink_mba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx);
else
rc = write_ia_rest_uplink_sba(dest, fn, alpha, gamma);
}