<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17353">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: constify Downlink burst bits where possible<br><br>Change-Id: Ib3e3a0a5b4551126b1a9439000d4438c58a6a90a<br>---<br>M src/host/trxcon/sched_lchan_desc.c<br>M src/host/trxcon/sched_lchan_pdtch.c<br>M src/host/trxcon/sched_lchan_sch.c<br>M src/host/trxcon/sched_lchan_tchf.c<br>M src/host/trxcon/sched_lchan_tchh.c<br>M src/host/trxcon/sched_lchan_xcch.c<br>M src/host/trxcon/sched_trx.c<br>M src/host/trxcon/sched_trx.h<br>8 files changed, 12 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/53/17353/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c</span><br><span>index 9a74a6e..63439d1 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_desc.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_desc.c</span><br><span>@@ -31,35 +31,35 @@</span><br><span> /* Forward declaration of handlers */</span><br><span> int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>   struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas);</span><br><span style="color: hsl(120, 100%, 40%);">+       const sbit_t *bits, const struct trx_meas_set *meas);</span><br><span> </span><br><span> int tx_data_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>     struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);</span><br><span> </span><br><span> int rx_sch_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>  struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas);</span><br><span style="color: hsl(120, 100%, 40%);">+       const sbit_t *bits, const struct trx_meas_set *meas);</span><br><span> </span><br><span> int tx_rach_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>     struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);</span><br><span> </span><br><span> int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>         struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas);</span><br><span style="color: hsl(120, 100%, 40%);">+       const sbit_t *bits, const struct trx_meas_set *meas);</span><br><span> </span><br><span> int tx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>     struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);</span><br><span> </span><br><span> int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>         struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas);</span><br><span style="color: hsl(120, 100%, 40%);">+       const sbit_t *bits, const struct trx_meas_set *meas);</span><br><span> </span><br><span> int tx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>     struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);</span><br><span> </span><br><span> int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>        struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas);</span><br><span style="color: hsl(120, 100%, 40%);">+       const sbit_t *bits, const struct trx_meas_set *meas);</span><br><span> </span><br><span> int tx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>    struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);</span><br><span>diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>index b625d2f..d965daa 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> </span><br><span> int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>   struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas)</span><br><span style="color: hsl(120, 100%, 40%);">+        const sbit_t *bits, const struct trx_meas_set *meas)</span><br><span> {</span><br><span>    const struct trx_lchan_desc *lchan_desc;</span><br><span>     uint8_t l2[GPRS_L2_MAX_LEN], *mask;</span><br><span>diff --git a/src/host/trxcon/sched_lchan_sch.c b/src/host/trxcon/sched_lchan_sch.c</span><br><span>index 17f68b0..18d4c58 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_sch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_sch.c</span><br><span>@@ -70,7 +70,7 @@</span><br><span> </span><br><span> int rx_sch_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>   struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas)</span><br><span style="color: hsl(120, 100%, 40%);">+        const sbit_t *bits, const struct trx_meas_set *meas)</span><br><span> {</span><br><span>    sbit_t payload[2 * 39];</span><br><span>      struct gsm_time time;</span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>index e909151..d190a16 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchf.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> </span><br><span> int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>    struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas)</span><br><span style="color: hsl(120, 100%, 40%);">+        const sbit_t *bits, const struct trx_meas_set *meas)</span><br><span> {</span><br><span>    const struct trx_lchan_desc *lchan_desc;</span><br><span>     int n_errors = -1, n_bits_total, rc;</span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c</span><br><span>index 29abb42..537611d 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchh.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchh.c</span><br><span>@@ -200,7 +200,7 @@</span><br><span> </span><br><span> int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>   struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas)</span><br><span style="color: hsl(120, 100%, 40%);">+        const sbit_t *bits, const struct trx_meas_set *meas)</span><br><span> {</span><br><span>    const struct trx_lchan_desc *lchan_desc;</span><br><span>     int n_errors = -1, n_bits_total, rc;</span><br><span>diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>index cc14d2f..0818e20 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_xcch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> </span><br><span> int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts,</span><br><span>     struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,</span><br><span style="color: hsl(0, 100%, 40%);">-        sbit_t *bits, const struct trx_meas_set *meas)</span><br><span style="color: hsl(120, 100%, 40%);">+        const sbit_t *bits, const struct trx_meas_set *meas)</span><br><span> {</span><br><span>    const struct trx_lchan_desc *lchan_desc;</span><br><span>     uint8_t l2[GSM_MACBLOCK_LEN], *mask;</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index ba75b6f..1efae24 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -637,8 +637,7 @@</span><br><span>          return -EIO;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* TODO: make bits constant */</span><br><span style="color: hsl(0, 100%, 40%);">-  static sbit_t bits[148] = { 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+      static const sbit_t bits[148] = { 0 };</span><br><span>       struct trx_meas_set fake_meas = {</span><br><span>            .fn = lchan->tdma.last_proc,</span><br><span>              .rssi = -120,</span><br><span>diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h</span><br><span>index cf63df1..fb7ecd4 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -99,7 +99,7 @@</span><br><span> </span><br><span> typedef int trx_lchan_rx_func(struct trx_instance *trx,</span><br><span>    struct trx_ts *ts, struct trx_lchan_state *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">-       uint32_t fn, uint8_t bid, sbit_t *bits,</span><br><span style="color: hsl(120, 100%, 40%);">+       uint32_t fn, uint8_t bid, const sbit_t *bits,</span><br><span>        const struct trx_meas_set *meas);</span><br><span> </span><br><span> typedef int trx_lchan_tx_func(struct trx_instance *trx,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17353">change 17353</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/osmocom-bb/+/17353"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib3e3a0a5b4551126b1a9439000d4438c58a6a90a </div>
<div style="display:none"> Gerrit-Change-Number: 17353 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>