<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21164">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: add repeated acch mode flags + vty config<br><br>To be able to control the FACCH/SACCH repetition behavior inside the<br>BTS a one byte flag is sent to the BTS together with the<br>RSL_IE_OSMO_REP_ACCH_CAP IE.<br><br>Related: SYS#5114, OS#4796, OS#4794, OS#4795<br>Change-Id: I083eaa2c30478912426e9c24a506f0b88836e190<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/bsc_vty.c<br>2 files changed, 121 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/21164/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index fd2ac32..de49ce1 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -480,6 +480,9 @@</span><br><span> </span><br><span> struct llist_head oml_fail_rep;</span><br><span> struct llist_head chan_rqd_queue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* osmocom specific FACCH/SACCH repetition mode flags */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t repeated_acch_capability_bts;</span><br><span> };</span><br><span> </span><br><span> #define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i])</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index c3d6658..17b33b4 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1115,6 +1115,15 @@</span><br><span> </span><br><span> ho_vty_write_bts(vty, bts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if ((bts->repeated_acch_capability_bts & 0x03) == 0x01)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " repeat dl-facch command%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((bts->repeated_acch_capability_bts & 0x03) == 0x03)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " repeat dl-facch all%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->repeated_acch_capability_bts & 0x04)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " repeat dl-sacch%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->repeated_acch_capability_bts & 0x08)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " repeat ul-sacch%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config_write_bts_model(vty, bts);</span><br><span> }</span><br><span> </span><br><span>@@ -2621,6 +2630,108 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define REP_ACCH_STR "FACCH/SACCH repetition\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_dl_facch,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rep_dl_facch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "repeat dl-facch (command|all)",</span><br><span style="color: hsl(120, 100%, 40%);">+ REP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable DL-FACCH repetition for this BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "command LAPDm frames only\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "all LAPDm frames\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% repeated ACCH not supported by this BTS%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argv[0][0] == 'c') {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts |= 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts &= ~0x02;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts |= 0x03;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_no_dl_facch,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rep_no_dl_facch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no repeat dl-facch",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR REP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Disable DL-FACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts &= ~0x03;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_dl_sacch,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rep_dl_sacch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "repeat dl-sacch",</span><br><span style="color: hsl(120, 100%, 40%);">+ REP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable DL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% repeated ACCH not supported by this BTS%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts |= 0x04;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_no_dl_sacch,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rep_no_dl_sacch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no repeat dl-sacch",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR REP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Disable DL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts &= ~0x04;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_ul_sacch,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rep_ul_sacch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "repeat ul-sacch",</span><br><span style="color: hsl(120, 100%, 40%);">+ REP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable UL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% repeated ACCH not supported by this BTS%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts |= 0x08;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_no_ul_sacch,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rep_no_ul_sacch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no repeat ul-sacch",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR REP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Disable UL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->repeated_acch_capability_bts &= ~0x08;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define CD_STR "Channel Description\n"</span><br><span> </span><br><span> DEFUN_USRATTR(cfg_bts_chan_desc_att,</span><br><span>@@ -7032,6 +7143,13 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_acc_ramping_chan_load_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_t3113_dynamic_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_no_t3113_dynamic_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rep_dl_facch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rep_no_dl_facch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rep_dl_sacch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rep_no_dl_sacch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rep_ul_sacch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rep_no_ul_sacch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> neighbor_ident_vty_init(network, network->neighbor_bss_cells);</span><br><span> /* See also handover commands added on bts level from handover_vty.c */</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21164">change 21164</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-bsc/+/21164"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I083eaa2c30478912426e9c24a506f0b88836e190 </div>
<div style="display:none"> Gerrit-Change-Number: 21164 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>