<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19458">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Verified
Hoernchen: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: add possibility to configure TCH loops in the DSP<br><br>Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc<br>---<br>M include/l1ctl_proto.h<br>M src/target/firmware/include/layer1/sync.h<br>M src/target/firmware/layer1/l23_api.c<br>M src/target/firmware/layer1/prim_tch.c<br>4 files changed, 25 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h</span><br><span>index 05d65de..cf41ac7 100644</span><br><span>--- a/include/l1ctl_proto.h</span><br><span>+++ b/include/l1ctl_proto.h</span><br><span>@@ -149,11 +149,24 @@</span><br><span> uint8_t padding[3];</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* 3GPP TS 44.014, section 5.1 (Calypso specific numbers) */</span><br><span style="color: hsl(120, 100%, 40%);">+enum l1ctl_tch_loop_mode {</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_OPEN = 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_A = 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_B = 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_C = 0x03,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_D = 0x04,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_E = 0x05,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_F = 0x06,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL_TCH_LOOP_I = 0x07,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* TCH mode was changed */</span><br><span> struct l1ctl_tch_mode_conf {</span><br><span> uint8_t tch_mode; /* enum tch_mode */</span><br><span> uint8_t audio_mode;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t padding[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t padding[1];</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> /* data on the CCCH was found. This is following the header */</span><br><span>@@ -231,7 +244,8 @@</span><br><span> #define AUDIO_RX_SPEAKER (1<<2)</span><br><span> #define AUDIO_RX_TRAFFIC_IND (1<<3)</span><br><span> uint8_t audio_mode;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t padding[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t padding[1];</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> /* the l1_info_ul header is in front */</span><br><span>diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h</span><br><span>index 6ed3890..dd93242 100644</span><br><span>--- a/src/target/firmware/include/layer1/sync.h</span><br><span>+++ b/src/target/firmware/include/layer1/sync.h</span><br><span>@@ -83,6 +83,9 @@</span><br><span> uint8_t tch_sync;</span><br><span> uint8_t audio_mode;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* 3GPP TS 44.014, section 5.1 (Calypso DSP specific numbers) */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum l1ctl_tch_loop_mode tch_loop_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Transmit queues of pending packets for main DCCH and ACCH */</span><br><span> struct llist_head tx_queue[_NUM_L1S_CHAN];</span><br><span> struct msgb *tx_meas;</span><br><span>diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c</span><br><span>index d52d8f6..62c21f6 100644</span><br><span>--- a/src/target/firmware/layer1/l23_api.c</span><br><span>+++ b/src/target/firmware/layer1/l23_api.c</span><br><span>@@ -352,6 +352,7 @@</span><br><span> dsp_load_ciph_param(0, NULL);</span><br><span> l1a_tch_mode_set(GSM48_CMODE_SIGN);</span><br><span> audio_set_enabled(GSM48_CMODE_SIGN, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1s.tch_loop_mode = L1CTL_TCH_LOOP_OPEN;</span><br><span> l1s.neigh_pm.n = 0;</span><br><span> }</span><br><span> </span><br><span>@@ -521,6 +522,7 @@</span><br><span> msgb_put(msg, sizeof(*mode_conf));</span><br><span> mode_conf->tch_mode = tch_mode;</span><br><span> mode_conf->audio_mode = audio_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ mode_conf->tch_loop_mode = l1s.tch_loop_mode;</span><br><span> </span><br><span> l1_queue_for_l2(msg);</span><br><span> }</span><br><span>@@ -542,6 +544,7 @@</span><br><span> audio_set_enabled(tch_mode, audio_mode);</span><br><span> </span><br><span> l1s.tch_sync = 1; /* Needed for audio to work */</span><br><span style="color: hsl(120, 100%, 40%);">+ l1s.tch_loop_mode = tch_mode_req->tch_loop_mode;</span><br><span> </span><br><span> l1ctl_tx_tch_mode_conf(tch_mode, audio_mode);</span><br><span> }</span><br><span>diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c</span><br><span>index 0254654..40ef8f3 100644</span><br><span>--- a/src/target/firmware/layer1/prim_tch.c</span><br><span>+++ b/src/target/firmware/layer1/prim_tch.c</span><br><span>@@ -526,7 +526,7 @@</span><br><span> dsp_load_tch_param(</span><br><span> &l1s.next_time,</span><br><span> tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, sync, tn</span><br><span style="color: hsl(120, 100%, 40%);">+ l1s.tch_loop_mode, sync, tn</span><br><span> );</span><br><span> </span><br><span> dsp_load_rx_task(</span><br><span>@@ -585,7 +585,7 @@</span><br><span> dsp_load_tch_param(</span><br><span> &l1s.next_time,</span><br><span> tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, tn</span><br><span style="color: hsl(120, 100%, 40%);">+ l1s.tch_loop_mode, 0, tn</span><br><span> );</span><br><span> </span><br><span> dsp_load_rx_task(TCHD_DSP_TASK, 0, tsc); /* burst_id unused for TCH */</span><br><span>@@ -791,7 +791,7 @@</span><br><span> dsp_load_tch_param(</span><br><span> &l1s.next_time,</span><br><span> tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, tn</span><br><span style="color: hsl(120, 100%, 40%);">+ l1s.tch_loop_mode, 0, tn</span><br><span> );</span><br><span> </span><br><span> dsp_load_rx_task(</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19458">change 19458</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/+/19458"/><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: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc </div>
<div style="display:none"> Gerrit-Change-Number: 19458 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>