<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23269">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce init() APIs for PDCH and TRX objects<br><br>This will make it easier to keep object specific initializations in<br>expected place.<br><br>Change-Id: Idf1dbdf8bc0b1e16d86eeeffb1193fdf3a57d6ef<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/pdch.cpp<br>M src/pdch.h<br>4 files changed, 23 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 55d45b8..1d3f690 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -271,18 +271,8 @@</span><br><span> INIT_LLIST_HEAD(&bts->dl_tbfs);</span><br><span> </span><br><span> /* initialize back pointers */</span><br><span style="color: hsl(0, 100%, 40%);">- for (size_t trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); ++trx_no) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];</span><br><span style="color: hsl(0, 100%, 40%);">- trx->trx_no = trx_no;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->bts = bts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (size_t ts_no = 0; ts_no < ARRAY_SIZE(trx->pdch); ++ts_no) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts_no];</span><br><span style="color: hsl(0, 100%, 40%);">- pdch->init_ptcch_msg();</span><br><span style="color: hsl(0, 100%, 40%);">- pdch->ts_no = ts_no;</span><br><span style="color: hsl(0, 100%, 40%);">- pdch->trx = trx;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ for (size_t trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); ++trx_no)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_trx_init(&bts->trx[trx_no], bts, trx_no);</span><br><span> </span><br><span> /* The static allocator might have already registered the counter group.</span><br><span> If this happens and we still called explicitly (in tests/ for example)</span><br><span>@@ -1161,6 +1151,15 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bts_trx_init(struct gprs_rlcmac_trx *trx, struct gprs_rlcmac_bts *bts, uint8_t trx_no)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->trx_no = trx_no;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->bts = bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (size_t ts_no = 0; ts_no < ARRAY_SIZE(trx->pdch); ts_no++)</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch_init(&trx->pdch[ts_no], trx, ts_no);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void bts_trx_reserve_slots(struct gprs_rlcmac_trx *trx, enum gprs_rlcmac_tbf_direction dir,</span><br><span> uint8_t slots)</span><br><span> {</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 15a72bd..3ddf501 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -65,6 +65,7 @@</span><br><span> #ifdef __cplusplus</span><br><span> extern "C" {</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_trx_init(struct gprs_rlcmac_trx *trx, struct gprs_rlcmac_bts *bts, uint8_t trx_no);</span><br><span> void bts_trx_reserve_slots(struct gprs_rlcmac_trx *trx, enum gprs_rlcmac_tbf_direction dir, uint8_t slots);</span><br><span> void bts_trx_unreserve_slots(struct gprs_rlcmac_trx *trx, enum gprs_rlcmac_tbf_direction dir, uint8_t slots);</span><br><span> void bts_trx_free_all_tbf(struct gprs_rlcmac_trx *trx);</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 8a4a1d1..466eaa5 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -131,6 +131,16 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void pdch_init(struct gprs_rlcmac_pdch *pdch, struct gprs_rlcmac_trx *trx, uint8_t ts_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch->ts_no = ts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch->trx = trx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize the PTCCH/D message (Packet Timing Advance Control Channel) */</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(pdch->ptcch_msg, PTCCH_TAI_FREE, PTCCH_TAI_NUM);</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(pdch->ptcch_msg + PTCCH_TAI_NUM, PTCCH_PADDING, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void gprs_rlcmac_pdch::enable()</span><br><span> {</span><br><span> /* TODO: Check if there are still allocated resources.. */</span><br><span>@@ -1039,13 +1049,6 @@</span><br><span> return trx->trx_no;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* PTCCH (Packet Timing Advance Control Channel) */</span><br><span style="color: hsl(0, 100%, 40%);">-void gprs_rlcmac_pdch::init_ptcch_msg(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- memset(ptcch_msg, PTCCH_TAI_FREE, PTCCH_TAI_NUM);</span><br><span style="color: hsl(0, 100%, 40%);">- memset(ptcch_msg + PTCCH_TAI_NUM, PTCCH_PADDING, 7);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> uint8_t gprs_rlcmac_pdch::reserve_tai(uint8_t ta)</span><br><span> {</span><br><span> uint8_t tai;</span><br><span>diff --git a/src/pdch.h b/src/pdch.h</span><br><span>index fde183e..c83fe39 100644</span><br><span>--- a/src/pdch.h</span><br><span>+++ b/src/pdch.h</span><br><span>@@ -105,8 +105,6 @@</span><br><span> /* PTCCH (Packet Timing Advance Control Channel) */</span><br><span> uint8_t ptcch_msg[GSM_MACBLOCK_LEN]; /* 'ready to use' PTCCH/D message */</span><br><span> #ifdef __cplusplus</span><br><span style="color: hsl(0, 100%, 40%);">- /* Initialize the PTCCH/D message */</span><br><span style="color: hsl(0, 100%, 40%);">- void init_ptcch_msg(void);</span><br><span> /* Obtain an unused TA Index for a TBF */</span><br><span> uint8_t reserve_tai(uint8_t ta);</span><br><span> /* Mark a given TA Index as free, so it can be used again */</span><br><span>@@ -190,6 +188,7 @@</span><br><span> #ifdef __cplusplus</span><br><span> extern "C" {</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+void pdch_init(struct gprs_rlcmac_pdch *pdch, struct gprs_rlcmac_trx *trx, uint8_t ts_nr);</span><br><span> void pdch_free_all_tbf(struct gprs_rlcmac_pdch *pdch);</span><br><span> void pdch_disable(struct gprs_rlcmac_pdch *pdch);</span><br><span> #ifdef __cplusplus</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23269">change 23269</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/23269"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idf1dbdf8bc0b1e16d86eeeffb1193fdf3a57d6ef </div>
<div style="display:none"> Gerrit-Change-Number: 23269 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>