dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29893 ) Change subject: pcuif_proto: cosmetic: rename gsm_pcu_if_info_ts to gsm_pcu_if_info_trx_ts ...................................................................... pcuif_proto: cosmetic: rename gsm_pcu_if_info_ts to gsm_pcu_if_info_trx_ts The struct gsm_pcu_if_info_ts is named "gsm_pcu_if_info_trx_ts" in osmo-bts. Lets rename it since the definition in osmo-bts is newer. Change-Id: If8b50181d3b609612aa8433b635052aadddd3484 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index bb1f834..5084cb8 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -126,7 +126,7 @@ uint8_t ts_nr; } __attribute__ ((packed)); -struct gsm_pcu_if_info_ts { +struct gsm_pcu_if_info_trx_ts { uint8_t tsc; uint8_t hopping; uint8_t hsn; @@ -140,7 +140,7 @@ uint8_t pdch_mask; /* PDCH timeslot mask */ uint8_t spare; uint32_t hlayer1; - struct gsm_pcu_if_info_ts ts[8]; /* timeslots per TRX */ + struct gsm_pcu_if_info_trx_ts ts[8]; } __attribute__ ((packed)); struct gsm_pcu_if_info_ind { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index c1271a4..810ce85 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -862,7 +862,7 @@ } for (ts_nr = 0; ts_nr < ARRAY_SIZE(bts->trx[0].pdch); ts_nr++) { - const struct gsm_pcu_if_info_ts *its = &info_ind->trx[trx_nr].ts[ts_nr]; + const struct gsm_pcu_if_info_trx_ts *its = &info_ind->trx[trx_nr].ts[ts_nr]; struct gprs_rlcmac_pdch *pdch = &bts->trx[trx_nr].pdch[ts_nr]; if ((info_ind->trx[trx_nr].pdch_mask & (1 << ts_nr))) { /* FIXME: activate dynamically at RLCMAC */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If8b50181d3b609612aa8433b635052aadddd3484 Gerrit-Change-Number: 29893 Gerrit-PatchSet: 1 Gerrit-Owner: dexter &lt;pmaier(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter &lt;pmaier(a)sysmocom.de&gt; Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged