<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/15613">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">struct gsm_bts: Add mode_priv pointer handing bts_model specific data<br><br>Existing model specific data is moved there.<br><br>Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/osmo-bts-oc2g/l1_if.h<br>M src/osmo-bts-oc2g/main.c<br>M src/osmo-bts-virtual/l1_if.h<br>M src/osmo-bts-virtual/main.c<br>M src/osmo-bts-virtual/scheduler_virtbts.c<br>6 files changed, 33 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/15613/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index cf7b715..5d8bc76 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -775,19 +775,7 @@</span><br><span> char *sock_path;</span><br><span> } pcu;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t last_fn;</span><br><span style="color: hsl(0, 100%, 40%);">- struct timeval tv_clock;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_timer_list fn_timer;</span><br><span style="color: hsl(0, 100%, 40%);">- } vbts;</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef ENABLE_OC2GBTS</span><br><span style="color: hsl(0, 100%, 40%);">- /* specific to Open Cellular 2G BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t led_ctrl_mode; /* 0: control by BTS, 1: not control by BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head ceased_alarm_list; /* ceased alarm list*/</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int rtp_drift_thres_ms; /* RTP timestamp drift detection threshold */</span><br><span style="color: hsl(0, 100%, 40%);">- } oc2g;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ void *model_priv; /* Allocated by bts_model, contains model specific data pointer */</span><br><span> };</span><br><span> </span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.h b/src/osmo-bts-oc2g/l1_if.h</span><br><span>index 38699e0..11b2c1f 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.h</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.h</span><br><span>@@ -30,6 +30,13 @@</span><br><span> _NUM_MQ_WRITE</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* gsm_bts->model_priv, specific to Open Cellular 2G BTS */</span><br><span style="color: hsl(120, 100%, 40%);">+struct bts_oc2g_priv {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t led_ctrl_mode; /* 0: control by BTS, 1: not control by BTS */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head ceased_alarm_list; /* ceased alarm list*/</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int rtp_drift_thres_ms; /* RTP timestamp drift detection threshold */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct calib_send_state {</span><br><span> FILE *fp;</span><br><span> const char *path;</span><br><span>diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c</span><br><span>index 5b66c6f..7149edb 100644</span><br><span>--- a/src/osmo-bts-oc2g/main.c</span><br><span>+++ b/src/osmo-bts-oc2g/main.c</span><br><span>@@ -87,15 +87,17 @@</span><br><span> static struct osmo_fd accept_fd, read_fd;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_oc2g_priv *bts_oc2g = talloc_zero(bts, struct bts_oc2g_priv);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->model_priv = bts_oc2g;</span><br><span> bts->variant = BTS_OSMO_OC2G;</span><br><span> bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);</span><br><span> /* specific default values for OC2G platform */</span><br><span> </span><br><span> /* TODO(oramadan) MERGE</span><br><span style="color: hsl(0, 100%, 40%);">- bts->oc2g.led_ctrl_mode = OC2G_BTS_LED_CTRL_MODE_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_oc2g->led_ctrl_mode = OC2G_BTS_LED_CTRL_MODE_DEFAULT;</span><br><span> */</span><br><span> /* RTP drift threshold default */</span><br><span style="color: hsl(0, 100%, 40%);">- /* bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bts_oc2g->rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */</span><br><span> </span><br><span> rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd);</span><br><span> if (rc < 0) {</span><br><span>diff --git a/src/osmo-bts-virtual/l1_if.h b/src/osmo-bts-virtual/l1_if.h</span><br><span>index 6a843b3..075856f 100644</span><br><span>--- a/src/osmo-bts-virtual/l1_if.h</span><br><span>+++ b/src/osmo-bts-virtual/l1_if.h</span><br><span>@@ -5,6 +5,13 @@</span><br><span> </span><br><span> #include "virtual_um.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* gsm_bts->model_priv, specific to osmo-bts-virtual */</span><br><span style="color: hsl(120, 100%, 40%);">+struct bts_virt_priv {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t last_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval tv_clock;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list fn_timer;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct vbts_l1h {</span><br><span> struct gsm_bts_trx *trx;</span><br><span> struct l1sched_trx l1s;</span><br><span>diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c</span><br><span>index aa1c608..c329f3a 100644</span><br><span>--- a/src/osmo-bts-virtual/main.c</span><br><span>+++ b/src/osmo-bts-virtual/main.c</span><br><span>@@ -47,6 +47,7 @@</span><br><span> #include <osmo-bts/l1sap.h></span><br><span> #include <osmo-bts/phy_link.h></span><br><span> #include "virtual_um.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "l1_if.h"</span><br><span> </span><br><span> /* dummy, since no direct dsp support */</span><br><span> uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span>@@ -56,6 +57,8 @@</span><br><span> </span><br><span> int bts_model_init(struct gsm_bts *bts)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_virt_priv *bts_virt = talloc_zero(bts, struct bts_virt_priv);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->model_priv = bts_virt;</span><br><span> bts->variant = BTS_OSMO_VIRTUAL;</span><br><span> bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>index 259a573..3c934b1 100644</span><br><span>--- a/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>+++ b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>@@ -562,8 +562,9 @@</span><br><span> static void vbts_fn_timer_cb(void *data)</span><br><span> {</span><br><span> struct gsm_bts *bts = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_virt_priv *bts_virt = (struct bts_virt_priv *)bts->model_priv;</span><br><span> struct timeval tv_now;</span><br><span style="color: hsl(0, 100%, 40%);">- struct timeval *tv_clock = &bts->vbts.tv_clock;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval *tv_clock = &bts_virt->tv_clock;</span><br><span> int32_t elapsed_us;</span><br><span> </span><br><span> gettimeofday(&tv_now, NULL);</span><br><span>@@ -587,28 +588,29 @@</span><br><span> };</span><br><span> timeradd(tv_clock, &tv_frame, tv_clock);</span><br><span> /* increment the frame number in the BTS model instance */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->vbts.last_fn = (bts->vbts.last_fn + 1) % GSM_HYPERFRAME;</span><br><span style="color: hsl(0, 100%, 40%);">- vbts_sched_fn(bts, bts->vbts.last_fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_virt->last_fn = (bts_virt->last_fn + 1) % GSM_HYPERFRAME;</span><br><span style="color: hsl(120, 100%, 40%);">+ vbts_sched_fn(bts, bts_virt->last_fn);</span><br><span> elapsed_us -= FRAME_DURATION_uS;</span><br><span> }</span><br><span> </span><br><span> /* re-schedule the timer */</span><br><span> /* timer is set to frame duration - elapsed time to guarantee that this cb method will be</span><br><span> * periodically executed every 4.615ms */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&bts->vbts.fn_timer, 0, FRAME_DURATION_uS - elapsed_us);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&bts_virt->fn_timer, 0, FRAME_DURATION_uS - elapsed_us);</span><br><span> }</span><br><span> </span><br><span> int vbts_sched_start(struct gsm_bts *bts)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_virt_priv *bts_virt = (struct bts_virt_priv *)bts->model_priv;</span><br><span> LOGP(DL1P, LOGL_NOTICE, "starting VBTS scheduler\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memset(&bts->vbts.fn_timer, 0, sizeof(bts->vbts.fn_timer));</span><br><span style="color: hsl(0, 100%, 40%);">- bts->vbts.fn_timer.cb = vbts_fn_timer_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->vbts.fn_timer.data = bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&bts_virt->fn_timer, 0, sizeof(bts_virt->fn_timer));</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_virt->fn_timer.cb = vbts_fn_timer_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_virt->fn_timer.data = bts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gettimeofday(&bts->vbts.tv_clock, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gettimeofday(&bts_virt->tv_clock, NULL);</span><br><span> /* trigger the first timer after 4615us (a frame duration) */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&bts->vbts.fn_timer, 0, FRAME_DURATION_uS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&bts_virt->fn_timer, 0, FRAME_DURATION_uS);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/15613">change 15613</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-bts/+/15613"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e </div>
<div style="display:none"> Gerrit-Change-Number: 15613 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>